commit fc782ad949515da7b4dda6067b7df3a832936619
author Colin Cross <ccross@android.com> Mon Oct 22 13:44:27 2018 -0700
committer Colin Cross <ccross@android.com> Tue Oct 23 22:33:07 2018 -0700
tree c858e3e50c33692634e05ab991d67f1549a7a801
parent b8ca22ca30f585220b8b60707618f4b3b775083f

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

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 84d1c2c..9a52af7 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -665,7 +665,7 @@
 	@# Keep a copy of apk with classes.dex unstripped
 	$(hide) cp -f $@ $(dir $@)package.dex.apk
 endif  # BUILD_PLATFORM_ZIP
-ifneq (nostripping,$(LOCAL_DEX_PREOPT))
+ifdef LOCAL_STRIP_DEX
 	$(call dexpreopt-remove-classes.dex,$@)
 endif
 endif  # LOCAL_DEX_PREOPT