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

Commit 383ecfaf authored by Ying Wang's avatar Ying Wang Committed by Mike J. Chen
Browse files

DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too 



Cherry picked from commit fe3f62d0
in master.  Since this is already in master, and we're upstream,
set to DO NOT MERGE.

Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: default avatarMike J. Chen <mjchen@google.com>
parent fb959d01

core/prebuilt.mk

+10 −2
Original line number Diff line number Diff line
@@ -59,10 +59,18 @@ else 
  built_module := $(LOCAL_BUILT_MODULE)



ifdef prebuilt_module_is_a_library

# Create a dummy export_includes.

$(intermediates)/export_includes:

export_includes := $(intermediates)/export_includes

$(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(LOCAL_EXPORT_C_INCLUDE_DIRS)

$(export_includes) : $(LOCAL_MODULE_MAKEFILE)

	@echo Export includes file: $< -- $@

	$(hide) mkdir -p $(dir $@) && rm -f $@

ifdef LOCAL_EXPORT_C_INCLUDE_DIRS

	$(hide) for d in $(PRIVATE_EXPORT_C_INCLUDE_DIRS); do \

	        echo "-I $$d" >> $@; \

	        done

else

	$(hide) touch $@

endif



$(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes

endif