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

Commit 0aa2a34d authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b 

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



Change-Id: If17d717883160e90a0aae19dbf2b6a8b12afcb0b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26452946 b5ec156b

core/base_rules.mk

+6 −58
Original line number Diff line number Diff line
@@ -124,11 +124,6 @@ include $(BUILD_SYSTEM)/local_vndk.mk 
include $(BUILD_SYSTEM)/local_systemsdk.mk

include $(BUILD_SYSTEM)/local_current_sdk.mk



my_module_tags := $(LOCAL_MODULE_TAGS)

ifeq ($(my_host_cross),true)

  my_module_tags :=

endif



# Ninja has an implicit dependency on the command being run, and kati will

# regenerate the ninja manifest if any read makefile changes, so there is no

# need to have dependencies on makefiles.
@@ -148,46 +143,13 @@ endif 
## Validate and define fallbacks for input LOCAL_* variables.

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



## Dump a .csv file of all modules and their tags

#ifneq ($(tag-list-first-time),false)

#$(shell rm -f tag-list.csv)

#tag-list-first-time := false

#endif

#$(shell echo $(lastword $(filter-out config/% out/%,$(MAKEFILE_LIST))),$(LOCAL_MODULE),$(strip $(LOCAL_MODULE_CLASS)),$(subst $(space),$(comma),$(sort $(my_module_tags))) >> tag-list.csv)



LOCAL_UNINSTALLABLE_MODULE := $(strip $(LOCAL_UNINSTALLABLE_MODULE))

my_module_tags := $(sort $(my_module_tags))

ifeq (,$(my_module_tags))

  my_module_tags := optional

endif



# User tags are not allowed anymore.  Fail early because it will not be installed

# like it used to be.

ifneq ($(filter $(my_module_tags),user),)

  $(warning *** Module name: $(LOCAL_MODULE))

  $(warning *** Makefile location: $(LOCAL_MODULE_MAKEFILE))

  $(warning * )

  $(warning * Module is attempting to use the 'user' tag.  This)

  $(warning * used to cause the module to be installed automatically.)

  $(warning * Now, the module must be listed in the PRODUCT_PACKAGES)

  $(warning * section of a product makefile to have it installed.)

  $(warning * )

  $(error user tag detected on module.)

endif



my_bad_module_tags := $(filter eng debug,$(my_module_tags))

ifdef my_bad_module_tags

  ifeq (true,$(LOCAL_UNINSTALLABLE_MODULE))

    $(call pretty-warning,LOCAL_MODULE_TAGS := $(my_bad_module_tags) does not do anything for uninstallable modules)

  endif

  $(call pretty-error,LOCAL_MODULE_TAGS := $(my_bad_module_tags) is obsolete. See $(CHANGES_URL)#LOCAL_MODULE_TAGS)

endif



# Only the tags mentioned in this test are expected to be set by module

# makefiles. Anything else is either a typo or a source of unexpected

# behaviors.

ifneq ($(filter-out tests optional samples,$(my_module_tags)),)

$(call pretty-error,unusual tags: $(filter-out tests optional samples,$(my_module_tags)))

ifneq ($(filter-out tests optional samples,$(LOCAL_MODULE_TAGS)),)

$(call pretty-error,unusual tags: $(filter-out tests optional samples,$(LOCAL_MODULE_TAGS)))

endif



LOCAL_MODULE_CLASS := $(strip $(LOCAL_MODULE_CLASS))
@@ -240,7 +202,7 @@ else ifeq (NATIVE_TESTS,$(LOCAL_MODULE_CLASS)) 
else

  # The definition of should-install-to-system will be different depending

  # on which goal (e.g., sdk or just droid) is being built.

  partition_tag := $(if $(call should-install-to-system,$(my_module_tags)),,_DATA)

  partition_tag := $(if $(call should-install-to-system,$(LOCAL_MODULE_TAGS)),,_DATA)

  actual_partition_tag := $(if $(partition_tag),data,system)

endif

endif
@@ -252,7 +214,7 @@ ifndef LOCAL_COMPATIBILITY_SUITE 
    LOCAL_COMPATIBILITY_SUITE := null-suite

  endif

  ifneq ($(filter APPS, $(LOCAL_MODULE_CLASS)),)

    ifneq ($(filter $(my_module_tags),tests),)

    ifneq ($(filter $(LOCAL_MODULE_TAGS),tests),)

      LOCAL_COMPATIBILITY_SUITE := null-suite

    endif

  endif
@@ -947,7 +909,7 @@ ALL_MODULES.$(my_register_name).CLASS := \ 
ALL_MODULES.$(my_register_name).PATH := \

    $(ALL_MODULES.$(my_register_name).PATH) $(LOCAL_PATH)

ALL_MODULES.$(my_register_name).TAGS := \

    $(ALL_MODULES.$(my_register_name).TAGS) $(my_module_tags)

    $(ALL_MODULES.$(my_register_name).TAGS) $(LOCAL_MODULE_TAGS)

ALL_MODULES.$(my_register_name).CHECKED := \

    $(ALL_MODULES.$(my_register_name).CHECKED) $(my_checked_module)

ALL_MODULES.$(my_register_name).BUILT := \
@@ -1210,20 +1172,6 @@ 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))



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

