commit 2f945cf1cb3d183142bd44ca5daf9728fbb3fd51
author Roman Kiryanov <rkir@google.com> Thu Feb 09 23:07:08 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 09 23:07:08 2023 +0000
tree d12c776a6e914453a10014de1ae64ce4afba3846
parent 6efe2f32d92e53f3933a66fae019ec96fe04b719
parent 85355d6ee6d6a46fc538fbf5ec6d8f76ebf09c56

[automerger skipped] RESTRICT AUTOMERGE. Enable VsockSnapshotLoadFixed_b231345789 am: c60dae8e1b -s ours am: 5900ee48d1 -s ours am: 85355d6ee6 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/21345660

Change-Id: Ie80bc05ee839d75cdceada2783590c3ed806013b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

64bitonly/product/vendor.mk

diff --git a/64bitonly/product/vendor.mk b/64bitonly/product/vendor.mk
index edd5019..9a613d4 100644
--- a/64bitonly/product/vendor.mk
+++ b/64bitonly/product/vendor.mk
@@ -98,7 +98,9 @@
     android.hardware.bluetooth.audio@2.1-impl
 
 # Bluetooth hardware properties.
+ifeq ($(TARGET_PRODUCT_PROP),)
 TARGET_PRODUCT_PROP := $(LOCAL_PATH)/../../bluetooth.prop
+endif
 
 # Bluetooth se policies
 BOARD_SEPOLICY_DIRS += system/bt/vendor_libs/linux/sepolicy

emulator-info.txt

diff --git a/emulator-info.txt b/emulator-info.txt
index 43c68fc..bb25bb1 100644
--- a/emulator-info.txt
+++ b/emulator-info.txt
@@ -1,2 +1,2 @@
 # Emulator (stable) version
-require version-emulator=8735603
+require version-emulator=9458377

pc/images_source.prop_template

diff --git a/pc/images_source.prop_template b/pc/images_source.prop_template
index 5c47d34..ab63ff7 100644
--- a/pc/images_source.prop_template
+++ b/pc/images_source.prop_template
@@ -4,8 +4,8 @@
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=${TARGET_CPU_ABI}
-SystemImage.TagId=android-pc
-SystemImage.TagDisplay=PC
+SystemImage.TagId=android-desktop
+SystemImage.TagDisplay=Desktop
 SystemImage.GpuSupport=true
 Addon.VendorId=google
 Addon.VendorDisplay=Google Inc.

pc/sdk_pc_x86_64.mk

diff --git a/pc/sdk_pc_x86_64.mk b/pc/sdk_pc_x86_64.mk
index 1ede69a..01b9f6d 100644
--- a/pc/sdk_pc_x86_64.mk
+++ b/pc/sdk_pc_x86_64.mk
@@ -24,3 +24,4 @@
 PRODUCT_PACKAGE_OVERLAYS := device/generic/goldfish/pc/overlay
 PRODUCT_COPY_FILES += \
     device/generic/goldfish/pc/data/etc/pc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/pc.xml
+PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := device/generic/goldfish/pc/images_source.prop_template

vendor.mk

diff --git a/vendor.mk b/vendor.mk
index 984a7ce..dcc61f1 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -94,7 +94,10 @@
     android.hardware.bluetooth@1.1-service.btlinux \
     android.hardware.bluetooth.audio@2.1-impl
 
+# Bluetooth hardware properties.
+ifeq ($(TARGET_PRODUCT_PROP),)
 TARGET_PRODUCT_PROP := $(LOCAL_PATH)/bluetooth.prop
+endif
 
 # Bluetooth se policies
 BOARD_SEPOLICY_DIRS += system/bt/vendor_libs/linux/sepolicy