aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Chartier2018-07-12 20:17:54 -0500
committerMathieu Chartier2018-07-16 21:36:24 -0500
commitfd5dfb817cb2242aa31efc1ad7e3e20231a87817 (patch)
tree56ee998f2336879c2f056e57ae0996a5619413ec /core/dex_preopt_odex_install.mk
parent25e4495de179eb606ab756de5783dbd9d81dac5b (diff)
downloadplatform-build-fd5dfb817cb2242aa31efc1ad7e3e20231a87817.tar.gz
platform-build-fd5dfb817cb2242aa31efc1ad7e3e20231a87817.tar.xz
platform-build-fd5dfb817cb2242aa31efc1ad7e3e20231a87817.zip
Revert "Revert "Default to nostripping for non /system preopt""
Added logic to not preopt tests. Re-enabled usage of my_module_multilib since this is referenced in setup_one_odex. Bug: 110156979 Test: make Test: forrest first boot tests This reverts commit 9234def3135cbd5ab40181ce7c021f609d402ab8. Change-Id: I6a6ea2cd0024c33c0cfbd60f3a1f4ad5b1609dc8
Diffstat (limited to 'core/dex_preopt_odex_install.mk')
-rw-r--r--core/dex_preopt_odex_install.mk18
1 files changed, 17 insertions, 1 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 358502688..208647ef0 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -34,6 +34,14 @@ else # WITH_DEXPREOPT=true
34 else # LOCAL_APK_LIBRARIES not empty 34 else # LOCAL_APK_LIBRARIES not empty
35 LOCAL_DEX_PREOPT := nostripping 35 LOCAL_DEX_PREOPT := nostripping
36 endif # LOCAL_APK_LIBRARIES not empty 36 endif # LOCAL_APK_LIBRARIES not empty
37 else
38 # Default to nostripping for non system preopt (enables preopt).
39 # Don't strip in case the oat/vdex version in system ROM doesn't match the one in other
40 # partitions. It needs to be able to fall back to the APK for that case.
41 # Also only enable preopt for non tests.
42 ifeq (,$(filter $(LOCAL_MODULE_TAGS),tests))
43 LOCAL_DEX_PREOPT := nostripping
44 endif
37 endif # Installed to system.img. 45 endif # Installed to system.img.
38 endif # LOCAL_DEX_PREOPT undefined 46 endif # LOCAL_DEX_PREOPT undefined
39 endif # TARGET_BUILD_APPS empty 47 endif # TARGET_BUILD_APPS empty
@@ -204,6 +212,11 @@ my_module_multilib := first
204endif 212endif
205endif 213endif
206 214
215# Only preopt primary arch for translated arch since there is only an image there.
216ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
217my_module_multilib := first
218endif
219
207# ################################################# 220# #################################################
208# Odex for the 1st arch 221# Odex for the 1st arch
209my_2nd_arch_prefix := 222my_2nd_arch_prefix :=
@@ -222,9 +235,12 @@ endif # TARGET_2ND_ARCH
222else # must be APPS 235else # must be APPS
223# The preferred arch 236# The preferred arch
224my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX) 237my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
238# Save the module multilib since setup_one_odex modifies it.
239saved_my_module_multilib := $(my_module_multilib)
225include $(BUILD_SYSTEM)/setup_one_odex.mk 240include $(BUILD_SYSTEM)/setup_one_odex.mk
241my_module_multilib := $(saved_my_module_multilib)
226ifdef TARGET_2ND_ARCH 242ifdef TARGET_2ND_ARCH
227ifeq ($(LOCAL_MULTILIB),both) 243ifeq ($(my_module_multilib),both)
228# The non-preferred arch 244# The non-preferred arch
229my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX)) 245my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX))
230include $(BUILD_SYSTEM)/setup_one_odex.mk 246include $(BUILD_SYSTEM)/setup_one_odex.mk