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

Commit a2074294 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6583806 from 7e5fa3e7 to mainline-release 

Change-Id: Ic6861b25d9f00bebb2917842340edf9bc3ded737
parents 5d37f3d1 7e5fa3e7

core/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -4250,6 +4250,9 @@ ifeq ($(INSTALLED_BOOTIMAGE_TARGET),) 
else

	echo "boot_images=$(foreach b,$(INSTALLED_BOOTIMAGE_TARGET),$(notdir $(b)))" >> $@

endif

ifeq ($(BOARD_RAMDISK_USE_LZ4),true)

	echo "lz4_ramdisks=true" >> $@

endif

ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)

	echo "vendor_boot=true" >> $@

	echo "vendor_boot_size=$(BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE)" >> $@

core/base_rules.mk

+45 −17
Original line number Diff line number Diff line
@@ -183,11 +183,10 @@ endif 
# file, tag the module as "gnu".  Search for "*_GPL*", "*_LGPL*" and "*_MPL*"

# so that we can also find files like MODULE_LICENSE_GPL_AND_AFL

#

license_files := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*)

gpl_license_file := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*_GPL* MODULE_LICENSE*_MPL* MODULE_LICENSE*_LGPL*)

ifneq ($(gpl_license_file),)

  my_module_tags += gnu

  ALL_GPL_MODULE_LICENSE_FILES := $(sort $(ALL_GPL_MODULE_LICENSE_FILES) $(gpl_license_file))

  ALL_GPL_MODULE_LICENSE_FILES += $(gpl_license_file)

endif



LOCAL_MODULE_CLASS := $(strip $(LOCAL_MODULE_CLASS))
@@ -327,9 +326,19 @@ $(error $(LOCAL_PATH): $(module_id) already defined by $($(module_id))) 
endif

$(module_id) := $(LOCAL_PATH)



intermediates := $(call local-intermediates-dir,,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))

intermediates.COMMON := $(call local-intermediates-dir,COMMON)

generated_sources_dir := $(call local-generated-sources-dir)

# These are the same as local-intermediates-dir / local-generated-sources dir, but faster

intermediates.COMMON := $($(my_prefix)OUT_COMMON_INTERMEDIATES)/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates

ifneq (,$(filter $(my_prefix)$(LOCAL_MODULE_CLASS),$(COMMON_MODULE_CLASSES)))

  intermediates := $($(my_prefix)OUT_COMMON_INTERMEDIATES)/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates

  generated_sources_dir := $($(my_prefix)OUT_COMMON_GEN)/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates

else

  ifneq (,$(filter $(LOCAL_MODULE_CLASS),$(PER_ARCH_MODULE_CLASSES)))

    intermediates := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATES)/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates

  else

    intermediates := $($(my_prefix)OUT_INTERMEDIATES)/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates

  endif

  generated_sources_dir := $($(my_prefix)OUT_GEN)/$(LOCAL_MODULE_CLASS)/$(LOCAL_MODULE)_intermediates

endif



ifneq ($(LOCAL_OVERRIDES_MODULES),)

  ifndef LOCAL_IS_HOST_MODULE
@@ -574,17 +583,35 @@ ifneq ($(strip $(filter NATIVE_TESTS,$(LOCAL_MODULE_CLASS)) $(LOCAL_IS_FUZZ_TARG 
ifneq ($(strip $(LOCAL_TEST_DATA)),)

ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))



my_test_data_pairs := $(strip $(foreach td,$(LOCAL_TEST_DATA), \

    $(eval _file := $(call word-colon,2,$(td))) \

    $(if $(_file), \

      $(eval _src_base := $(call word-colon,1,$(td))), \

      $(eval _src_base := $(LOCAL_PATH)) \

        $(eval _file := $(call word-colon,1,$(td)))) \

    $(if $(call streq,$(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)),, \

      $(if $(findstring ..,$(_file)),$(error $(LOCAL_MODULE_MAKEFILE): LOCAL_TEST_DATA may not include '..': $(_file))) \

      $(if $(filter /%,$(_src_base) $(_file)),$(error $(LOCAL_MODULE_MAKEFILE): LOCAL_TEST_DATA may not include absolute paths: $(_src_base) $(_file)))) \

    $(eval my_test_data_file_pairs := $(my_test_data_file_pairs) $(call append-path,$(_src_base),$(_file)):$(_file)) \

    $(call append-path,$(_src_base),$(_file)):$(call append-path,$(my_module_path),$(_file))))

ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

  define copy_test_data_pairs

    _src_base := $$(call word-colon,1,$$(td))

    _file := $$(call word-colon,2,$$(td))

    my_test_data_pairs += $$(call append-path,$$(_src_base),$$(_file)):$$(call append-path,$$(my_module_path),$$(_file))

    my_test_data_file_pairs += $$(call append-path,$$(_src_base),$$(_file)):$$(_file)

  endef

else

  define copy_test_data_pairs

    _src_base := $$(call word-colon,1,$$(td))

    _file := $$(call word-colon,2,$$(td))

    ifndef _file

      _file := $$(_src_base)

      _src_base := $$(LOCAL_PATH)

    endif

    ifneq (,$$(findstring ..,$$(_file)))

      $$(call pretty-error,LOCAL_TEST_DATA may not include '..': $$(_file))

    endif

    ifneq (,$$(filter/%,$$(_src_base) $$(_file)))

      $$(call pretty-error,LOCAL_TEST_DATA may not include absolute paths: $$(_src_base) $$(_file))

    endif

    my_test_data_pairs += $$(call append-path,$$(_src_base),$$(_file)):$$(call append-path,$$(my_module_path),$$(_file))

    my_test_data_file_pairs += $$(call append-path,$$(_src_base),$$(_file)):$$(_file)

  endef

endif



$(foreach td,$(LOCAL_TEST_DATA),$(eval $(copy_test_data_pairs)))



copy_test_data_pairs :=



my_installed_test_data := $(call copy-many-files,$(my_test_data_pairs))

$(LOCAL_INSTALLED_MODULE): $(my_installed_test_data)
@@ -912,7 +939,7 @@ INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name) 
# Track module-level dependencies.

