omni_emulator: make it work for 12
Change-Id: I10035855690e07e7c57087a6a9698a2935a71647
diff --git a/utils/omni_emulator/fstab.ranchu b/utils/omni_emulator/fstab.ranchu
index 4a5f002..157c9ed 100644
--- a/utils/omni_emulator/fstab.ranchu
+++ b/utils/omni_emulator/fstab.ranchu
@@ -2,5 +2,7 @@
#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
system /system ext4 ro,barrier=1 wait,logical,avb=vbmeta,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
-/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,fileencryption=aes-256-xts:aes-256-cts,reservedsize=128M
+/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,fileencryption=aes-256-xts:aes-256-cts,reservedsize=128M,latemount
+/dev/block/pci/pci0000:00/0000:00:06.0/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
/devices/*/block/vdf auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata
+dev/block/zram0 none swap defaults zramsize=75%
diff --git a/utils/omni_emulator/fstab.ranchu.initrd b/utils/omni_emulator/fstab.ranchu.initrd
index e792feb..c379960 100644
--- a/utils/omni_emulator/fstab.ranchu.initrd
+++ b/utils/omni_emulator/fstab.ranchu.initrd
@@ -2,3 +2,4 @@
#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
system /system ext4 ro,barrier=1 wait,logical,avb=vbmeta,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
+/dev/block/pci/pci0000:00/0000:00:06.0/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
diff --git a/utils/omni_emulator/omni.dependencies b/utils/omni_emulator/omni.dependencies
deleted file mode 100644
index 0f1007a..0000000
--- a/utils/omni_emulator/omni.dependencies
+++ /dev/null
@@ -1,38 +0,0 @@
-[
- {
- "remote": "aosp",
- "repository": "device/generic/common",
- "target_path": "device/generic/common",
- "revision": "refs/tags/android-11.0.0_r16"
- },
- {
- "remote": "aosp",
- "repository": "device/generic/goldfish",
- "target_path": "device/generic/goldfish",
- "revision": "refs/tags/android-11.0.0_r16"
- },
- {
- "remote": "aosp",
- "repository": "device/generic/goldfish-opengl",
- "target_path": "device/generic/goldfish-opengl",
- "revision": "refs/tags/android-11.0.0_r16"
- },
- {
- "remote": "aosp",
- "repository": "device/generic/opengl-transport",
- "target_path": "device/generic/opengl-transport",
- "revision": "refs/tags/android-11.0.0_r16"
- },
- {
- "remote": "aosp",
- "repository": "device/generic/uml",
- "target_path": "device/generic/uml",
- "revision": "refs/tags/android-11.0.0_r16"
- },
- {
- "remote": "aosp",
- "repository": "device/sample",
- "target_path": "device/sample",
- "revision": "refs/tags/android-11.0.0_r16"
- }
-]
diff --git a/utils/omni_emulator/omni_emulator.mk b/utils/omni_emulator/omni_emulator.mk
index f26bd64..3ff34d6 100644
--- a/utils/omni_emulator/omni_emulator.mk
+++ b/utils/omni_emulator/omni_emulator.mk
@@ -4,7 +4,7 @@
vendor/omni/prebuilt/etc/apns-conf.xml:system/etc/apns-conf.xml
PRODUCT_USE_DYNAMIC_PARTITIONS := true
-TARGET_NO_VENDOR_BOOT := true
+PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false
PRODUCT_QUOTA_PROJID := 1
PRODUCT_PROPERTY_OVERRIDES += external_storage.projid.enabled=1
PRODUCT_PROPERTY_OVERRIDES += external_storage.sdcardfs.enabled=0
diff --git a/utils/omni_emulator/overlay/frameworks/base/core/res/res/values/config.xml b/utils/omni_emulator/overlay/frameworks/base/core/res/res/values/config.xml
index f77a3aa..3f27c29 100644
--- a/utils/omni_emulator/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/utils/omni_emulator/overlay/frameworks/base/core/res/res/values/config.xml
@@ -29,9 +29,11 @@
black in software (to avoid aliasing or emulate a cutout that is not physically existent).
-->
<!--<bool name="config_fillMainBuiltInDisplayCutout">true</bool>-->
- <bool name="config_intrusiveNotificationLed">false</bool>
<bool name="config_intrusiveBatteryLed">false</bool>
-
- <integer name="config_screenBrightnessPulse">42</integer>
+
+ <!-- Maximum number of supported users -->
+ <integer name="config_multiuserMaximumUsers">4</integer>
+ <!-- Whether Multiuser UI should be shown -->
+ <bool name="config_enableMultiUserUI">true</bool>
</resources>
diff --git a/utils/omni_emulator/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml b/utils/omni_emulator/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
similarity index 79%
rename from utils/omni_emulator/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
rename to utils/omni_emulator/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 5a90f20..4478275 100644
--- a/utils/omni_emulator/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
+++ b/utils/omni_emulator/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,9 +16,7 @@
*/
-->
<resources>
-
- <dimen name="rounded_corner_radius">16dp</dimen>
- <dimen name="rounded_corner_content_padding">8dp</dimen>
- <dimen name="nav_content_padding">8dp</dimen>
+
+ <dimen name="qs_corner_radius">8dp</dimen>
</resources>
diff --git a/utils/omni_emulator/packages.mk b/utils/omni_emulator/packages.mk
index 3f789cd..0aa4d38 100644
--- a/utils/omni_emulator/packages.mk
+++ b/utils/omni_emulator/packages.mk
@@ -5,18 +5,36 @@
OmniJaws \
OmniStyle \
MatLog \
- OmniChange \
- OmniOverlayStub \
OmniStoreInstallerPrebuilt \
- omni-overlays \
OpenDelta \
- ThemePicker \
- Turbo \
- SystemWebView \
WallpaperCropper2
+# Additional tools
+PRODUCT_PACKAGES += \
+ e2fsck \
+ fsck.exfat \
+ lsof \
+ mke2fs \
+ mkfs.exfat \
+ openvpn \
+ tune2fs \
+ mkfs.ntfs \
+ mount.ntfs \
+ fsck.ntfs \
+ mkshrc_vendor \
+ toybox_vendor \
+ sh_vendor \
+ vim \
+ vncflinger \
+ vncpasswd \
+ OmniRemote \
+ SystemWebView \
+ OmniControl \
+ omni-overlays
+
#PRODUCT_PACKAGES += \
- GoldfishParts
+ ThemePicker \
+ OmniOverlayStub \
ifeq ($(BOARD_INCLUDE_CMDLINE_TOOLS),true)
PRODUCT_PACKAGES += \
@@ -35,16 +53,8 @@
endif
# Telephony extension
-PRODUCT_PACKAGES += telephony-ext
-PRODUCT_BOOT_JARS += telephony-ext
-
-PRODUCT_PACKAGES += \
- ims-ext-common \
- ims_ext_common.xml \
- qti-telephony-hidl-wrapper \
- qti_telephony_hidl_wrapper.xml \
- qti-telephony-utils \
- qti_telephony_utils.xml
+#PRODUCT_PACKAGES += telephony-ext
+#PRODUCT_BOOT_JARS += telephony-ext
# for fun
#PRODUCT_PACKAGES += \