## Take care of my_module_tags

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



# Keep track of all the tags we've seen.

ALL_MODULE_TAGS := $(sort $(ALL_MODULE_TAGS) $(my_module_tags))



# Add this module name to the tag list of each specified tag.

$(foreach tag,$(filter-out optional,$(my_module_tags)),\

    $(eval ALL_MODULE_NAME_TAGS.$(tag) := $$(ALL_MODULE_NAME_TAGS.$(tag)) $(my_register_name)))



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

## umbrella targets used to verify builds

###########################################################
@@ -1250,7 +1198,7 @@ endif 


ifdef j_or_n

$(j_or_n) $(h_or_t) $(j_or_n)-$(h_or_hc_or_t) : $(my_checked_module)

ifneq (,$(filter $(my_module_tags),tests))

ifneq (,$(filter $(LOCAL_MODULE_TAGS),tests))

$(j_or_n)-$(h_or_t)-tests $(j_or_n)-tests $(h_or_t)-tests : $(my_checked_module)

endif

$(LOCAL_MODULE)-$(h_or_hc_or_t) : $(my_all_targets)

core/binary.mk

+7 −20
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ endif 
# MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because

# all code is position independent, and then those warnings get promoted to

# errors.

ifneq ($(LOCAL_NO_PIC),true)

ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

  my_cflags += -fPIE

  ifndef BUILD_HOST_static
@@ -365,7 +364,6 @@ ifneq ($(LOCAL_NO_PIC),true) 
else

  my_cflags += -fPIC

endif

endif



ifdef LOCAL_IS_HOST_MODULE

my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) $(LOCAL_SRC_FILES_$($(my_prefix)OS)_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
@@ -1437,17 +1435,6 @@ built_whole_libraries := \ 
      $(call intermediates-dir-for, \

        STATIC_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/$(lib)$(a_suffix))



# We don't care about installed static libraries, since the

# libraries have already been linked into the module at that point.

# We do, however, care about the NOTICE files for any static

# libraries that we use. (see notice_files.mk)

installed_static_library_notice_file_targets := \

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

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-STATIC_LIBRARIES-$(lib))



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



# Default is -fno-rtti.

ifeq ($(strip $(LOCAL_RTTI_FLAG)),)

LOCAL_RTTI_FLAG := -fno-rtti

