commit 2357700f53bc43934a902ae710a319d2af095560
author Nicolas Geoffray <ngeoffray@google.com> Mon Jan 08 10:25:09 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 17 11:24:28 2018 +0000
tree 851312de5caaed8a2ae9bbd6d68d3589852b0c12
parent 8345db66f6712ca3af1e64ff7a78723a0e0892d7

Remove copy/pasta code around DEX_PREOPT.

Test: m
Change-Id: I792b67590656d5474cfbe2b86cd870532f95b24e

marlin/BoardConfig.mk

diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index 7ee12c1..3ad6e4b 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -154,18 +154,6 @@
 BOARD_QTI_CAMERA_32BIT_ONLY := true
 TARGET_BOOTIMG_SIGNED := true
 
-# Enable dex pre-opt to speed up initial boot
-ifeq ($(HOST_OS),linux)
-  ifeq ($(WITH_DEXPREOPT),)
-    WITH_DEXPREOPT := true
-    WITH_DEXPREOPT_PIC := true
-    ifneq ($(TARGET_BUILD_VARIANT),user)
-      # Retain classes.dex in APK's for non-user builds
-      DEX_PREOPT_DEFAULT := nostripping
-    endif
-  endif
-endif
-
 # HTC_SENSOR_HUB
 LIBHTC_SENSORHUB_PROJECT := g_project
 

sailfish/BoardConfig.mk

diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index e2c09db..f4d835f 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -144,18 +144,6 @@
 BOARD_QTI_CAMERA_32BIT_ONLY := true
 TARGET_BOOTIMG_SIGNED := true
 
-# Enable dex pre-opt to speed up initial boot
-ifeq ($(HOST_OS),linux)
-  ifeq ($(WITH_DEXPREOPT),)
-    WITH_DEXPREOPT := true
-    WITH_DEXPREOPT_PIC := true
-    ifneq ($(TARGET_BUILD_VARIANT),user)
-      # Retain classes.dex in APK's for non-user builds
-      DEX_PREOPT_DEFAULT := nostripping
-    endif
-  endif
-endif
-
 # HTC_SENSOR_HUB
 LIBHTC_SENSORHUB_PROJECT := g_project