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

Commit 9234def3 authored by Yueming Wang's avatar Yueming Wang
Browse files

Revert "Default to nostripping for non /system preopt" 

This reverts commit 25f9aa8c.

Reason for revert: This CL is likely to break several targets in pi-dev-plus-aosp and oc-mr1-dev-plus-aosp.

Change-Id: I3b29cbdf54007d2043ea1d2e4fe8d56d45eced9e
parent 25f9aa8c

core/dex_preopt_odex_install.mk

+5 −16
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ 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.

        LOCAL_DEX_PREOPT := nostripping

      endif # Installed to system.img.

    endif # LOCAL_DEX_PREOPT undefined

  endif # TARGET_BUILD_APPS empty
@@ -197,8 +192,7 @@ installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IM 
else  # boot jar

ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)



# Use my_module_dexpreopt_multilib since my_module_multilib is modified in included files below.

my_module_dexpreopt_multilib := $(LOCAL_MULTILIB)

my_module_multilib := $(LOCAL_MULTILIB)

# If the module is not an SDK library and it's a system server jar, only preopt the primary arch.

my_filtered_lib_name := $(patsubst %.impl,%,$(LOCAL_MODULE))

ifeq (,$(filter $(JAVA_SDK_LIBRARIES),$(my_filtered_lib_name)))
@@ -206,15 +200,10 @@ ifeq (,$(filter $(JAVA_SDK_LIBRARIES),$(my_filtered_lib_name))) 
# But it can be overridden with "LOCAL_MULTILIB := first".

ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))

# For system server jars, we build for only "first".

my_module_dexpreopt_multilib := first

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_dexpreopt_multilib := first

endif



# #################################################

# Odex for the 1st arch

my_2nd_arch_prefix :=
@@ -223,10 +212,10 @@ include $(BUILD_SYSTEM)/setup_one_odex.mk 
# Odex for the 2nd arch

ifdef TARGET_2ND_ARCH

ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)

ifneq (first,$(my_module_dexpreopt_multilib))

ifneq (first,$(my_module_multilib))

my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)

include $(BUILD_SYSTEM)/setup_one_odex.mk

endif  # my_module_dexpreopt_multilib is not first.

endif  # my_module_multilib is not first.

endif  # TARGET_TRANSLATE_2ND_ARCH not true

endif  # TARGET_2ND_ARCH

# #################################################
@@ -235,7 +224,7 @@ else # must be APPS 
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)

include $(BUILD_SYSTEM)/setup_one_odex.mk

ifdef TARGET_2ND_ARCH

ifeq ($(my_module_dexpreopt_multilib),both)

ifeq ($(LOCAL_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