# Use $(LOCAL_MODULE) instead of $(my_register_name) to ignore module's bitness.

ifneq (,$(filter deps-license,$(MAKECMDGOALS)))

ALL_DEPS.MODULES := $(ALL_DEPS.MODULES) $(LOCAL_MODULE)

ALL_DEPS.MODULES += $(LOCAL_MODULE)

ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \

  $(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) \

  $(LOCAL_STATIC_LIBRARIES) \
@@ -926,6 +953,7 @@ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \ 
  $(LOCAL_JAVA_LIBRARIES) \

  $(LOCAL_JNI_SHARED_LIBRARIES))



license_files := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*)

ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files))

endif

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -1816,7 +1816,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

+22 −8
Original line number Diff line number Diff line
@@ -111,6 +111,18 @@ 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 :=



# ALL_DEPS.*.ALL_DEPS keys

ALL_DEPS.MODULES :=



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

## Debugging; prints a variable list to stdout

###########################################################
@@ -556,7 +568,7 @@ $(strip \ 
        $(error $(LOCAL_PATH): Name not defined in call to intermediates-dir-for)) \

    $(eval _idfPrefix := $(call find-idf-prefix,$(3),$(6))) \

    $(eval _idf2ndArchPrefix := $(if $(strip $(5)),$(TARGET_2ND_ARCH_VAR_PREFIX))) \

    $(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \

    $(if $(filter $(_idfPrefix)_$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \

        $(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_INTERMEDIATES)) \

      ,$(if $(filter $(_idfClass),$(PER_ARCH_MODULE_CLASSES)),\

          $(eval _idfIntBase := $($(_idf2ndArchPrefix)$(_idfPrefix)_OUT_INTERMEDIATES)) \
@@ -605,7 +617,7 @@ $(strip \ 
    $(if $(_idfName),, \

        $(error $(LOCAL_PATH): Name not defined in call to generated-sources-dir-for)) \

    $(eval _idfPrefix := $(call find-idf-prefix,$(3),)) \

    $(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \

    $(if $(filter $(_idfPrefix)_$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \

        $(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_GEN)) \

      , \

        $(eval _idfIntBase := $($(_idfPrefix)_OUT_GEN)) \
@@ -2895,12 +2907,14 @@ endef 
#    and use my_compat_dist_$(suite) to define the others.

define create-suite-dependencies

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(if $(filter $(suite),$(ALL_COMPATIBILITY_SUITES)),,$(eval ALL_COMPATIBILITY_SUITES += $(suite))) \

  $(eval COMPATIBILITY.$(suite).FILES := \

    $$(COMPATIBILITY.$(suite).FILES) $$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))) \

  $(if $(filter $(suite),$(ALL_COMPATIBILITY_SUITES)),,\

    $(eval ALL_COMPATIBILITY_SUITES += $(suite)) \

    $(eval COMPATIBILITY.$(suite).FILES :=) \

    $(eval COMPATIBILITY.$(suite).MODULES :=)) \

  $(eval COMPATIBILITY.$(suite).FILES += \

    $$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))) \

    $$(foreach f,$$(my_compat_dist_config_$(suite)),$$(call word-colon,2,$$(f)))) \

  $(eval COMPATIBILITY.$(suite).MODULES := \

    $$(COMPATIBILITY.$(suite).MODULES) $$(my_register_name))) \

  $(eval COMPATIBILITY.$(suite).MODULES += $$(my_register_name))) \

$(eval $(my_all_targets) : $(call copy-many-files, \

  $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_$(suite))))) \

  $(call copy-many-xml-files-checked, \