18 files changed, 178 insertions, 87 deletions
diff --git a/64bitonly/product/sdk_phone64_x86_64.mk b/64bitonly/product/sdk_phone64_x86_64.mk
index c95b2964..af5b412e 100644
--- a/64bitonly/product/sdk_phone64_x86_64.mk
+++ b/64bitonly/product/sdk_phone64_x86_64.mk
@@ -20,7 +20,7 @@ BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_S
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 
-# Enable mainline checking for excat this product name
+# Enable mainline checking for this excat product name
 ifeq (sdk_phone64_x86_64,$(TARGET_PRODUCT))
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 endif
diff --git a/64bitonly/product/sdk_slim_arm64.mk b/64bitonly/product/sdk_slim_arm64.mk
index 2128bbcc..467cf46b 100644
--- a/64bitonly/product/sdk_slim_arm64.mk
+++ b/64bitonly/product/sdk_slim_arm64.mk
@@ -18,51 +18,26 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
 # for headless automated testing. Compared to the full AOSP 'sdk_phone'
 # image it removes/replaces most product apps, and turns off rendering
 # by default.
-#
-# All components inherited here go to system image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
 
-# Enable mainline checking for exact this product name
+# Enable mainline checking for this exact product name
 ifeq (sdk_slim_arm64,$(TARGET_PRODUCT))
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 endif
-#
-# All components inherited here go to system_ext image
-#
-# don't include full handheld_system_Ext which includes SystemUi, Settings etc
-$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-#
-# All components inherited here go to product image
-#
-# Just include webview, do not include most other apps
-$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
-# Include FakeSystemApp which replaces core system apps like Settings,
-# Launcher
-PRODUCT_PACKAGES += \
-    FakeSystemApp \
-#
-# All components inherited here go to vendor image
-#
-# this must go first - overwrites the goldfish handheld_core_hardware.xml
-$(call inherit-product, device/generic/goldfish/slim/vendor.mk)
-$(call inherit-product, device/generic/goldfish/board/emu64a/details.mk)
-$(call inherit-product, device/generic/goldfish/product/phone.mk)
 
-# include the overlay that overrides systemui definitions with fakesystemapp
-PRODUCT_PACKAGES += slim_overlay_frameworks_base_core
+BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 )
+BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 )  # +8M
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
-     development/sys-img/images_atd_source.prop_template
+    development/sys-img/images_atd_source.prop_template
+
+# this must go first - overwrites the goldfish handheld_core_hardware.xml
+$(call inherit-product, device/generic/goldfish/slim/vendor.mk)
+$(call inherit-product, device/generic/goldfish/board/emu64a/details.mk)
+$(call inherit-product, device/generic/goldfish/product/slim_handheld.mk)
 
-# Overrides
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_slim_arm64
 PRODUCT_DEVICE := emu64a
 PRODUCT_MODEL := Android ATD built for arm64
-# Disable <uses-library> checks for SDK product. It lacks some libraries (e.g.
-# RadioConfigLib), which makes it impossible to translate their module names to
-# library name, so the check fails.
-PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
diff --git a/64bitonly/product/sdk_slim_x86_64.mk b/64bitonly/product/sdk_slim_x86_64.mk
index 2b67566f..1907e3a0 100644
--- a/64bitonly/product/sdk_slim_x86_64.mk
+++ b/64bitonly/product/sdk_slim_x86_64.mk
@@ -14,54 +14,26 @@
 # limitations under the License.
 #
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
-# This is a build configuration for the 'slim' image targeted
-# for headless automated testing. Compared to the full AOSP 'sdk_phone'
-# image it removes/replaces most product apps, and turns off rendering
-# by default.
-#
-# All components inherited here go to system image
-#
+
+BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 )
+BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 )  # +8M
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
-# Enable mainline checking for exact this product name
+
+# Enable mainline checking for this exact product name
 ifeq (sdk_slim_x86_64,$(TARGET_PRODUCT))
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 endif
-#
-# All components inherited here go to system_ext image
-#
-# don't include full handheld_system_Ext which includes SystemUi, Settings etc
-$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-#
-# All components inherited here go to product image
-#
-# Just include webview, do not include most other apps
-$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
-# Include FakeSystemApp which replaces core system apps like Settings,
-# Launcher
-PRODUCT_PACKAGES += \
-    FakeSystemApp \
-#
-# All components inherited here go to vendor image
-#
+
 # this must go first - overwrites the goldfish handheld_core_hardware.xml
 $(call inherit-product, device/generic/goldfish/slim/vendor.mk)
 $(call inherit-product, device/generic/goldfish/board/emu64x/details.mk)
