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

Commit dc556b4b authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Prohibit host modules from using LOCAL_COPY_HEADERS 

am: 6e51ef61

Change-Id: Id7c80e4dba5a505a04ce47d459c0a525debc4d53
parents 323efd30 6e51ef61

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -381,6 +381,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/*) 
$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/previous_overlays.txt)

$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/current_packages.txt)



$(call add-clean-step, rm -rf $(HOST_OUT_INTERMEDIATES)/include)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/binary.mk

+0 −2
Original line number Diff line number Diff line
@@ -545,10 +545,8 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_glob 
else # LOCAL_IS_HOST_MODULE



my_host_global_c_includes := $(SRC_HEADERS) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)

my_host_global_c_system_includes := $(SRC_SYSTEM_HEADERS) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_SYSTEM_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_SYSTEM_INCLUDES)



ifeq ($(my_clang),true)

core/config.mk

+0 −17
Original line number Diff line number Diff line
@@ -685,8 +685,6 @@ else 
RELATIVE_PWD :=

endif



HOST_PROJECT_INCLUDES :=

HOST_PROJECT_SYSTEM_INCLUDES := $(HOST_OUT_HEADERS)

TARGET_PROJECT_INCLUDES :=

TARGET_PROJECT_SYSTEM_INCLUDES := \

		$(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) \
@@ -697,21 +695,6 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_INCLUDES := $(TARGET_PROJECT_INCLUDE 
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_SYSTEM_INCLUDES := $(TARGET_PROJECT_SYSTEM_INCLUDES)

endif



ifdef HOST_2ND_ARCH

$(HOST_2ND_ARCH_VAR_PREFIX)HOST_PROJECT_INCLUDES := $(HOST_PROJECT_INCLUDES)

$(HOST_2ND_ARCH_VAR_PREFIX)HOST_PROJECT_SYSTEM_INCLUDES := $(HOST_PROJECT_SYSTEM_INCLUDES)

endif



ifdef HOST_CROSS_OS

HOST_CROSS_PROJECT_INCLUDES :=

HOST_CROSS_PROJECT_SYSTEM_INCLUDES := $(HOST_CROSS_OUT_HEADERS)



ifdef HOST_CROSS_2ND_ARCH

$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_PROJECT_INCLUDES:= $(HOST_CROSS_PROJECT_INCLUDES)

$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_PROJECT_SYSTEM_INCLUDES:= $(HOST_CROSS_PROJECT_SYSTEM_INCLUDES)

endif

endif



# allow overriding default Java libraries on a per-target basis

ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)

  TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart core-junit ext framework okhttp

core/copy_headers.mk

+4 −5
Original line number Diff line number Diff line
@@ -4,9 +4,8 @@ ifneq (,$(strip $(LOCAL_COPY_HEADERS))) 
###########################################################

$(call record-module-type,COPY_HEADERS)

ifneq ($(strip $(LOCAL_IS_HOST_MODULE)),)

  my_prefix := HOST_

else

  my_prefix := TARGET_

  $(shell echo $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): LOCAL_COPY_HEADERS may not be used with host modules >&2)

  $(error done)

endif



# Modules linking against the SDK do not have the include path to use
@@ -37,8 +36,8 @@ $(foreach header,$(LOCAL_COPY_HEADERS), \ 
  $(eval _chFrom := $(LOCAL_PATH)/$(header)) \

  $(eval _chTo := \

      $(if $(LOCAL_COPY_HEADERS_TO),\

        $($(my_prefix)OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header)),\

        $($(my_prefix)OUT_HEADERS)/$(notdir $(header)))) \

        $(TARGET_OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header)),\

        $(TARGET_OUT_HEADERS)/$(notdir $(header)))) \

  $(eval ALL_COPIED_HEADERS.$(_chTo).MAKEFILE += $(LOCAL_MODULE_MAKEFILE)) \

  $(eval ALL_COPIED_HEADERS.$(_chTo).SRC += $(_chFrom)) \

  $(if $(filter $(_chTo),$(ALL_COPIED_HEADERS)),, \

core/envsetup.mk

+0 −2
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT)/nativetest 
HOST_CROSS_OUT_COVERAGE := $(HOST_CROSS_OUT)/coverage



HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj

HOST_OUT_HEADERS := $(HOST_OUT_INTERMEDIATES)/include

HOST_OUT_INTERMEDIATE_LIBRARIES := $(HOST_OUT_INTERMEDIATES)/lib

HOST_OUT_NOTICE_FILES := $(HOST_OUT_INTERMEDIATES)/NOTICE_FILES

HOST_OUT_COMMON_INTERMEDIATES := $(HOST_COMMON_OUT_ROOT)/obj
@@ -280,7 +279,6 @@ HOST_OUT_FAKE := $(HOST_OUT)/fake_packages 
include $(BUILD_SYSTEM)/aux_config.mk



HOST_CROSS_OUT_INTERMEDIATES := $(HOST_CROSS_OUT)/obj

HOST_CROSS_OUT_HEADERS := $(HOST_CROSS_OUT_INTERMEDIATES)/include

HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES := $(HOST_CROSS_OUT_INTERMEDIATES)/lib

HOST_CROSS_OUT_NOTICE_FILES := $(HOST_CROSS_OUT_INTERMEDIATES)/NOTICE_FILES