diff options
| author | Steve Kondik <steve@cyngn.com> | 2014-12-28 02:53:03 -0800 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-06 18:02:55 -0700 |
| commit | 64245de7e01e4812712ea05b923777e343dea39c (patch) | |
| tree | d95de45f032142c60ec7883e5d2f6a60961e1e92 /core/config.mk | |
| parent | aae9b009e4164c76017459a7fb47a9ee62ec71e2 (diff) | |
| download | build-64245de7e01e4812712ea05b923777e343dea39c.zip build-64245de7e01e4812712ea05b923777e343dea39c.tar.gz build-64245de7e01e4812712ea05b923777e343dea39c.tar.bz2 | |
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
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 11 |
1 files changed, 5 insertions, 6 deletions
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 |