From 0be6907b2b2bfc7d36e7fae1d26fa6ab73598113 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 13 Dec 2016 18:28:33 -0800 Subject: [PATCH] Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert Soong only supports exporting include directories under the current directory. So bring non-local directories up as a potential problem in soong_to_convert.txt Test: m -j $OUT/soong_to_convert.txt, inspect Change-Id: I7a15b92e10a1d8b8d3496c6f0529a0d0824f301e --- core/binary.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/binary.mk b/core/binary.mk index 848bba9afc..b37ef80c42 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -1805,6 +1805,10 @@ endif $(LOCAL_BUILT_MODULE) : | $(export_includes) $(my_link_type) ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) +ifneq (,$(filter-out $(LOCAL_PATH)/%,$(my_export_c_include_dirs))) +my_soong_problems += non_local__export_c_include_dirs +endif + SOONG_CONV.$(LOCAL_MODULE).PROBLEMS := \ $(SOONG_CONV.$(LOCAL_MODULE).PROBLEMS) $(my_soong_problems) SOONG_CONV.$(LOCAL_MODULE).DEPS := \