Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1355c460 authored by Tom Cherry's avatar Tom Cherry
Browse files

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 7a95c15c)
parent 51e21a47

tools/fs_config/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -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

tools/fs_config/README

+1 −1
Original line number Diff line number Diff line
@@ -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: