diff options
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 420 |
1 files changed, 96 insertions, 324 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 0efda57457..e50594542f 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -6,14 +6,16 @@ ## ########################################################### +include $(BUILD_SYSTEM)/use_lld_setup.mk + ifneq ($(LOCAL_PREBUILT_LIBS),) -$(error dont use LOCAL_PREBUILT_LIBS anymore LOCAL_PATH=$(LOCAL_PATH)) +$(call pretty-error,dont use LOCAL_PREBUILT_LIBS anymore) endif ifneq ($(LOCAL_PREBUILT_EXECUTABLES),) -$(error dont use LOCAL_PREBUILT_EXECUTABLES anymore LOCAL_PATH=$(LOCAL_PATH)) +$(call pretty-error,dont use LOCAL_PREBUILT_EXECUTABLES anymore) endif ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),) -$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH)) +$(call pretty-error,dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore) endif my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32) @@ -37,39 +39,22 @@ endif LOCAL_CHECKED_MODULE := $(my_prebuilt_src_file) +ifeq (APPS,$(LOCAL_MODULE_CLASS)) +include $(BUILD_SYSTEM)/app_prebuilt_internal.mk +else +# +# Non-APPS prebuilt modules handling almost to the end of the file +# + my_strip_module := $(firstword \ $(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \ $(LOCAL_STRIP_MODULE)) -my_pack_module_relocations := $(firstword \ - $(LOCAL_PACK_MODULE_RELOCATIONS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \ - $(LOCAL_PACK_MODULE_RELOCATIONS)) ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)) - # LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES indicates that this prebuilt should be - # installed to the common directory of libraries. This is needed for the NDK - # shared libraries built by soong, as we build many different versions of each - # library (one for each API level). Since they all have the same basename, - # they'd clobber each other (as well as any platform libraries by the same - # name). - ifneq ($(LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES),false) - # Put the built targets of all shared libraries in a common directory - # to simplify the link line. - OVERRIDE_BUILT_MODULE_PATH := \ - $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES) - endif ifeq ($(LOCAL_IS_HOST_MODULE)$(my_strip_module),) # Strip but not try to add debuglink my_strip_module := no_debuglink endif - - ifeq ($(LOCAL_IS_HOST_MODULE)$(my_pack_module_relocations),) - # Do not pack relocations by default - my_pack_module_relocations := false - endif - - ifeq ($(DISABLE_RELOCATION_PACKER),true) - my_pack_module_relocations := false - endif endif ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),) @@ -78,20 +63,6 @@ else prebuilt_module_is_a_library := endif -ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) - ifeq ($(prebuilt_module_is_a_library),true) - SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE) - endif - - ifdef LOCAL_USE_VNDK - name_without_suffix := $(patsubst %.vendor,%,$(LOCAL_MODULE)) - ifneq ($(name_without_suffix),$(LOCAL_MODULE) - SPLIT_VENDOR.$(LOCAL_MODULE_CLASS).$(name_without_suffix) := 1 - endif - name_without_suffix := - endif -endif - # Don't install static libraries by default. ifndef LOCAL_UNINSTALLABLE_MODULE ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)) @@ -106,62 +77,39 @@ else endif ifdef LOCAL_COMPRESSED_MODULE -ifneq (true,$(LOCAL_COMPRESSED_MODULE)) -$(call pretty-error, Unknown value for LOCAL_COMPRESSED_MODULE $(LOCAL_COMPRESSED_MODULE)) -endif -endif - -ifeq ($(LOCAL_MODULE_CLASS),APPS) -ifdef LOCAL_COMPRESSED_MODULE -LOCAL_BUILT_MODULE_STEM := package.apk.gz -else -LOCAL_BUILT_MODULE_STEM := package.apk -endif # LOCAL_COMPRESSED_MODULE - -ifndef LOCAL_INSTALLED_MODULE_STEM -ifdef LOCAL_COMPRESSED_MODULE -PACKAGES.$(LOCAL_MODULE).COMPRESSED := gz -LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk.gz -else -LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk -endif # LOCAL_COMPRESSED_MODULE -endif # LOCAL_INSTALLED_MODULE_STEM - -else # $(LOCAL_MODULE_CLASS) != APPS) -ifdef LOCAL_COMPRESSED_MODULE $(error $(LOCAL_MODULE) : LOCAL_COMPRESSED_MODULE can only be defined for module class APPS) endif # LOCAL_COMPRESSED_MODULE -endif -ifneq ($(filter true keep_symbols no_debuglink mini-debug-info,$(my_strip_module) $(my_pack_module_relocations)),) +my_check_elf_file_shared_lib_files := + +ifneq ($(filter true keep_symbols no_debuglink mini-debug-info,$(my_strip_module)),) ifdef LOCAL_IS_HOST_MODULE - $(error Cannot strip/pack host module LOCAL_PATH=$(LOCAL_PATH)) + $(call pretty-error,Cannot strip/pack host module) endif ifeq ($(filter SHARED_LIBRARIES EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),) - $(error Can strip/pack only shared libraries or executables LOCAL_PATH=$(LOCAL_PATH)) + $(call pretty-error,Can strip/pack only shared libraries or executables) endif ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) - $(error Cannot strip/pack scripts LOCAL_PATH=$(LOCAL_PATH)) + $(call pretty-error,Cannot strip/pack scripts) endif - # Set the arch-specific variables to set up the strip/pack rules. + # 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) - LOCAL_PACK_MODULE_RELOCATIONS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) := $(my_pack_module_relocations) include $(BUILD_SYSTEM)/dynamic_binary.mk built_module := $(linked_module) -else # my_strip_module and my_pack_module_relocations not true + ifneq ($(LOCAL_SDK_VERSION),) + # binary.mk filters out NDK_MIGRATED_LIBS from my_shared_libs, thus those NDK libs are not added + # to DEPENDENCIES_ON_SHARED_LIBRARIES. Assign $(my_ndk_shared_libraries_fullpath) to + # my_check_elf_file_shared_lib_files so that check_elf_file.py can see those NDK stub libs. + my_check_elf_file_shared_lib_files := $(my_ndk_shared_libraries_fullpath) + endif +else # my_strip_module not true include $(BUILD_SYSTEM)/base_rules.mk built_module := $(LOCAL_BUILT_MODULE) ifdef prebuilt_module_is_a_library export_includes := $(intermediates)/export_includes export_cflags := $(foreach d,$(LOCAL_EXPORT_C_INCLUDE_DIRS),-I $(d)) -# Soong exports cflags instead of include dirs, so that -isystem can be included. -ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) -export_cflags += $(LOCAL_EXPORT_CFLAGS) -else ifdef LOCAL_EXPORT_CFLAGS -$(call pretty-error,LOCAL_EXPORT_CFLAGS can only be used by Soong, use LOCAL_EXPORT_C_INCLUDE_DIRS instead) -endif $(export_includes): PRIVATE_EXPORT_CFLAGS := $(export_cflags) $(export_includes): $(LOCAL_EXPORT_C_INCLUDE_DEPS) @echo Export includes file: $< -- $@ @@ -188,6 +136,8 @@ else ifdef LOCAL_USE_VNDK else my_link_type := native:vendor endif +else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(LOCAL_MODULE_PATH)),) +my_link_type := native:recovery else my_link_type := native:platform endif @@ -203,33 +153,44 @@ endif # prebuilt_module_is_a_library # The real dependency will be added after all Android.mks are loaded and the install paths # of the shared libraries are determined. ifdef LOCAL_INSTALLED_MODULE -ifdef LOCAL_SHARED_LIBRARIES -my_shared_libraries := $(LOCAL_SHARED_LIBRARIES) +ifdef LOCAL_IS_HOST_MODULE + ifeq ($(LOCAL_SYSTEM_SHARED_LIBRARIES),none) + my_system_shared_libraries := + else + my_system_shared_libraries := $(LOCAL_SYSTEM_SHARED_LIBRARIES) + endif +else + ifeq ($(LOCAL_SYSTEM_SHARED_LIBRARIES),none) + my_system_shared_libraries := libc libm libdl + else + my_system_shared_libraries := $(LOCAL_SYSTEM_SHARED_LIBRARIES) + my_system_shared_libraries := $(patsubst libc,libc libdl,$(my_system_shared_libraries)) + endif +endif + +my_shared_libraries := \ + $(filter-out $(my_system_shared_libraries),$(LOCAL_SHARED_LIBRARIES)) \ + $(my_system_shared_libraries) + +ifdef my_shared_libraries # Extra shared libraries introduced by LOCAL_CXX_STL. include $(BUILD_SYSTEM)/cxx_stl_setup.mk ifdef LOCAL_USE_VNDK - ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) - my_shared_libraries := $(foreach l,$(my_shared_libraries),\ - $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l))) - endif + my_shared_libraries := $(foreach l,$(my_shared_libraries),\ + $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l))) endif $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries)) - -# We also need the LOCAL_BUILT_MODULE dependency, -# since we use -rpath-link which points to the built module's path. -my_built_shared_libraries := \ - $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \ - $(addsuffix $($(my_prefix)SHLIB_SUFFIX), \ - $(my_shared_libraries))) -$(LOCAL_BUILT_MODULE) : $(my_built_shared_libraries) -endif endif +endif # my_shared_libraries # We need to enclose the above export_includes and my_built_shared_libraries in # "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk. endif # my_strip_module not true +# Check prebuilt ELF binaries. +include $(BUILD_SYSTEM)/check_elf_file.mk + ifeq ($(NATIVE_COVERAGE),true) ifneq (,$(strip $(LOCAL_PREBUILT_COVERAGE_ARCHIVE))) $(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(intermediates)/$(LOCAL_MODULE).gcnodir)) @@ -258,252 +219,40 @@ endif endif endif -ifeq ($(LOCAL_MODULE_CLASS),APPS) -PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) - -my_extract_apk := $(strip $(LOCAL_EXTRACT_APK)) - -# Select dpi-specific source -ifdef LOCAL_DPI_VARIANTS -my_dpi := $(firstword $(filter $(LOCAL_DPI_VARIANTS),$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI))) -ifdef my_dpi -ifdef LOCAL_DPI_FILE_STEM -my_prebuilt_dpi_file_stem := $(LOCAL_DPI_FILE_STEM) -else -my_prebuilt_dpi_file_stem := $(LOCAL_MODULE)_%.apk -endif -my_prebuilt_src_file := $(dir $(my_prebuilt_src_file))$(subst %,$(my_dpi),$(my_prebuilt_dpi_file_stem)) - -ifneq ($(strip $(LOCAL_EXTRACT_DPI_APK)),) -my_extract_apk := $(subst %,$(my_dpi),$(LOCAL_EXTRACT_DPI_APK)) -endif # LOCAL_EXTRACT_DPI_APK -endif # my_dpi -endif # LOCAL_DPI_VARIANTS - -ifdef my_extract_apk -my_extracted_apk := $(intermediates)/extracted.apk - -$(my_extracted_apk): PRIVATE_EXTRACT := $(my_extract_apk) -$(my_extracted_apk): $(my_prebuilt_src_file) - @echo Extract APK: $@ - $(hide) mkdir -p $(dir $@) && rm -f $@ - $(hide) unzip -p $< $(PRIVATE_EXTRACT) >$@ - -my_prebuilt_src_file := $(my_extracted_apk) -my_extracted_apk := -my_extract_apk := -ifeq ($(PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK),true) -# If the product property is set, always preopt for extracted modules to prevent executing out of -# the APK. -my_preopt_for_extracted_apk := true -endif -endif - -dex_preopt_profile_src_file := $(my_prebuilt_src_file) - -rs_compatibility_jni_libs := -include $(BUILD_SYSTEM)/install_jni_libs.mk - -ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) - # The magic string "EXTERNAL" means this package will be signed with - # the default dev key throughout the build process, but we expect - # the final package to be signed with a different key. - # - # This can be used for packages where we don't have access to the - # keys, but want the package to be predexopt'ed. - LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) - PACKAGES.$(LOCAL_MODULE).EXTERNAL_KEY := 1 - - $(built_module) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem - $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 - $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem -endif -ifeq ($(LOCAL_CERTIFICATE),) - # It is now a build error to add a prebuilt .apk without - # specifying a key for it. - $(error No LOCAL_CERTIFICATE specified for prebuilt "$(my_prebuilt_src_file)") -else ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) - # The magic string "PRESIGNED" means this package is already checked - # signed with its release key. - # - # By setting .CERTIFICATE but not .PRIVATE_KEY, this package will be - # mentioned in apkcerts.txt (with certificate set to "PRESIGNED") - # but the dexpreopt process will not try to re-sign the app. - PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED - PACKAGES := $(PACKAGES) $(LOCAL_MODULE) -else - # If this is not an absolute certificate, assign it to a generic one. - ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) - LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE) - endif - - PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 - PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem - PACKAGES := $(PACKAGES) $(LOCAL_MODULE) - - $(built_module) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem - $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 - $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem -endif - -# Disable dex-preopt of prebuilts to save space, if requested. -ifndef LOCAL_DEX_PREOPT -ifeq ($(DONT_DEXPREOPT_PREBUILTS),true) -LOCAL_DEX_PREOPT := false -endif -endif - -# If the module is a compressed module, we don't pre-opt it because its final -# installation location will be the data partition. -ifdef LOCAL_COMPRESSED_MODULE -LOCAL_DEX_PREOPT := false -endif - -####################################### -# defines built_odex along with rule to install odex -include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk -####################################### -ifneq ($(LOCAL_REPLACE_PREBUILT_APK_INSTALLED),) -# There is a replacement for the prebuilt .apk we can install without any processing. -$(built_module) : $(LOCAL_REPLACE_PREBUILT_APK_INSTALLED) - $(transform-prebuilt-to-target) - -else # ! LOCAL_REPLACE_PREBUILT_APK_INSTALLED -# Sign and align non-presigned .apks. -# The embedded prebuilt jni to uncompress. -ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) -# For PRESIGNED apks we must uncompress every .so file: -# even if the .so file isn't for the current TARGET_ARCH, -# we can't strip the file. -embedded_prebuilt_jni_libs := 'lib/*.so' -endif -ifndef embedded_prebuilt_jni_libs -# No LOCAL_PREBUILT_JNI_LIBS, uncompress all. -embedded_prebuilt_jni_libs := 'lib/*.so' -endif -$(built_module): PRIVATE_EMBEDDED_JNI_LIBS := $(embedded_prebuilt_jni_libs) - -ifdef LOCAL_COMPRESSED_MODULE -$(built_module) : $(MINIGZIP) -endif - -$(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(SIGNAPK_JAR) - $(transform-prebuilt-to-target) - $(uncompress-shared-libs) -ifeq (true, $(LOCAL_UNCOMPRESS_DEX)) - $(uncompress-dexs) -endif # LOCAL_UNCOMPRESS_DEX -ifdef LOCAL_DEX_PREOPT -ifneq ($(BUILD_PLATFORM_ZIP),) - @# Keep a copy of apk with classes.dex unstripped - $(hide) cp -f $@ $(dir $@)package.dex.apk -endif # BUILD_PLATFORM_ZIP -endif # LOCAL_DEX_PREOPT -ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) - @# Only strip out files if we can re-sign the package. -ifdef LOCAL_DEX_PREOPT -ifneq (nostripping,$(LOCAL_DEX_PREOPT)) - $(call dexpreopt-remove-classes.dex,$@) -endif # LOCAL_DEX_PREOPT != nostripping -endif # LOCAL_DEX_PREOPT - $(sign-package) - # No need for align-package because sign-package takes care of alignment -else # LOCAL_CERTIFICATE == PRESIGNED - $(align-package) -endif # LOCAL_CERTIFICATE -ifdef LOCAL_COMPRESSED_MODULE - $(compress-package) -endif # LOCAL_COMPRESSED_MODULE -endif # ! LOCAL_REPLACE_PREBUILT_APK_INSTALLED - -############################### -## Rule to build the odex file. -# In case we don't strip the built module, use it, as dexpreopt -# can do optimizations based on whether the built module only -# contains uncompressed dex code. -ifdef LOCAL_DEX_PREOPT -ifeq (nostripping,$(LOCAL_DEX_PREOPT)) -$(built_odex) : $(built_module) - $(call dexpreopt-one-file,$<,$@) -else -$(built_odex) : $(my_prebuilt_src_file) - $(call dexpreopt-one-file,$<,$@) -endif -endif - -############################### -## Install split apks. -ifdef LOCAL_PACKAGE_SPLITS -ifdef LOCAL_COMPRESSED_MODULE -$(error $(LOCAL_MODULE): LOCAL_COMPRESSED_MODULE is not currently supported for split installs) -endif # LOCAL_COMPRESSED_MODULE - -# LOCAL_PACKAGE_SPLITS is a list of apks to be installed. -built_apk_splits := $(addprefix $(intermediates)/,$(notdir $(LOCAL_PACKAGE_SPLITS))) -installed_apk_splits := $(addprefix $(my_module_path)/,$(notdir $(LOCAL_PACKAGE_SPLITS))) +ifeq ($(prebuilt_module_is_dex_javalib),true) +my_dex_jar := $(my_prebuilt_src_file) +# This is a target shared library, i.e. a jar with classes.dex. -# Rules to sign the split apks. -my_src_dir := $(sort $(dir $(LOCAL_PACKAGE_SPLITS))) -ifneq (1,$(words $(my_src_dir))) -$(error You must put all the split source apks in the same folder: $(LOCAL_PACKAGE_SPLITS)) +ifneq ($(filter $(LOCAL_MODULE),$(PRODUCT_BOOT_JARS)),) + $(call pretty-error,Modules in PRODUCT_BOOT_JARS must be defined in Android.bp files) endif -my_src_dir := $(LOCAL_PATH)/$(my_src_dir) -$(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem -$(built_apk_splits) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 -$(built_apk_splits) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem -$(built_apk_splits) : $(intermediates)/%.apk : $(my_src_dir)/%.apk - $(copy-file-to-new-target) - $(sign-package) - -# Rules to install the split apks. -$(installed_apk_splits) : $(my_module_path)/%.apk : $(intermediates)/%.apk - @echo "Install: $@" - $(copy-file-to-new-target) - -# Register the additional built and installed files. -ALL_MODULES.$(my_register_name).INSTALLED += $(installed_apk_splits) -ALL_MODULES.$(my_register_name).BUILT_INSTALLED += \ - $(foreach s,$(LOCAL_PACKAGE_SPLITS),$(intermediates)/$(notdir $(s)):$(my_module_path)/$(notdir $(s))) - -# Make sure to install the splits when you run "make <module_name>". -$(my_all_targets): $(installed_apk_splits) - -endif # LOCAL_PACKAGE_SPLITS - -else ifeq ($(prebuilt_module_is_dex_javalib),true) # ! LOCAL_MODULE_CLASS != APPS -# This is a target shared library, i.e. a jar with classes.dex. ####################################### # defines built_odex along with rule to install odex include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk ####################################### ifdef LOCAL_DEX_PREOPT -ifneq ($(dexpreopt_boot_jar_module),) # boot jar -# boot jar's rules are defined in dex_preopt.mk -dexpreopted_boot_jar := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(dexpreopt_boot_jar_module)_nodex.jar -$(built_module) : $(dexpreopted_boot_jar) - $(call copy-file-to-target) -# For libart boot jars, we don't have .odex files. -else # ! boot jar -$(built_odex): PRIVATE_MODULE := $(LOCAL_MODULE) -# Use pattern rule - we may have multiple built odex files. -$(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(my_prebuilt_src_file) - @echo "Dexpreopt Jar: $(PRIVATE_MODULE) ($@)" - $(call dexpreopt-one-file,$<,$@) +$(built_module): PRIVATE_STRIP_SCRIPT := $(intermediates)/strip.sh +$(built_module): $(intermediates)/strip.sh +$(built_module): | $(DEXPREOPT_STRIP_DEPS) +$(built_module): .KATI_DEPFILE := $(built_module).d +$(built_module): $(my_prebuilt_src_file) + $(PRIVATE_STRIP_SCRIPT) $< $@ -$(eval $(call dexpreopt-copy-jar,$(my_prebuilt_src_file),$(built_module),$(LOCAL_DEX_PREOPT))) -endif # boot jar else # ! LOCAL_DEX_PREOPT $(built_module) : $(my_prebuilt_src_file) $(call copy-file-to-target) endif # LOCAL_DEX_PREOPT else # ! prebuilt_module_is_dex_javalib +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),$(built_module))) +else ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) $(built_module) : $(my_prebuilt_src_file) -ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) $(transform-prebuilt-to-target-strip-comments) else +$(built_module) : $(my_prebuilt_src_file) $(transform-prebuilt-to-target) endif ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),) @@ -579,15 +328,24 @@ 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 $(my_src_jar) : .KATI_IMPLICIT_OUTPUTS := $(my_src_proguard_options) +$(my_src_jar) : .KATI_IMPLICIT_OUTPUTS += $(my_src_android_manifest) $(my_src_jar) : $(my_src_aar) $(hide) rm -rf $(dir $@) && mkdir -p $(dir $@) $(dir $@)/res $(hide) unzip -qo -d $(dir $@) $< # Make sure the extracted classes.jar has a new timestamp. $(hide) touch $@ - # Make sure the proguard file exists and has a new timestamp. + # Make sure the proguard and AndroidManifest.xml files exist + # and have a new timestamp. $(hide) touch $(dir $@)/proguard.txt + $(hide) touch $(dir $@)/AndroidManifest.xml + +my_prebuilt_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml +$(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 @@ -611,11 +369,13 @@ $(common_classes_pre_proguard_jar) : $(my_src_jar) $(common_javalib_jar) : $(common_classes_jar) $(transform-prebuilt-to-target) +include $(BUILD_SYSTEM)/force_aapt2.mk + ifdef LOCAL_AAPT2_ONLY LOCAL_USE_AAPT2 := true endif -ifdef LOCAL_USE_AAPT2 +ifeq ($(LOCAL_USE_AAPT2),true) ifneq ($(my_src_aar),) $(intermediates.COMMON)/export_proguard_flags : $(my_src_proguard_options) @@ -631,7 +391,7 @@ framework_res_package_export := ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) ifneq ($(filter-out current system_current test_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current system_current test_current,$(LOCAL_SDK_RES_VERSION))),) framework_res_package_export := \ - $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_RES_VERSION)/android.jar + $(call resolve-prebuilt-sdk-jar-path,$(LOCAL_SDK_RES_VERSION)) else framework_res_package_export := \ $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk @@ -643,7 +403,7 @@ my_res_package := $(intermediates.COMMON)/package-res.apk # We needed only very few PRIVATE variables and aapt2.mk input variables. Reset the unnecessary ones. $(my_res_package): PRIVATE_AAPT2_CFLAGS := $(my_res_package): PRIVATE_AAPT_FLAGS := --static-lib --no-static-lib-packages --auto-add-overlay -$(my_res_package): PRIVATE_ANDROID_MANIFEST := $(intermediates.COMMON)/aar/AndroidManifest.xml +$(my_res_package): PRIVATE_ANDROID_MANIFEST := $(my_src_android_manifest) $(my_res_package): PRIVATE_AAPT_INCLUDES := $(framework_res_package_export) $(my_res_package): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(my_res_package): PRIVATE_PROGUARD_OPTIONS_FILE := @@ -653,6 +413,7 @@ $(my_res_package): PRIVATE_PRODUCT_AAPT_CONFIG := $(my_res_package): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(my_res_package): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(my_res_package) : $(framework_res_package_export) +$(my_res_package) : $(my_src_android_manifest) full_android_manifest := my_res_resources := @@ -671,11 +432,22 @@ endif # LOCAL_USE_AAPT2 # make sure the classes.jar and javalib.jar are built before $(LOCAL_BUILT_MODULE) $(built_module) : $(common_javalib_jar) +my_exported_sdk_libs_file := $(intermediates.COMMON)/exported-sdk-libs +$(my_exported_sdk_libs_file): PRIVATE_EXPORTED_SDK_LIBS := $(LOCAL_EXPORT_SDK_LIBRARIES) +$(my_exported_sdk_libs_file): + @echo "Export SDK libs $@" + $(hide) mkdir -p $(dir $@) && rm -f $@ + $(if $(PRIVATE_EXPORTED_SDK_LIBS),\ + $(hide) echo $(PRIVATE_EXPORTED_SDK_LIBS) | tr ' ' '\n' > $@,\ + $(hide) touch $@) + endif # ! prebuilt_module_is_dex_javalib endif # LOCAL_IS_HOST_MODULE is not set endif # JAVA_LIBRARIES +endif # APPS + $(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES) my_prebuilt_src_file := |