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

Commit e526ba56 authored by Steve Kondik's avatar Steve Kondik
Browse files

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
parent a99092c9

core/config.mk

+5 −6
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ SRC_HEADERS := \ 
	$(TOPDIR)system/core/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 \
@@ -486,10 +485,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)
@@ -506,7 +507,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)
@@ -622,9 +624,6 @@ RS_PREBUILT_CLCORE := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/librsrt_$(TA 
RS_PREBUILT_LIBPATH := -L prebuilts/ndk/8/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib

RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcompiler_rt.a



# 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