p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert liboemaids to oemaids_headers as a headers only library 

Bug: 77298768
Test: test that config.fs AIDs are visible through this library
Change-Id: Ifbf3276212ea6904533ac23021bfce29d9a3c5d9
(cherry picked from commit 7a95c15c15)
This commit is contained in:
Tom Cherry 2018-04-04 11:21:29 -07:00
parent 51e21a477b
commit 1355c4603c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/fs_config/Android.mk
View File

@ -244,14 +244,14 @@ endif
ifneq ($(TARGET_FS_CONFIG_GEN),) ifneq ($(TARGET_FS_CONFIG_GEN),)
################################## ##################################
# Build the oemaid library when fs config files are present. # Build the oemaid header library when fs config files are present.
# Intentionally break build if you require generated AIDS # Intentionally break build if you require generated AIDs
# header file, but are not using any fs config files. # header file, but are not using any fs config files.
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := liboemaids LOCAL_MODULE := oemaids_headers
LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(my_gen_oem_aid)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(my_gen_oem_aid))
LOCAL_EXPORT_C_INCLUDE_DEPS := $(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 # Generate the system/etc/passwd text file for the target

2
tools/fs_config/README
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 For OEMs wishing to use the define AIDs in their native code, one can access the generated header
file like so: file like so:
1. In your C code just #include "generated_oem_aid.h" and start using the declared identifiers. 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: Unit Tests: