From a81dad1bc46db7beac3e03de632eda2303bcf9e2 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 11 Feb 2019 19:30:39 +0000
Subject: [PATCH] Revert "Never strip and store dex files uncompressed when
 they are preopted on system."

This reverts commit 9cdc3beb3d1e098604f88de63bc0917852a9dbaa.

Reason for revert: b/123436620

Change-Id: I45fa9236e37c3b7e2d44ede62a2701db2bc8a20d
---
 core/dex_preopt_config.mk       | 7 +------
 core/dex_preopt_odex_install.mk | 9 ---------
 core/product.mk                 | 1 -
 core/product_config.mk          | 2 --
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 0658c566d8..2dc187d18f 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -45,11 +45,7 @@ SYSTEM_OTHER_ODEX_FILTER ?= \
     product/app/% \
     product/priv-app/% \
 
-# The default values for pre-opting. To support the runtime module we ensure no dex files
-# get stripped.
-ifeq ($(PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING),)
-  PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING := true
-endif
+# The default values for pre-opting: always preopt PIC.
 # Conditional to building on linux, as dex2oat currently does not work on darwin.
 ifeq ($(HOST_OS),linux)
   WITH_DEXPREOPT ?= true
@@ -138,7 +134,6 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
   $(call add_json_str,  DefaultCompilerFilter,              $(PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER))
   $(call add_json_str,  SystemServerCompilerFilter,         $(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))
   $(call add_json_bool, GenerateDmFiles,                    $(PRODUCT_DEX_PREOPT_GENERATE_DM_FILES))
-  $(call add_json_bool, NeverAllowStripping,                $(PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING))
   $(call add_json_bool, NoDebugInfo,                        $(filter false,$(WITH_DEXPREOPT_DEBUG_INFO)))
   $(call add_json_bool, AlwaysSystemServerDebugInfo,        $(filter true,$(PRODUCT_SYSTEM_SERVER_DEBUG_INFO)))
   $(call add_json_bool, NeverSystemServerDebugInfo,         $(filter false,$(PRODUCT_SYSTEM_SERVER_DEBUG_INFO)))
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 720b3c2d8c..f32b7b55b1 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -119,15 +119,6 @@ endif
 my_dexpreopt_archs :=
 
 ifdef LOCAL_DEX_PREOPT
-  # Store uncompressed dex files preopted in /system
-  ifeq ($(BOARD_USES_SYSTEM_OTHER_ODEX),true)
-    ifeq ($(call install-on-system-other, $(my_module_path)),)
-      LOCAL_UNCOMPRESS_DEX := true
-    endif  # install-on-system-other
-  else  # BOARD_USES_SYSTEM_OTHER_ODEX
-    LOCAL_UNCOMPRESS_DEX := true
-  endif
-
   ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)
     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.
diff --git a/core/product.mk b/core/product.mk
index e9a54828db..d249adf2cf 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -180,7 +180,6 @@ _product_var_list := \
     PRODUCT_DEX_PREOPT_PROFILE_DIR \
     PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \
     PRODUCT_DEX_PREOPT_GENERATE_DM_FILES \
-    PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING \
     PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE \
     PRODUCT_SYSTEM_SERVER_COMPILER_FILTER \
     PRODUCT_SANITIZER_MODULE_CONFIGS \
diff --git a/core/product_config.mk b/core/product_config.mk
index e4e07e6daa..4823e248ff 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -412,8 +412,6 @@ PRODUCT_DEX_PREOPT_BOOT_FLAGS := \
     $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_BOOT_FLAGS))
 PRODUCT_DEX_PREOPT_PROFILE_DIR := \
     $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_PROFILE_DIR))
-PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING := \
-    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING))
 
 # Boot image options.
 PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := \