openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Revert "Revert "Default to nostripping for non /system preopt""" 

am: 401fada3f5

Change-Id: I36025bea5e3c69e72d3dcdaa50649c73cfaf0d28
This commit is contained in:
Mathieu Chartier 2018-07-17 11:28:04 -07:00 committed by android-build-merger
parent 19a41487e9 401fada3f5
commit 7ae8bb5efa
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 else # LOCAL_APK_LIBRARIES not empty
LOCAL_DEX_PREOPT := nostripping LOCAL_DEX_PREOPT := nostripping
endif # LOCAL_APK_LIBRARIES not empty 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 # Installed to system.img.
endif # LOCAL_DEX_PREOPT undefined endif # LOCAL_DEX_PREOPT undefined
endif # TARGET_BUILD_APPS empty endif # TARGET_BUILD_APPS empty
@ -206,6 +214,11 @@ my_module_multilib := first
endif endif
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 # Odex for the 1st arch
my_2nd_arch_prefix := my_2nd_arch_prefix :=
@ -224,9 +237,12 @@ endif # TARGET_2ND_ARCH
else # must be APPS else # must be APPS
# The preferred arch # The preferred arch
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX) 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 include $(BUILD_SYSTEM)/setup_one_odex.mk
my_module_multilib := $(saved_my_module_multilib)
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(LOCAL_MULTILIB),both) ifeq ($(my_module_multilib),both)
# The non-preferred arch # The non-preferred arch
my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX)) my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX))
include $(BUILD_SYSTEM)/setup_one_odex.mk include $(BUILD_SYSTEM)/setup_one_odex.mk