-$(call inherit-product, device/generic/goldfish/product/phone.mk)
-
-# include the overlay that overrides systemui definitions with fakesystemapp
-PRODUCT_PACKAGES += slim_overlay_frameworks_base_core
+$(call inherit-product, device/generic/goldfish/product/slim_handheld.mk)
 
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
     development/sys-img/images_atd_source.prop_template
 
-# Overrides
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_slim_x86_64
 PRODUCT_DEVICE := emu64x
-PRODUCT_MODEL := Android SDK built for x86_64
-# Disable <uses-library> checks for SDK product. It lacks some libraries (e.g.
-# RadioConfigLib), which makes it impossible to translate their module names to
-# library name, so the check fails.
-PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
+PRODUCT_MODEL := Android ATD built for x86_64
diff --git a/MultiDisplayProvider/Android.bp b/MultiDisplayProvider/Android.bp
index 4ae51515..55ac6b20 100644
--- a/MultiDisplayProvider/Android.bp
+++ b/MultiDisplayProvider/Android.bp
@@ -32,5 +32,6 @@ android_app {
     certificate: "platform",
     resource_dirs: ["res"],
     jni_libs: ["libemulator_multidisplay_jni"],
+    required: ["libemulator_multidisplay_jni"],
     system_ext_specific: true,
 }
diff --git a/board/BoardConfigCommon.mk b/board/BoardConfigCommon.mk
index 43ce9e00..b503f590 100644
--- a/board/BoardConfigCommon.mk
+++ b/board/BoardConfigCommon.mk
@@ -36,6 +36,8 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
 # emulator is Non-A/B device
 AB_OTA_UPDATER := false
+AB_OTA_PARTITIONS :=
+
 BOARD_USES_SYSTEM_OTHER_ODEX :=
 
 # emulator needs super.img
diff --git a/board/emu64x/details.mk b/board/emu64x/details.mk
index 00718516..07e5bf6b 100644
--- a/board/emu64x/details.mk
+++ b/board/emu64x/details.mk
@@ -25,7 +25,6 @@ ADVANCED_FEATURES_FILE := advancedFeatures.ini.minigbm
 endif
 
 PRODUCT_COPY_FILES += \
-    device/generic/goldfish/data/etc/config.ini.xl:config.ini \
     device/generic/goldfish/data/etc/$(ADVANCED_FEATURES_FILE):advancedFeatures.ini \
     $(EMULATOR_KERNEL_FILE):kernel-ranchu \
     device/generic/goldfish/board/fstab/x86:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
diff --git a/board/emu64x16k/details.mk b/board/emu64x16k/details.mk
index d80838cc..ae8da0a6 100644
--- a/board/emu64x16k/details.mk
+++ b/board/emu64x16k/details.mk
@@ -25,7 +25,6 @@ ADVANCED_FEATURES_FILE := advancedFeatures.ini.minigbm
 endif
 
 PRODUCT_COPY_FILES += \
-    device/generic/goldfish/data/etc/config.ini.xl:config.ini \
     device/generic/goldfish/data/etc/$(ADVANCED_FEATURES_FILE):advancedFeatures.ini \
     $(EMULATOR_KERNEL_FILE):kernel-ranchu \
     device/generic/goldfish/board/fstab/x86:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
