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

Commit fc782ad9 authored by Colin Cross's avatar Colin Cross
Browse files

Reduce the propagation of LOCAL_DEX_PREOPT := nostripping 

nostripping causes confusing double negatives, allow nostripping
in LOCAL_DEX_PREOPT and DEFAULT_DEX_PREOPT, but convert to
LOCAL_STRIP_DEX outside of dex_preopt_odex_install.mk.

Test: m checkbuild
Change-Id: I996e9258ce20c394900d9fe937d638bc2ab8589d
parent b8ca22ca

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES:= 
LOCAL_STATIC_JAVA_AAR_LIBRARIES:=

LOCAL_STATIC_JAVA_LIBRARIES:=

LOCAL_STATIC_LIBRARIES:=

LOCAL_STRIP_DEX:=

LOCAL_STRIP_MODULE:=

LOCAL_SYSTEM_SHARED_LIBRARIES:=none

LOCAL_TARGET_REQUIRED_MODULES:=
@@ -284,6 +285,7 @@ LOCAL_TEST_MODULE_TO_PROGUARD_WITH:= 
LOCAL_TIDY:=

LOCAL_TIDY_CHECKS:=

LOCAL_TIDY_FLAGS:=

LOCAL_UNCOMPRESS_DEX:=

LOCAL_UNINSTALLABLE_MODULE:=

LOCAL_UNSTRIPPED_PATH:=

LOCAL_USE_AAPT2:=$(USE_AAPT2)

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -2640,12 +2640,12 @@ endef 
# Copy an apk to a target location while removing classes*.dex

# $(1): source file

# $(2): destination file

# $(3): LOCAL_DEX_PREOPT, if nostripping then leave classes*.dex

# $(3): LOCAL_STRIP_DEX, if non-empty then strip classes*.dex

define dexpreopt-copy-jar

$(2): $(1)

	@echo "Copy: $$@"

	$$(copy-file-to-target)

	$(if $(filter nostripping,$(3)),,$$(call dexpreopt-remove-classes.dex,$$@))

	$(if $(3),$$(call dexpreopt-remove-classes.dex,$$@))

endef



# $(1): the .jar or .apk to remove classes.dex. Note that if all dex files

core/dex_preopt.mk

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ define _dexpreopt-boot-jar-remove-classes.dex 
_dbj_jar_no_dex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1)_nodex.jar

_dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar



$(call dexpreopt-copy-jar,$$(_dbj_src_jar),$$(_dbj_jar_no_dex),$(DEX_PREOPT_DEFAULT))

$(call dexpreopt-copy-jar,$$(_dbj_src_jar),$$(_dbj_jar_no_dex),$(filter-out nostripping,$(DEX_PREOPT_DEFAULT)))



_dbj_jar_no_dex :=

_dbj_src_jar :=

core/dex_preopt_odex_install.mk

+11 −4
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


# We explicitly uncompress APKs of privileged apps, and used by

# privileged apps

LOCAL_UNCOMPRESS_DEX := false

ifneq (true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))

  ifeq (true,$(LOCAL_PRIVILEGED_MODULE))

    LOCAL_UNCOMPRESS_DEX := true
@@ -33,6 +32,13 @@ ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined 
  endif

endif



ifeq (nostripping,$(LOCAL_DEX_PREOPT))

  LOCAL_DEX_PREOPT := true

  LOCAL_STRIP_DEX :=

else

  LOCAL_STRIP_DEX := true

endif



ifeq (false,$(LOCAL_DEX_PREOPT))

  LOCAL_DEX_PREOPT :=

endif
@@ -81,14 +87,14 @@ endif 
ifeq ($(LOCAL_DEX_PREOPT),true)

  # Don't strip with dexes we explicitly uncompress (dexopt will not store the dex code).

  ifeq ($(LOCAL_UNCOMPRESS_DEX),true)

    LOCAL_DEX_PREOPT := nostripping

    LOCAL_STRIP_DEX :=

  endif  # LOCAL_UNCOMPRESS_DEX



  # system_other isn't there for an OTA, so don't strip

  # if module is on system, and odex is on system_other.

  ifeq ($(BOARD_USES_SYSTEM_OTHER_ODEX),true)

    ifneq ($(call install-on-system-other, $(my_module_path)),)

      LOCAL_DEX_PREOPT := nostripping

      LOCAL_STRIP_DEX :=

    endif  # install-on-system-other

  endif  # BOARD_USES_SYSTEM_OTHER_ODEX
@@ -320,7 +326,8 @@ ifdef LOCAL_DEX_PREOPT 


    ifeq (true,$(my_generate_dm))

      LOCAL_DEX_PREOPT_FLAGS += --copy-dex-files=false

      LOCAL_DEX_PREOPT := nostripping

      LOCAL_DEX_PREOPT := true

      LOCAL_STRIP_DEX :=

      my_built_dm := $(dir $(LOCAL_BUILT_MODULE))generated.dm

      my_installed_dm := $(patsubst %.apk,%,$(LOCAL_INSTALLED_MODULE)).dm

      my_copied_vdex := $(dir $(LOCAL_BUILT_MODULE))primary.vdex

core/java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ $(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(common_javalib.jar) 
	@echo "Dexpreopt Jar: $(PRIVATE_MODULE) ($@)"

	$(call dexpreopt-one-file,$<,$@)



$(eval $(call dexpreopt-copy-jar,$(common_javalib.jar),$(LOCAL_BUILT_MODULE),$(LOCAL_DEX_PREOPT)))

$(eval $(call dexpreopt-copy-jar,$(common_javalib.jar),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX)))



endif # ! boot jar