p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 9234def313.

Change-Id: I6a6ea2cd0024c33c0cfbd60f3a1f4ad5b1609dc8
This commit is contained in:
Mathieu Chartier 2018-07-12 18:17:54 -07:00
parent 25e4495de1
commit fd5dfb817c
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/dex_preopt_odex_install.mk
View File

@ -34,6 +34,14 @@ else # WITH_DEXPREOPT=true
else # LOCAL_APK_LIBRARIES not empty
LOCAL_DEX_PREOPT := nostripping
endif # LOCAL_APK_LIBRARIES not empty
else
# Default to nostripping for non system preopt (enables preopt).
# Don't strip in case the oat/vdex version in system ROM doesn't match the one in other
# partitions. It needs to be able to fall back to the APK for that case.
# Also only enable preopt for non tests.
ifeq (,$(filter $(LOCAL_MODULE_TAGS),tests))
LOCAL_DEX_PREOPT := nostripping
endif
endif # Installed to system.img.
endif # LOCAL_DEX_PREOPT undefined
endif # TARGET_BUILD_APPS empty
@ -204,6 +212,11 @@ my_module_multilib := first
endif
endif
# Only preopt primary arch for translated arch since there is only an image there.
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
my_module_multilib := first
endif
# #################################################
# Odex for the 1st arch
my_2nd_arch_prefix :=
@ -222,9 +235,12 @@ endif # TARGET_2ND_ARCH
else # must be APPS
# The preferred arch
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
# Save the module multilib since setup_one_odex modifies it.
saved_my_module_multilib := $(my_module_multilib)
include $(BUILD_SYSTEM)/setup_one_odex.mk
my_module_multilib := $(saved_my_module_multilib)
ifdef TARGET_2ND_ARCH
ifeq ($(LOCAL_MULTILIB),both)
ifeq ($(my_module_multilib),both)
# The non-preferred arch
my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX))
include $(BUILD_SYSTEM)/setup_one_odex.mk