diff --git a/data/etc/advancedFeatures.ini.desktop b/data/etc/advancedFeatures.ini.desktop
new file mode 100644
index 00000000..02671453
--- /dev/null
+++ b/data/etc/advancedFeatures.ini.desktop
@@ -0,0 +1,32 @@
+BluetoothEmulation = on
+GrallocSync = on
+GLDMA = on
+LogcatPipe = on
+GLAsyncSwap = on
+GLESDynamicVersion = on
+EncryptUserData = on
+IntelPerformanceMonitoringUnit = on
+VirtioWifi = on
+HostComposition = on
+RefCountPipe = on
+VirtioInput = on
+HardwareDecoder = on
+DynamicPartition = on
+ModemSimulator = on
+MultiDisplay = on
+YUVCache = on
+GLDirectMem = on
+VulkanNullOptionalStrings = on
+VulkanIgnoredHandles = on
+Mac80211hwsimUserspaceManaged = on
+VirtconsoleLogcat = on
+VirtioVsockPipe = on
+AndroidbootProps2 = on
+DeviceSkinOverlay = on
+VulkanQueueSubmitWithCommands = on
+VulkanBatchedDescriptorSetUpdate = on
+DeviceStateOnBoot = on
+HWCMultiConfigs = on
+VirtioSndCard = on
+DeviceKeyboardHasAssistKey = on
+VirtioTablet = on
diff --git a/data/etc/advancedFeatures.ini.minigbm b/data/etc/advancedFeatures.ini.minigbm
index 244a294d..1b38edcd 100644
--- a/data/etc/advancedFeatures.ini.minigbm
+++ b/data/etc/advancedFeatures.ini.minigbm
@@ -8,7 +8,6 @@ EncryptUserData = on
 IntelPerformanceMonitoringUnit = on
 VirtioWifi = on
 HostComposition = on
-RefCountPipe = on
 VirtioInput = on
 HardwareDecoder = on
 DynamicPartition = on
diff --git a/data/etc/google/user/advancedFeatures.ini.desktop b/data/etc/google/user/advancedFeatures.ini.desktop
new file mode 100644
index 00000000..c8d2d77b
--- /dev/null
+++ b/data/etc/google/user/advancedFeatures.ini.desktop
@@ -0,0 +1,33 @@
+PlayStoreImage = on
+BluetoothEmulation = on
+GrallocSync = on
+GLDMA = on
+LogcatPipe = on
+GLAsyncSwap = on
+GLESDynamicVersion = on
+EncryptUserData = on
+IntelPerformanceMonitoringUnit = on
+VirtioWifi = on
+HostComposition = on
+RefCountPipe = on
+VirtioInput = on
+HardwareDecoder = on
+DynamicPartition = on
+ModemSimulator= on
+MultiDisplay = on
+YUVCache = on
+GLDirectMem = on
+VulkanNullOptionalStrings = on
+VulkanIgnoredHandles = on
+Mac80211hwsimUserspaceManaged = on
+VirtconsoleLogcat = on
+VirtioVsockPipe = on
+AndroidbootProps2 = on
+DeviceSkinOverlay = on
+VulkanQueueSubmitWithCommands = on
+VulkanBatchedDescriptorSetUpdate = on
+DeviceStateOnBoot = on
+HWCMultiConfigs = on
+VirtioSndCard = on
+DeviceKeyboardHasAssistKey = on
+VirtioTablet = on
diff --git a/data/etc/google/user/advancedFeatures.ini.minigbm b/data/etc/google/user/advancedFeatures.ini.minigbm
index 7a910798..d163cace 100644
--- a/data/etc/google/user/advancedFeatures.ini.minigbm
+++ b/data/etc/google/user/advancedFeatures.ini.minigbm
@@ -9,7 +9,6 @@ EncryptUserData = on
 IntelPerformanceMonitoringUnit = on
 VirtioWifi = on
 HostComposition = on
-RefCountPipe = on
 VirtioInput = on
 HardwareDecoder = on
 DynamicPartition = on
