omni: emulator: never dexpreopt and allow remount
Change-Id: I807e98020e6dfaf5d1c3d4ff5b29b648b999ba47
diff --git a/utils/emulator/common.mk b/utils/emulator/common.mk
index 4ccabe5..5949d9d 100644
--- a/utils/emulator/common.mk
+++ b/utils/emulator/common.mk
@@ -72,25 +72,4 @@
# Add our overlays
PRODUCT_PACKAGE_OVERLAYS += vendor/omni/overlay/common
-# Enable dexpreopt for all nightlies
-ifeq ($(ROM_BUILDTYPE),NIGHTLY)
- ifeq ($(WITH_DEXPREOPT),)
- WITH_DEXPREOPT := true
- endif
-endif
-# and weeklies
-ifeq ($(ROM_BUILDTYPE),WEEKLY)
- ifeq ($(WITH_DEXPREOPT),)
- WITH_DEXPREOPT := true
- endif
-endif
-# and security releases
-ifeq ($(ROM_BUILDTYPE),SECURITY_RELEASE)
- ifeq ($(WITH_DEXPREOPT),)
- WITH_DEXPREOPT := true
- endif
-endif
-# but not homemades
-#ifeq ($(ROM_BUILDTYPE),HOMEMADE)
-# WITH_DEXPREOPT := false
-#endif
+WITH_DEXPREOPT := false
diff --git a/utils/emulator/start_emulator_image.sh b/utils/emulator/start_emulator_image.sh
index 022c4c5..c93ed81 100755
--- a/utils/emulator/start_emulator_image.sh
+++ b/utils/emulator/start_emulator_image.sh
@@ -4,4 +4,4 @@
export ANDROID_BUILD_TOP=/tmp/generic_x86
export ANDROID_PRODUCT_OUT=/tmp/generic_x86
-~/Android/Sdk/tools/emulator -verbose -skindir /tmp/generic_x86/skins/ -skin pixel_xl -kernel ~/Android/Sdk/system-images/android-26/google_apis/x86/kernel-ranchu -gpu host -ramdisk ~/Android/Sdk/system-images/android-26/google_apis/x86/ramdisk.img
+~/Android/Sdk/tools/emulator -verbose -skindir /tmp/generic_x86/skins/ -skin pixel_xl -kernel ~/Android/Sdk/system-images/android-26/google_apis/x86/kernel-ranchu -gpu host -ramdisk ~/Android/Sdk/system-images/android-26/google_apis/x86/ramdisk.img -writable-system
diff --git a/utils/emulator/start_emulator_local.sh b/utils/emulator/start_emulator_local.sh
index 599124c..16ad274 100755
--- a/utils/emulator/start_emulator_local.sh
+++ b/utils/emulator/start_emulator_local.sh
@@ -2,4 +2,4 @@
# assumes the image zip has been extracted in /tmp
-emulator -verbose -skindir $ANDROID_BUILD_TOP/vendor/omni/utils/emulator/skins/ -skin pixel_xl -ramdisk ~/Android/Sdk/system-images/android-26/google_apis/x86/ramdisk.img -kernel ~/Android/Sdk/system-images/android-26/google_apis/x86/kernel-ranchu -gpu host
+emulator -verbose -skindir $ANDROID_BUILD_TOP/vendor/omni/utils/emulator/skins/ -skin pixel_xl -ramdisk ~/Android/Sdk/system-images/android-26/google_apis/x86/ramdisk.img -kernel ~/Android/Sdk/system-images/android-26/google_apis/x86/kernel-ranchu -gpu host -writable-system