From 64245de7e01e4812712ea05b923777e343dea39c Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sun, 28 Dec 2014 02:53:03 -0800 Subject: core: Get the RIL variant path into the global includes * Need to have this in the global path, so shuffle things around a little. Change-Id: I2dd2b378d17ff3fa0e379793df31d68964d87278 --- core/config.mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'core/config.mk') diff --git a/core/config.mk b/core/config.mk index 7b72c59..04c6d54 100644 --- a/core/config.mk +++ b/core/config.mk @@ -41,7 +41,6 @@ SRC_HEADERS := \ $(TOPDIR)system/media/audio/include \ $(TOPDIR)hardware/libhardware/include \ $(TOPDIR)hardware/libhardware_legacy/include \ - $(TOPDIR)hardware/ril/include \ $(TOPDIR)libnativehelper/include \ $(TOPDIR)frameworks/native/include \ $(TOPDIR)frameworks/native/opengl/include \ @@ -541,10 +540,12 @@ else DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey endif +# Rules for QCOM targets +include $(BUILD_SYSTEM)/qcom_target.mk + # ############################################################### # Set up final options. # ############################################################### - HOST_GLOBAL_CFLAGS += $(COMMON_GLOBAL_CFLAGS) HOST_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS) @@ -561,7 +562,8 @@ HOST_GLOBAL_LD_DIRS += -L$(HOST_OUT_INTERMEDIATE_LIBRARIES) TARGET_GLOBAL_LD_DIRS += -L$(TARGET_OUT_INTERMEDIATE_LIBRARIES) HOST_PROJECT_INCLUDES:= $(SRC_HEADERS) $(SRC_HOST_HEADERS) $(HOST_OUT_HEADERS) -TARGET_PROJECT_INCLUDES:= $(SRC_HEADERS) $(TARGET_OUT_HEADERS) \ +TARGET_PROJECT_INCLUDES:= $(SRC_HEADERS) $(TOPDIR)$(call project-path-for,ril)/include \ + $(TARGET_OUT_HEADERS) \ $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) \ $(TARGET_PRODUCT_KERNEL_HEADERS) @@ -692,9 +694,6 @@ endif RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20 RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13 -# Rules for QCOM targets -include $(BUILD_SYSTEM)/qcom_target.mk - # We might want to skip items listed in PRODUCT_COPY_FILES based on # various target flags. This is useful for replacing a binary module with one # built from source. This should be a list of destination files under $OUT -- cgit v1.1