Merge "Remove support for stripping dex." (8567331a) · Commits · e / os / android_build

core/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -2557,7 +2557,7 @@ pdk_odex_apps := $(strip $(foreach m,$(DEXPREOPT.MODULES.APPS),\
		$(if $(filter $(DEXPREOPT.$(m).INSTALLED_STRIPPED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))
		pdk_classes_dex := $(strip \
		$(foreach m,$(pdk_odex_javalibs),$(call intermediates-dir-for,JAVA_LIBRARIES,$(m),,COMMON)/javalib.jar) \
		$(foreach m,$(pdk_odex_apps),$(call intermediates-dir-for,APPS,$(m))/package.dex.apk))
		$(foreach m,$(pdk_odex_apps),$(call intermediates-dir-for,APPS,$(m))/package.apk))

		pdk_odex_config_mk := $(PRODUCT_OUT)/pdk_dexpreopt_config.mk
		$(pdk_odex_config_mk): PRIVATE_JAVA_LIBRARIES := $(pdk_odex_javalibs)
		@@ -2575,7 +2575,7 @@ $(pdk_odex_config_mk) :
		$(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT_FLAGS:=$(DEXPREOPT.$(m).DEX_PREOPT_FLAGS)" >> $@$(newline)\
		)
		$(foreach m,$(PRIVATE_APPS),\
		$(hide) echo "PDK.DEXPREOPT.$(m).SRC:=$(patsubst $(OUT_DIR)/%,%,$(call intermediates-dir-for,APPS,$(m))/package.dex.apk)" >> $@$(newline)\
		$(hide) echo "PDK.DEXPREOPT.$(m).SRC:=$(patsubst $(OUT_DIR)/%,%,$(call intermediates-dir-for,APPS,$(m))/package.apk)" >> $@$(newline)\
		$(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT:=$(DEXPREOPT.$(m).DEX_PREOPT)" >> $@$(newline)\
		$(hide) echo "PDK.DEXPREOPT.$(m).MULTILIB:=$(DEXPREOPT.$(m).MULTILIB)" >> $@$(newline)\
		$(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT_FLAGS:=$(DEXPREOPT.$(m).DEX_PREOPT_FLAGS)" >> $@$(newline)\

core/app_prebuilt_internal.mk

+0 −23

Original line number	Diff line number	Diff line
		@@ -215,17 +215,6 @@ $(built_module) : $(appcompat-files)
		$(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)
		endif

		ifneq ($(BUILD_PLATFORM_ZIP),)
		$(built_module) : .KATI_IMPLICIT_OUTPUTS := $(dir $(LOCAL_BUILT_MODULE))package.dex.apk
		endif
		ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)
		ifdef LOCAL_DEX_PREOPT
		$(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
		endif
		endif
		ifeq ($(module_run_appcompat),true)
		$(built_module) : $(AAPT2)
		endif
		@@ -235,23 +224,11 @@ $(built_module) : $(my_prebuilt_src_file) \| $(ZIPALIGN) $(ZIP2ZIP) $(SIGNAPK_JAR
		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.
		# Run appcompat before stripping the classes.dex file.
		ifeq ($(module_run_appcompat),true)
		$(call appcompat-header, aapt2)
		$(run-appcompat)
		endif # module_run_appcompat
		ifdef LOCAL_DEX_PREOPT
		mv -f $@ $@.tmp
		$(PRIVATE_STRIP_SCRIPT) $@.tmp $@
		endif # LOCAL_DEX_PREOPT
		$(sign-package)
		# No need for align-package because sign-package takes care of alignment
		else # LOCAL_CERTIFICATE == PRESIGNED

core/clear_vars.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ LOCAL_DEX_PREOPT_APP_IMAGE:=
		LOCAL_DEX_PREOPT_FLAGS:=
		LOCAL_DEX_PREOPT_GENERATE_PROFILE:=
		LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING:=
		LOCAL_DEX_PREOPT:= # '',true,false,nostripping
		LOCAL_DEX_PREOPT:= # '',true,false
		LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG:=
		LOCAL_DISABLE_RESOLVE_SUPPORT_LIBRARIES:=
		LOCAL_DONT_CHECK_MODULE:=

core/dex_preopt_config.mk

+0 −11

Original line number	Diff line number	Diff line
		@@ -14,16 +14,9 @@ SYSTEM_OTHER_ODEX_FILTER ?= \
		product/app/% \
		product/priv-app/% \

		# The default values for pre-opting. To support the runtime module we ensure no dex files
		# get stripped.
		ifeq ($(PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING),)
		PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING := true
		endif
		# Conditional to building on linux, as dex2oat currently does not work on darwin.
		ifeq ($(HOST_OS),linux)
		ifeq (eng,$(TARGET_BUILD_VARIANT))
		# Don't strip for quick development turnarounds.
		DEX_PREOPT_DEFAULT := nostripping
		# For an eng build only pre-opt the boot image and system server. This gives reasonable performance
		# and still allows a simple workflow: building in frameworks/base and syncing.
		WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true
		@@ -87,7 +80,6 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)

		$(call json_start)

		$(call add_json_bool, DefaultNoStripping, $(filter nostripping,$(DEX_PREOPT_DEFAULT)))
		$(call add_json_bool, DisablePreopt, $(call invert_bool,$(filter true,$(WITH_DEXPREOPT))))
		$(call add_json_list, DisablePreoptModules, $(DEXPREOPT_DISABLED_MODULES))
		$(call add_json_bool, OnlyPreoptBootImageAndSystemServer, $(filter true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)))
		@@ -174,6 +166,3 @@ DEXPREOPT_GEN_DEPS := \
		$(SOONG_ZIP) \
		$(ZIP2ZIP) \
		$(BUILD_SYSTEM)/construct_context.sh \

		DEXPREOPT_STRIP_DEPS := \
		$(ZIP2ZIP) \

core/dex_preopt_odex_install.mk

+3 −10

Original line number	Diff line number	Diff line
		@@ -207,8 +207,7 @@ ifdef LOCAL_DEX_PREOPT

		$(call json_start)

		# DexPath, StripInputPath, and StripOutputPath are not set, they will
		# be filled in by dexpreopt_gen.
		# DexPath is not set: it will be filled in by dexpreopt_gen.

		$(call add_json_str, Name, $(LOCAL_MODULE))
		$(call add_json_str, DexLocation, $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE)))
		@@ -237,13 +236,10 @@ ifdef LOCAL_DEX_PREOPT
		$(call add_json_bool, ForceCreateAppImage, $(filter true,$(LOCAL_DEX_PREOPT_APP_IMAGE)))
		$(call add_json_bool, PresignedPrebuilt, $(filter PRESIGNED,$(LOCAL_CERTIFICATE)))

		$(call add_json_bool, NoStripping, $(filter nostripping,$(LOCAL_DEX_PREOPT)))

		$(call json_end)

		my_dexpreopt_config := $(intermediates)/dexpreopt.config
		my_dexpreopt_script := $(intermediates)/dexpreopt.sh
		my_strip_script := $(intermediates)/strip.sh
		my_dexpreopt_zip := $(intermediates)/dexpreopt.zip

		$(my_dexpreopt_config): PRIVATE_MODULE := $(LOCAL_MODULE)
		@@ -252,17 +248,15 @@ ifdef LOCAL_DEX_PREOPT
		@echo "$(PRIVATE_MODULE) dexpreopt.config"
		echo -e -n '$(subst $(newline),\n,$(subst ','\'',$(subst \,\\,$(PRIVATE_CONTENTS))))' > $@

		.KATI_RESTAT: $(my_dexpreopt_script) $(my_strip_script)
		.KATI_RESTAT: $(my_dexpreopt_script)
		$(my_dexpreopt_script): PRIVATE_MODULE := $(LOCAL_MODULE)
		$(my_dexpreopt_script): PRIVATE_GLOBAL_CONFIG := $(DEX_PREOPT_CONFIG_FOR_MAKE)
		$(my_dexpreopt_script): PRIVATE_MODULE_CONFIG := $(my_dexpreopt_config)
		$(my_dexpreopt_script): PRIVATE_STRIP_SCRIPT := $(my_strip_script)
		$(my_dexpreopt_script): .KATI_IMPLICIT_OUTPUTS := $(my_strip_script)
		$(my_dexpreopt_script): $(DEXPREOPT_GEN)
		$(my_dexpreopt_script): $(my_dexpreopt_config) $(DEX_PREOPT_CONFIG_FOR_MAKE)
		@echo "$(PRIVATE_MODULE) dexpreopt gen"
		$(DEXPREOPT_GEN) -global $(PRIVATE_GLOBAL_CONFIG) -module $(PRIVATE_MODULE_CONFIG) \
		-dexpreopt_script $@ -strip_script $(PRIVATE_STRIP_SCRIPT) \
		-dexpreopt_script $@ \
		-out_dir $(OUT_DIR)

		my_dexpreopt_deps := $(my_dex_jar)
		@@ -302,6 +296,5 @@ ifdef LOCAL_DEX_PREOPT

		my_dexpreopt_config :=
		my_dexpreopt_script :=
		my_strip_script :=
		my_dexpreopt_zip :=
		endif # LOCAL_DEX_PREOPT