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

Commit be8d6429 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Device-specific kernel headers are accessbile again" 

am: 6f594fc6

Change-Id: Icffe772cc97a39fceb21e0a22a3776313bbefa1f
parents fcc2cf6c 6f594fc6

core/binary.mk

+2 −0
Original line number Diff line number Diff line
@@ -1374,6 +1374,8 @@ endif 
####################################################

import_includes := $(intermediates)/import_includes

import_includes_deps := $(strip \

    $(if $(LOCAL_USE_VNDK),\

      $(call intermediates-dir-for,HEADER_LIBRARIES,device_kernel_headers,$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes) \

    $(foreach l, $(installed_shared_library_module_names), \

      $(call intermediates-dir-for,SHARED_LIBRARIES,$(l),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes) \

    $(foreach l, $(my_static_libraries) $(my_whole_static_libraries), \

core/soong_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ $(SOONG_VARIABLES): FORCE 
	echo ''; \

	echo '    "ArtUseReadBarrier": $(if $(filter false,$(PRODUCT_ART_USE_READ_BARRIER)),false,true),'; \

	echo ''; \

	echo '    "BtConfigIncludeDir": "$(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)"'; \

	echo '    "BtConfigIncludeDir": "$(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)",'; \

	echo ''; \

	echo '    "DeviceKernelHeaders": $(call json_list,$(strip $(TARGET_PROJECT_SYSTEM_INCLUDES)))'; \

	echo '}') > $(SOONG_VARIABLES_TMP); \

	if ! cmp -s $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); then \

	  mv $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); \