diff options
| author | Tom Cherry <tomcherry@google.com> | 2018-04-04 23:02:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-04 23:02:34 +0000 |
| commit | 946b5c5e7f5cec48724c4bf3762289be2a29a666 (patch) | |
| tree | 453fad7a5daace1d7307e58d4222176b0935e799 | |
| parent | fc1471cd298f33e3cca41ecf0a174c43c94e0ae7 (diff) | |
| parent | 7a95c15c1599cb62e2fb2033511486a03812b0fe (diff) | |
| download | build-946b5c5e7f5cec48724c4bf3762289be2a29a666.tar.gz | |
Merge "Convert liboemaids to oemaids_headers as a headers only library"
| -rw-r--r-- | tools/fs_config/Android.mk | 8 | ||||
| -rw-r--r-- | tools/fs_config/README | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk index 1247896acd..f946303634 100644 --- a/tools/fs_config/Android.mk +++ b/tools/fs_config/Android.mk @@ -244,14 +244,14 @@ endif ifneq ($(TARGET_FS_CONFIG_GEN),) ################################## -# Build the oemaid library when fs config files are present. -# Intentionally break build if you require generated AIDS +# Build the oemaid header library when fs config files are present. +# Intentionally break build if you require generated AIDs # header file, but are not using any fs config files. include $(CLEAR_VARS) -LOCAL_MODULE := liboemaids +LOCAL_MODULE := oemaids_headers LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(my_gen_oem_aid)) LOCAL_EXPORT_C_INCLUDE_DEPS := $(my_gen_oem_aid) -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_HEADER_LIBRARY) ################################## # Generate the system/etc/passwd text file for the target diff --git a/tools/fs_config/README b/tools/fs_config/README index 5af407f86a..cc2a68ff87 100644 --- a/tools/fs_config/README +++ b/tools/fs_config/README @@ -122,7 +122,7 @@ header file. For OEMs wishing to use the define AIDs in their native code, one can access the generated header file like so: 1. In your C code just #include "generated_oem_aid.h" and start using the declared identifiers. - 2. In your Makefile add this static library like so: LOCAL_STATIC_LIBRARIES := liboemaids + 2. In your Makefile add this static library like so: LOCAL_HEADER_LIBRARIES := oemaids_headers Unit Tests: |