core/cc_prebuilt_internal.mk

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ ifneq ($(filter true keep_symbols no_debuglink mini-debug-info,$(my_strip_module 
  ifeq ($(filter SHARED_LIBRARIES EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

    $(call pretty-error,Can strip/pack only shared libraries or executables)

  endif

  ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)

    $(call pretty-error,Cannot strip/pack scripts)

  endif

  # Set the arch-specific variables to set up the strip rules

  LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) := $(my_strip_module)

  include $(BUILD_SYSTEM)/dynamic_binary.mk

core/clear_vars.mk

+0 −36
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
# '',true

LOCAL_2ND_ARCH_VAR_PREFIX:=

LOCAL_32_BIT_ONLY:=

LOCAL_AAPT2_ONLY:=

LOCAL_AAPT_FLAGS:=

LOCAL_AAPT_INCLUDE_ALL_RESOURCES:=

LOCAL_AAPT_NAMESPACES:=
@@ -13,15 +12,11 @@ LOCAL_ACONFIG_FILES:= 
LOCAL_ADDITIONAL_CERTIFICATES:=

LOCAL_ADDITIONAL_CHECKED_MODULE:=

LOCAL_ADDITIONAL_DEPENDENCIES:=

LOCAL_ADDITIONAL_HTML_DIR:=

LOCAL_ADDITIONAL_JAVA_DIR:=

LOCAL_AIDL_INCLUDES:=

LOCAL_ALLOW_UNDEFINED_SYMBOLS:=

LOCAL_ANNOTATION_PROCESSORS:=

LOCAL_ANNOTATION_PROCESSOR_CLASSES:=

LOCAL_APEX_KEY_PATH:=

LOCAL_APIDIFF_NEWAPI:=

LOCAL_APIDIFF_OLDAPI:=

LOCAL_APK_LIBRARIES:=

LOCAL_APK_SET_INSTALL_FILE:=

LOCAL_APKCERTS_FILE:=
@@ -54,8 +49,6 @@ LOCAL_CPP_EXTENSION:= 
LOCAL_CPPFLAGS:=

LOCAL_CPP_STD:=

LOCAL_C_STD:=

LOCAL_CTS_TEST_PACKAGE:=

LOCAL_CTS_TEST_RUNNER:=

LOCAL_CXX:=

LOCAL_CXX_STL := default

LOCAL_DEX_PREOPT_APP_IMAGE:=
@@ -74,21 +67,11 @@ LOCAL_DPI_FILE_STEM:= 
LOCAL_DPI_VARIANTS:=

LOCAL_DROIDDOC_ANNOTATIONS_ZIP :=

LOCAL_DROIDDOC_API_VERSIONS_XML :=

LOCAL_DROIDDOC_ASSET_DIR:=

LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=

LOCAL_DROIDDOC_DOC_ZIP :=

LOCAL_DROIDDOC_HTML_DIR:=

LOCAL_DROIDDOC_METADATA_ZIP:=

LOCAL_DROIDDOC_OPTIONS:=

LOCAL_DROIDDOC_SOURCE_PATH:=

LOCAL_DROIDDOC_STUB_OUT_DIR:=

LOCAL_DROIDDOC_STUBS_SRCJAR :=

LOCAL_DROIDDOC_TEMPLATE_DIR:=

LOCAL_DROIDDOC_USE_STANDARD_DOCLET:=

LOCAL_DX_FLAGS:=

LOCAL_DYLIB_LIBRARIES:=

LOCAL_EMMA_COVERAGE_FILTER:=

LOCAL_EMMA_INSTRUMENT:=

LOCAL_ENFORCE_USES_LIBRARIES:=

LOCAL_ERROR_PRONE_FLAGS:=
@@ -129,7 +112,6 @@ LOCAL_INJECT_BSSL_HASH:= 
LOCAL_INSTALLED_MODULE:=

LOCAL_INSTALLED_MODULE_STEM:=

LOCAL_INSTRUMENTATION_FOR:=

LOCAL_INTERMEDIATE_SOURCE_DIR:=

LOCAL_INTERMEDIATE_SOURCES:=

LOCAL_INTERMEDIATE_TARGETS:=

LOCAL_IS_FUZZ_TARGET:=
@@ -137,15 +119,8 @@ LOCAL_IS_HOST_MODULE:= 
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:=

LOCAL_IS_UNIT_TEST:=

LOCAL_TEST_OPTIONS_TAGS:=

LOCAL_JACK_CLASSPATH:=

LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:=

LOCAL_JACK_COVERAGE_INCLUDE_FILTER:=

# '' (ie disabled), disabled, full, incremental, javac_frontend

LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED)

LOCAL_JACK_FLAGS:=

LOCAL_JACK_PLUGIN:=

LOCAL_JACK_PLUGIN_PATH:=

LOCAL_JACK_PROGUARD_FLAGS:=

LOCAL_JAR_EXCLUDE_FILES:=

LOCAL_JAR_EXCLUDE_PACKAGES:=

LOCAL_JARJAR_RULES:=
@@ -158,7 +133,6 @@ LOCAL_JAVA_LANGUAGE_VERSION:= 
LOCAL_JAVA_LIBRARIES:=

LOCAL_JAVA_RESOURCE_DIRS:=

LOCAL_JAVA_RESOURCE_FILES:=

LOCAL_JETIFIER_ENABLED:=

LOCAL_JNI_SHARED_LIBRARIES:=

LOCAL_JNI_SHARED_LIBRARIES_ABI:=

LOCAL_CERTIFICATE_LINEAGE:=
@@ -200,10 +174,8 @@ LOCAL_NDK_STL_VARIANT:= 
LOCAL_NDK_VERSION:=current

LOCAL_NO_CRT:=

LOCAL_NO_DEFAULT_COMPILER_FLAGS:=

LOCAL_NO_FPIE :=

LOCAL_NO_LIBCRT_BUILTINS:=

LOCAL_NO_NOTICE_FILE:=

LOCAL_NO_PIC:=

LOCAL_NOSANITIZE:=

LOCAL_NO_STANDARD_LIBRARIES:=

LOCAL_NO_STATIC_ANALYZER:=
@@ -229,7 +201,6 @@ LOCAL_PREBUILT_LIBS:= 
LOCAL_PREBUILT_MODULE_FILE:=

LOCAL_PREBUILT_OBJ_FILES:=

LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=

LOCAL_PREBUILT_STRIP_COMMENTS:=

LOCAL_USE_EMBEDDED_DEX:=

LOCAL_USE_EMBEDDED_NATIVE_LIBS:=

LOCAL_PRESUBMIT_DISABLED:=
@@ -265,7 +236,6 @@ LOCAL_REQUIRED_MODULES:= 
LOCAL_RES_LIBRARIES:=

LOCAL_RESOURCE_DIR:=

LOCAL_RLIB_LIBRARIES:=

LOCAL_RMTYPEDEFS:=

LOCAL_ROTATION_MIN_SDK_VERSION:=

LOCAL_RUNTIME_LIBRARIES:=

LOCAL_RRO_THEME:=
@@ -339,16 +309,10 @@ LOCAL_USES_LIBRARIES:= 
LOCAL_VENDOR_MODULE:=

LOCAL_VINTF_FRAGMENTS:=

LOCAL_VNDK_DEPEND_ON_CORE_VARIANT:=

LOCAL_VTSC_FLAGS:=

LOCAL_VTS_INCLUDES:=

LOCAL_VTS_MODE:=

LOCAL_WARNINGS_ENABLE:=

LOCAL_WHOLE_STATIC_LIBRARIES:=

LOCAL_YACCFLAGS:=

LOCAL_CHECK_ELF_FILES:=

# TODO: deprecate, it does nothing

OVERRIDE_BUILT_MODULE_PATH:=



# arch specific variables

LOCAL_ASFLAGS_$(TARGET_ARCH):=

LOCAL_CFLAGS_$(TARGET_ARCH):=

core/definitions.mk

+0 −60
Original line number Diff line number Diff line
@@ -48,20 +48,6 @@ ALL_COPIED_TARGETS:= 
# set of installed targets.

ALL_DEFAULT_INSTALLED_MODULES:=



# The list of tags that have been defined by

# LOCAL_MODULE_TAGS.  Each word in this variable maps

# to a corresponding ALL_MODULE_TAGS.<tagname> variable

# that contains all of the INSTALLED_MODULEs with that tag.

ALL_MODULE_TAGS:=



# Similar to ALL_MODULE_TAGS, but contains the short names

# of all targets for a particular tag.  The top-level variable

# won't have the list of tags;  ust ALL_MODULE_TAGS to get

# the list of all known tags.  (This means that this variable

# will always be empty; it's just here as a placeholder for

# its sub-variables.)

ALL_MODULE_NAME_TAGS:=



# Full path to all asm, C, C++, lex and yacc generated C files.

# These all have an order-only dependency on the copied headers

ALL_C_CPP_ETC_OBJECTS:=
@@ -1294,38 +1280,6 @@ define exported-sdk-libs-files 
$(foreach lib,$(1),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/exported-sdk-libs)

endef



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

## MODULE_TAG set operations

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



# Given a list of tags, return the targets that specify

# any of those tags.

# $(1): tag list

define modules-for-tag-list

$(sort $(foreach tag,$(1),$(foreach m,$(ALL_MODULE_NAME_TAGS.$(tag)),$(ALL_MODULES.$(m).INSTALLED))))

endef



# Same as modules-for-tag-list, but operates on

# ALL_MODULE_NAME_TAGS.

# $(1): tag list

define module-names-for-tag-list

$(sort $(foreach tag,$(1),$(ALL_MODULE_NAME_TAGS.$(tag))))

endef



# Given an accept and reject list, find the matching

# set of targets.  If a target has multiple tags and

# any of them are rejected, the target is rejected.

# Reject overrides accept.

# $(1): list of tags to accept

# $(2): list of tags to reject

#TODO(dbort): do $(if $(strip $(1)),$(1),$(ALL_MODULE_TAGS))

#TODO(jbq): as of 20100106 nobody uses the second parameter

define get-tagged-modules

$(filter-out \

  $(call modules-for-tag-list,$(2)), \

    $(call modules-for-tag-list,$(1)))

endef



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

## Append a leaf to a base path.  Properly deals with

## base paths ending in /.
@@ -3289,14 +3243,6 @@ $(hide) rm -f $@ 
$(hide) cp -p "$<" "$@"

endef



# The same as copy-file-to-target, but strip out "# comment"-style

# comments (for config files and such).

define copy-file-to-target-strip-comments

@mkdir -p $(dir $@)

$(hide) rm -f $@

$(hide) sed -e 's/#.*$$//' -e 's/[ \t]*$$//' -e '/^$$/d' < $< > $@

endef



# The same as copy-file-to-target, but don't preserve

# the old modification time.

define copy-file-to-new-target
@@ -3331,12 +3277,6 @@ define transform-prebuilt-to-target 
$(copy-file-to-target)

endef



# Copy a prebuilt file to a target location, stripping "# comment" comments.

define transform-prebuilt-to-target-strip-comments

@echo "$($(PRIVATE_PREFIX)DISPLAY) Prebuilt: $(PRIVATE_MODULE) ($@)"

$(copy-file-to-target-strip-comments)

endef



# Copy a prebuilt file to a target location, but preserve symlinks rather than

# dereference them.

define copy-or-link-prebuilt-to-target