Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main
* changes: Remove code related to unused LOCAL_* variables Delete unused variables from clear_vars.mk Remove obsolete ide.mk and related code Removed unused license code Remove obsolete uses of LOCAL_MODULE_TAGS
This commit is contained in:
Colin Cross
Gerrit Code Review
commit
b5ec156b32
15 changed files with 14 additions and 360 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -354,17 +354,15 @@ 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
|
||||
ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
|
||||
my_ldflags += -pie
|
||||
endif
|
||||
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
|
||||
my_cflags += -fPIE
|
||||
ifndef BUILD_HOST_static
|
||||
ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
|
||||
my_ldflags += -pie
|
||||
endif
|
||||
else
|
||||
my_cflags += -fPIC
|
||||
endif
|
||||
else
|
||||
my_cflags += -fPIC
|
||||
endif
|
||||
|
||||
ifdef LOCAL_IS_HOST_MODULE
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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):=
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -46,5 +46,4 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
|
||||
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
|
||||
|
|
|
|||
|
|
@ -83,8 +83,6 @@ LOCAL_INTERMEDIATE_TARGETS += \
|
|||
$(full_classes_stubs_jar) \
|
||||
$(java_source_list_file)
|
||||
|
||||
LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
|
||||
|
||||
###########################################################
|
||||
## AIDL: Compile .aidl files to .java
|
||||
###########################################################
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ endif
|
|||
######################################
|
||||
## PRIVATE java vars
|
||||
# LOCAL_SOURCE_FILES_ALL_GENERATED is set only if the module does not have static source files,
|
||||
# but generated source files in its LOCAL_INTERMEDIATE_SOURCE_DIR.
|
||||
# but generated source files.
|
||||
# You have to set up the dependency in some other way.
|
||||
need_compile_java := $(strip $(all_java_sources)$(LOCAL_SRCJARS)$(all_res_assets)$(java_resource_sources))$(LOCAL_STATIC_JAVA_LIBRARIES)$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED))
|
||||
ifdef need_compile_java
|
||||
|
|
@ -238,8 +238,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_RS_SOURCES :=
|
|||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCE_LIST := $(java_source_list_file)
|
||||
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS)
|
||||
|
||||
# Quickly check class path vars.
|
||||
disallowed_deps := $(foreach sdk,$(TARGET_AVAILABLE_SDK_VERSIONS),$(call resolve-prebuilt-sdk-module,$(sdk)))
|
||||
disallowed_deps += $(foreach sdk,$(TARGET_AVAILABLE_SDK_VERSIONS),\
|
||||
|
|
@ -492,20 +490,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JAVA_LIBRARIES := $(full_java_libs)
|
|||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JAVA_HEADER_LIBRARIES := $(full_java_header_libs)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SHARED_JAVA_HEADER_LIBRARIES := $(full_shared_java_header_libs)
|
||||
|
||||
ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \
|
||||
$(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR)
|
||||
|
||||
|
||||
##########################################################
|
||||
# Copy NOTICE files of transitive static dependencies
|
||||
# Don't do this in mm, since many of the targets won't exist.
|
||||
installed_static_library_notice_file_targets := \
|
||||
$(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \
|
||||
NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-JAVA_LIBRARIES-$(lib))
|
||||
|
||||
$(notice_target): | $(installed_static_library_notice_file_targets)
|
||||
$(LOCAL_INSTALLED_MODULE): | $(notice_target)
|
||||
|
||||
###########################################################
|
||||
# Verify that all libraries are safe to use
|
||||
###########################################################
|
||||
|
|
|
|||
|
|
@ -115,11 +115,6 @@ my_src_aar := $(filter %.aar, $(my_prebuilt_src_file))
|
|||
ifneq ($(my_src_aar),)
|
||||
# This is .aar file, archive of classes.jar and Android resources.
|
||||
|
||||
# run Jetifier if needed
|
||||
LOCAL_JETIFIER_INPUT_FILE := $(my_src_aar)
|
||||
include $(BUILD_SYSTEM)/jetifier.mk
|
||||
my_src_aar := $(LOCAL_JETIFIER_OUTPUT_FILE)
|
||||
|
||||
my_src_jar := $(intermediates.COMMON)/aar/classes.jar
|
||||
my_src_proguard_options := $(intermediates.COMMON)/aar/proguard.txt
|
||||
my_src_android_manifest := $(intermediates.COMMON)/aar/AndroidManifest.xml
|
||||
|
|
@ -137,13 +132,6 @@ my_prebuilt_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest
|
|||
$(eval $(call copy-one-file,$(my_src_android_manifest),$(my_prebuilt_android_manifest)))
|
||||
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_prebuilt_android_manifest))
|
||||
|
||||
else
|
||||
|
||||
# run Jetifier if needed
|
||||
LOCAL_JETIFIER_INPUT_FILE := $(my_src_jar)
|
||||
include $(BUILD_SYSTEM)/jetifier.mk
|
||||
my_src_jar := $(LOCAL_JETIFIER_OUTPUT_FILE)
|
||||
|
||||
endif
|
||||
|
||||
$(common_classes_jar) : $(my_src_jar)
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2018 The Android Open Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
# This file sets up the running of Jetifier
|
||||
|
||||
# now add the rule to run jetifier
|
||||
ifeq ($(strip $(LOCAL_JETIFIER_ENABLED)),true)
|
||||
my_jetifier_input_path := $(LOCAL_JETIFIER_INPUT_FILE)
|
||||
my_files := $(intermediates.COMMON)/jetifier
|
||||
my_jetifier_output_path := $(my_files)/jetified-$(notdir $(my_jetifier_input_path))
|
||||
|
||||
$(my_jetifier_output_path) : $(my_jetifier_input_path) $(JETIFIER)
|
||||
rm -rf $@
|
||||
$(JETIFIER) -l error -o $@ -i $<
|
||||
|
||||
LOCAL_JETIFIER_OUTPUT_FILE := $(my_jetifier_output_path)
|
||||
LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_JETIFIER_OUTPUT_FILE)
|
||||
else
|
||||
LOCAL_JETIFIER_OUTPUT_FILE := $(LOCAL_JETIFIER_INPUT_FILE)
|
||||
endif
|
||||
|
||||
28
core/main.mk
28
core/main.mk
|
|
@ -1399,28 +1399,7 @@ modules_to_install := $(sort \
|
|||
# var to prevent Make from trying to make a sense of it.
|
||||
_unused := $(call copy-many-files, $(sort $(ALL_COMPATIBILITY_DIST_FILES)))
|
||||
|
||||
# Don't include any GNU General Public License shared objects or static
|
||||
# libraries in SDK images. GPL executables (not static/dynamic libraries)
|
||||
# are okay if they don't link against any closed source libraries (directly
|
||||
# or indirectly)
|
||||
|
||||
# It's ok (and necessary) to build the host tools, but nothing that's
|
||||
# going to be installed on the target (including static libraries).
|
||||
|
||||
ifdef is_sdk_build
|
||||
target_gnu_MODULES := \
|
||||
$(filter \
|
||||
$(TARGET_OUT_INTERMEDIATES)/% \
|
||||
$(TARGET_OUT)/% \
|
||||
$(TARGET_OUT_DATA)/%, \
|
||||
$(sort $(call get-tagged-modules,gnu)))
|
||||
target_gnu_MODULES := $(filter-out $(TARGET_OUT_EXECUTABLES)/%,$(target_gnu_MODULES))
|
||||
target_gnu_MODULES := $(filter-out %/libopenjdkjvmti.so,$(target_gnu_MODULES))
|
||||
target_gnu_MODULES := $(filter-out %/libopenjdkjvmtid.so,$(target_gnu_MODULES))
|
||||
$(info Removing from sdk:)$(foreach d,$(target_gnu_MODULES),$(info : $(d)))
|
||||
modules_to_install := \
|
||||
$(filter-out $(target_gnu_MODULES),$(modules_to_install))
|
||||
|
||||
# Ensure every module listed in PRODUCT_PACKAGES* gets something installed
|
||||
# TODO: Should we do this for all builds and not just the sdk?
|
||||
dangling_modules :=
|
||||
|
|
@ -2008,13 +1987,6 @@ $(LSDUMP_PATHS_FILE):
|
|||
.PHONY: check-elf-files
|
||||
check-elf-files:
|
||||
|
||||
#xxx scrape this from ALL_MODULE_NAME_TAGS
|
||||
.PHONY: modules
|
||||
modules:
|
||||
@echo "Available sub-modules:"
|
||||
@echo "$(call module-names-for-tag-list,$(ALL_MODULE_TAGS))" | \
|
||||
tr -s ' ' '\n' | sort -u
|
||||
|
||||
.PHONY: dump-files
|
||||
dump-files:
|
||||
@echo "Target files for $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) ($(INTERNAL_PRODUCT)):"
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@ include $(BUILD_SYSTEM)/base_rules.mk
|
|||
|
||||
ifneq ($(filter init%rc,$(notdir $(LOCAL_INSTALLED_MODULE)))$(filter %/etc/init,$(dir $(LOCAL_INSTALLED_MODULE))),)
|
||||
$(eval $(call copy-init-script-file-checked,$(my_prebuilt_src_file),$(LOCAL_BUILT_MODULE)))
|
||||
else ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
|
||||
$(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)
|
||||
$(transform-prebuilt-to-target-strip-comments)
|
||||
else
|
||||
$(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)
|
||||
$(transform-prebuilt-to-target)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ PARSE_TIME_MAKE_GOALS := \
|
|||
$(PARSE_TIME_MAKE_GOALS) \
|
||||
$(dont_bother_goals) \
|
||||
all \
|
||||
ECLIPSE-% \
|
||||
brillo_tests \
|
||||
btnod \
|
||||
build-art% \
|
||||
|
|
|
|||
|
|
@ -251,30 +251,6 @@ endif
|
|||
|
||||
$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
|
||||
|
||||
# We don't care about installed rlib/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 rlib/static libraries that we use.
|
||||
# (see notice_files.mk)
|
||||
#
|
||||
# Filter out some NDK libraries that are not being exported.
|
||||
my_static_libraries := \
|
||||
$(filter-out ndk_libc++_static ndk_libc++abi ndk_libandroid_support ndk_libunwind \
|
||||
ndk_libc++_static.native_bridge ndk_libc++abi.native_bridge \
|
||||
ndk_libandroid_support.native_bridge ndk_libunwind.native_bridge, \
|
||||
$(LOCAL_STATIC_LIBRARIES))
|
||||
installed_static_library_notice_file_targets := \
|
||||
$(foreach lib,$(my_static_libraries) $(LOCAL_WHOLE_STATIC_LIBRARIES), \
|
||||
NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-STATIC_LIBRARIES-$(lib))
|
||||
installed_static_library_notice_file_targets += \
|
||||
$(foreach lib,$(LOCAL_RLIB_LIBRARIES), \
|
||||
NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-RLIB_LIBRARIES-$(lib))
|
||||
installed_static_library_notice_file_targets += \
|
||||
$(foreach lib,$(LOCAL_PROC_MACRO_LIBRARIES), \
|
||||
NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST$(if $(my_host_cross),_CROSS,),TARGET)-PROC_MACRO_LIBRARIES-$(lib))
|
||||
|
||||
$(notice_target): | $(installed_static_library_notice_file_targets)
|
||||
$(LOCAL_INSTALLED_MODULE): | $(notice_target)
|
||||
|
||||
# Reinstall shared library dependencies of fuzz targets to /data/fuzz/ (for
|
||||
# target) or /data/ (for host).
|
||||
ifdef LOCAL_IS_FUZZ_TARGET
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2010 The Android Open Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
define filter-ide-goals
|
||||
$(strip $(filter $(1)-%,$(MAKECMDGOALS)))
|
||||
endef
|
||||
|
||||
define filter-ide-modules
|
||||
$(strip $(subst -,$(space),$(patsubst $(1)-%,%,$(2))))
|
||||
endef
|
||||
|
||||
# eclipse
|
||||
eclipse_project_goals := $(call filter-ide-goals,ECLIPSE)
|
||||
ifdef eclipse_project_goals
|
||||
ifneq ($(words $(eclipse_project_goals)),1)
|
||||
$(error Only one ECLIPSE- goal may be specified: $(eclipse_project_goals))
|
||||
endif
|
||||
eclipse_project_modules := $(call filter-ide-modules,ECLIPSE,$(eclipse_project_goals))
|
||||
|
||||
ifneq ($(filter lunch,$(eclipse_project_modules)),)
|
||||
eclipse_project_modules := $(filter-out lunch,$(eclipse_project_modules))
|
||||
installed_modules := $(foreach m,$(ALL_DEFAULT_INSTALLED_MODULES),\
|
||||
$(INSTALLABLE_FILES.$(m).MODULE))
|
||||
java_modules := $(foreach m,$(installed_modules),\
|
||||
$(if $(filter JAVA_LIBRARIES APPS,$(ALL_MODULES.$(m).CLASS)),$(m),))
|
||||
eclipse_project_modules := $(sort $(eclipse_project_modules) $(java_modules))
|
||||
endif
|
||||
|
||||
source_paths := $(foreach m,$(eclipse_project_modules),$(ALL_MODULES.$(m).PATH)) \
|
||||
$(foreach m,$(eclipse_project_modules),$(ALL_MODULES.$(m).INTERMEDIATE_SOURCE_DIR))
|
||||
source_paths := $(sort $(source_paths))
|
||||
|
||||
.classpath: PRIVATE_MODULES := $(eclipse_project_modules)
|
||||
.classpath: PRIVATE_DIRS := $(source_paths)
|
||||
|
||||
# the mess below with ./src tries to guess whether the src
|
||||
$(eclipse_project_goals): .classpath
|
||||
.classpath: FORCE
|
||||
$(hide) echo Generating .classpath for eclipse
|
||||
$(hide) echo '<classpath>' > $@
|
||||
$(hide) for p in $(PRIVATE_DIRS) ; do \
|
||||
echo -n ' <classpathentry kind="src" path="' >> $@ ; \
|
||||
( if [ -d $$p/src ] ; then echo -n $$p/src ; else echo -n $$p ; fi ) >> $@ ; \
|
||||
echo '"/>' >> $@ ; \
|
||||
done
|
||||
$(hide) echo '</classpath>' >> $@
|
||||
endif
|
||||
|
||||
Loading…
Reference in a new issue