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

Commit 0c5aef4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "More performance improvements" am: 1d1bb3b9 am: 27d4463c am: 02dcbdb3 am: 373f5fad 

Original change: https://android-review.googlesource.com/c/platform/build/+/1326018

Change-Id: Ib436fd2204c09c0b935b87dc2030d38ce99e4cbe
parents 23d1c73f 373f5fad

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -1799,7 +1799,7 @@ export_include_deps += $(strip \ 
     $(call intermediates-dir-for,HEADER_LIBRARIES,$(l),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))))



ifneq ($(strip $(my_export_c_include_dirs)$(export_include_deps)),)

  EXPORTS_LIST := $(EXPORTS_LIST) $(intermediates)

  EXPORTS_LIST += $(intermediates)

  EXPORTS.$(intermediates).FLAGS := $(foreach d,$(my_export_c_include_dirs),-I $(call clean-path,$(d)))

  EXPORTS.$(intermediates).REEXPORT := $(export_include_deps)

  EXPORTS.$(intermediates).DEPS := $(my_export_c_include_deps) $(my_generated_sources) $(LOCAL_EXPORT_C_INCLUDE_DEPS)

core/cc_prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ else # my_strip_module not true 
  built_module := $(LOCAL_BUILT_MODULE)



ifdef prebuilt_module_is_a_library

EXPORTS_LIST := $(EXPORTS_LIST) $(intermediates)

EXPORTS_LIST += $(intermediates)

EXPORTS.$(intermediates).FLAGS := $(foreach d,$(LOCAL_EXPORT_C_INCLUDE_DIRS),-I $(d))

EXPORTS.$(intermediates).DEPS := $(LOCAL_EXPORT_C_INCLUDE_DEPS)

core/definitions.mk

+9 −0
Original line number Diff line number Diff line
@@ -110,6 +110,15 @@ ALL_DISABLED_PRESUBMIT_TESTS := 
# All compatibility suites mentioned in LOCAL_COMPATIBILITY_SUITES

ALL_COMPATIBILITY_SUITES :=



# All LINK_TYPE entries

ALL_LINK_TYPES :=



# All exported/imported include entries

EXPORTS_LIST :=



# All modules already converted to Soong

SOONG_ALREADY_CONV :=



###########################################################

## Debugging; prints a variable list to stdout

###########################################################

core/link_type.mk

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


my_link_prefix := LINK_TYPE:$(call find-idf-prefix,$(my_kind),$(my_host_cross)):$(if $(my_common),$(my_common):_,_:$(if $(my_2nd_arch_prefix),$(my_2nd_arch_prefix),_))

link_type := $(my_link_prefix):$(LOCAL_MODULE_CLASS):$(LOCAL_MODULE)

ALL_LINK_TYPES := $(ALL_LINK_TYPES) $(link_type)

ALL_LINK_TYPES += $(link_type)

$(link_type).TYPE := $(my_link_type)

$(link_type).MAKEFILE := $(LOCAL_MODULE_MAKEFILE)

$(link_type).WARN := $(my_warn_types)

core/soong_android_app_set.mk

+1 −1
Original line number Diff line number Diff line
@@ -31,4 +31,4 @@ LOCAL_POST_INSTALL_CMD := unzip -qo -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \ 
$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))



SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE)
 
SOONG_ALREADY_CONV += $(LOCAL_MODULE)