diff --git a/data/etc/google/userdebug/advancedFeatures.ini.desktop b/data/etc/google/userdebug/advancedFeatures.ini.desktop
new file mode 100644
index 00000000..b407f2e1
--- /dev/null
+++ b/data/etc/google/userdebug/advancedFeatures.ini.desktop
@@ -0,0 +1,32 @@
+BluetoothEmulation = on
+GrallocSync = on
+GLDMA = on
+LogcatPipe = on
+GLAsyncSwap = on
+GLESDynamicVersion = on
+EncryptUserData = on
+IntelPerformanceMonitoringUnit = on
+VirtioWifi = on
+HostComposition = on
+RefCountPipe = on
+VirtioInput = on
+HardwareDecoder = on
+DynamicPartition = on
+ModemSimulator= on
+MultiDisplay = on
+YUVCache = on
+GLDirectMem = on
+VulkanNullOptionalStrings = on
+VulkanIgnoredHandles = on
+Mac80211hwsimUserspaceManaged = on
+VirtconsoleLogcat = on
+VirtioVsockPipe = on
+AndroidbootProps2 = on
+DeviceSkinOverlay = on
+VulkanQueueSubmitWithCommands = on
+VulkanBatchedDescriptorSetUpdate = on
+DeviceStateOnBoot = on
+HWCMultiConfigs = on
+VirtioSndCard = on
+DeviceKeyboardHasAssistKey = on
+VirtioTablet = on
diff --git a/data/etc/google/userdebug/advancedFeatures.ini.minigbm b/data/etc/google/userdebug/advancedFeatures.ini.minigbm
index 1a0e804c..9c408ccc 100644
--- a/data/etc/google/userdebug/advancedFeatures.ini.minigbm
+++ b/data/etc/google/userdebug/advancedFeatures.ini.minigbm
@@ -8,7 +8,6 @@ EncryptUserData = on
 IntelPerformanceMonitoringUnit = on
 VirtioWifi = on
 HostComposition = on
-RefCountPipe = on
 VirtioInput = on
 HardwareDecoder = on
 DynamicPartition = on
diff --git a/product/base_handheld.mk b/product/base_handheld.mk
new file mode 100644
index 00000000..095a7e10
--- /dev/null
+++ b/product/base_handheld.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2024 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
+$(call inherit-product, frameworks/base/data/sounds/AllAudio.mk)
+
+$(call inherit-product, device/generic/goldfish/product/multidisplay.mk)
diff --git a/product/handheld.mk b/product/handheld.mk
index 2dbccabb..cf14baaf 100644
--- a/product/handheld.mk
+++ b/product/handheld.mk
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
+$(call inherit-product, device/generic/goldfish/product/base_handheld.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
-$(call inherit-product, frameworks/base/data/sounds/AllAudio.mk)
-
-$(call inherit-product, device/generic/goldfish/product/multidisplay.mk)
diff --git a/product/multidisplay.mk b/product/multidisplay.mk
index 1735591f..5b471bda 100644
--- a/product/multidisplay.mk
+++ b/product/multidisplay.mk
@@ -16,7 +16,7 @@
 
 PRODUCT_PACKAGES += MultiDisplayProvider
 
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST := \
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     system/lib/libemulator_multidisplay_jni.so \
     system/lib64/libemulator_multidisplay_jni.so \
     system/priv-app/MultiDisplayProvider/MultiDisplayProvider.apk \
diff --git a/product/slim_handheld.mk b/product/slim_handheld.mk
new file mode 100644
index 00000000..6765ce73
--- /dev/null
+++ b/product/slim_handheld.mk
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2024 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+$(call inherit-product, device/generic/goldfish/product/base_handheld.mk)
+# include webview
+$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
+# don't include full handheld_system_Ext which includes SystemUi, Settings etc
+$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
+
+DEVICE_PACKAGE_OVERLAYS += device/generic/goldfish/phone/overlay
+PRODUCT_CHARACTERISTICS := emulator
+
+# Include FakeSystemApp which replaces core system apps like Settings,
+# Launcher
+# and include the overlay that overrides systemui definitions with fakesystemapp
+PRODUCT_PACKAGES += \
+    FakeSystemApp \
+    slim_overlay_frameworks_base_core
+
+$(call inherit-product, device/generic/goldfish/product/generic.mk)
+
diff --git a/provision/EmulatorProvisonLib/src/com/android/sdksetup/ProvisionActivity.java b/provision/EmulatorProvisonLib/src/com/android/sdksetup/ProvisionActivity.java
index 8ce1fff5..dc56cdda 100644
--- a/provision/EmulatorProvisonLib/src/com/android/sdksetup/ProvisionActivity.java
+++ b/provision/EmulatorProvisonLib/src/com/android/sdksetup/ProvisionActivity.java
@@ -199,7 +199,6 @@ public abstract class ProvisionActivity extends Activity {
     }
 
     protected void provisionAdb() {
-        Settings.Global.putInt(getContentResolver(), Settings.Global.ADB_ENABLED, 1);
         Settings.Global.putInt(getContentResolver(), Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0);
     }