DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too

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

Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: Mike J. Chen <mjchen@google.com>
This commit is contained in:
Ying Wang 2012-12-03 18:24:55 -08:00 committed by Mike J. Chen
parent fb959d01d5
commit 383ecfaf02
1 changed files with 10 additions and 2 deletions

View File

@ -59,10 +59,18 @@ else
built_module := $(LOCAL_BUILT_MODULE) built_module := $(LOCAL_BUILT_MODULE)
ifdef prebuilt_module_is_a_library ifdef prebuilt_module_is_a_library
# Create a dummy export_includes. export_includes := $(intermediates)/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 $@ $(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 $@ $(hide) touch $@
endif
$(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes $(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes
endif endif