Merge "Convert liboemaids to oemaids_headers as a headers only library" am: 946b5c5e7f

am: 7044082d04

Change-Id: Ia39ebe6bcd691ee31d2438dd279e41917e8278b5
This commit is contained in:
Tom Cherry 2018-04-04 16:26:13 -07:00 committed by android-build-merger
commit 87d5583d12
2 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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: