Merge "Snap for 11790536 from a3c68b20d815909e0f0e2683e6fa9390138a0733 to sdk-release" into sdk-releasesdk-release

9 files changed, 43 insertions, 202 deletions

diff --git a/64bitonly/product/sdk_phone16k_arm64.mk b/64bitonly/product/sdk_phone16k_arm64.mk
index 6e7eda69..3d09bf4a 100644
--- a/64bitonly/product/sdk_phone16k_arm64.mk
+++ b/64bitonly/product/sdk_phone16k_arm64.mk
@@ -25,36 +25,14 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 )
 BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 )  # +8M
 
-#
-# 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)
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
     development/sys-img/images_arm64-v8a_source.prop_template
 
-PRODUCT_PACKAGES += \
-    GoldfishSkinConfig
-
-#
-# All components inherited here go to vendor image
-#
 $(call inherit-product, device/generic/goldfish/board/emu64a16k/details.mk)
 $(call inherit-product, device/generic/goldfish/product/phone.mk)
 
-# Overrides
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_phone16k_arm64
 PRODUCT_DEVICE := emu64a16k
diff --git a/64bitonly/product/sdk_phone16k_x86_64.mk b/64bitonly/product/sdk_phone16k_x86_64.mk
index f5776042..b93a7375 100644
--- a/64bitonly/product/sdk_phone16k_x86_64.mk
+++ b/64bitonly/product/sdk_phone16k_x86_64.mk
@@ -22,37 +22,18 @@ BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_S
 # 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 excat this product name
 ifeq (sdk_phone64_x86_64,$(TARGET_PRODUCT))
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 endif
 
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
-
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
     development/sys-img/images_x86_64_source.prop_template
 
-PRODUCT_PACKAGES += \
-    GoldfishSkinConfig
-
-#
-# All components inherited here go to vendor image
-#
 $(call inherit-product, device/generic/goldfish/board/emu64x16k/details.mk)
 $(call inherit-product, device/generic/goldfish/product/phone.mk)
 
-# Overrides
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_phone16k_x86_64
 PRODUCT_DEVICE := emu64x16k
diff --git a/64bitonly/product/sdk_phone64_arm64.mk b/64bitonly/product/sdk_phone64_arm64.mk
index 5578b4e5..47546d83 100644
--- a/64bitonly/product/sdk_phone64_arm64.mk
+++ b/64bitonly/product/sdk_phone64_arm64.mk
@@ -25,36 +25,14 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 )
 BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 )  # +8M
 
-#
-# 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)
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
     development/sys-img/images_arm64-v8a_source.prop_template
 
-PRODUCT_PACKAGES += \
-    GoldfishSkinConfig
-
-#
-# All components inherited here go to vendor or vendor_boot image
-#
 $(call inherit-product, device/generic/goldfish/board/emu64a/details.mk)
 $(call inherit-product, device/generic/goldfish/product/phone.mk)
 
-# Overrides
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_phone64_arm64
 PRODUCT_DEVICE := emu64a
diff --git a/64bitonly/product/sdk_phone64_x86_64.mk b/64bitonly/product/sdk_phone64_x86_64.mk
index d77f6718..c95b2964 100644
--- a/64bitonly/product/sdk_phone64_x86_64.mk
+++ b/64bitonly/product/sdk_phone64_x86_64.mk
@@ -18,41 +18,19 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
 BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 )
 BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 )  # +8M
 
-#
-# 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 excat this product name
 ifeq (sdk_phone64_x86_64,$(TARGET_PRODUCT))
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 endif
 
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
-
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
     development/sys-img/images_x86_64_source.prop_template
 
-PRODUCT_PACKAGES += \
-    GoldfishSkinConfig
-
-#
-# All components inherited here go to vendor image
-#
 $(call inherit-product, device/generic/goldfish/board/emu64x/details.mk)
 $(call inherit-product, device/generic/goldfish/product/phone.mk)
 
-# Overrides
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_phone64_x86_64
 PRODUCT_DEVICE := emu64x
diff --git a/64bitonly/product/sdk_tablet_arm64.mk b/64bitonly/product/sdk_tablet_arm64.mk
index 4a06effc..9dbff3bc 100644
--- a/64bitonly/product/sdk_tablet_arm64.mk
+++ b/64bitonly/product/sdk_tablet_arm64.mk
@@ -29,69 +29,17 @@ PRODUCT_COPY_FILES+= \
 
 PRODUCT_COPY_FILES += device/generic/goldfish/tablet/data/etc/tablet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet.xml
 
-PRODUCT_CHARACTERISTICS := tablet,nosdcard
-
-
-#
-# 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 excat this product name
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-# Includes all AOSP product packages
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
-
-# Default AOSP sounds
-$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
-
-# Additional settings used in all AOSP builds
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.config.ringtone?=Ring_Synth_04.ogg \
-    ro.config.notification_sound?=pixiedust.ogg \
-
-
-# More AOSP packages
-PRODUCT_PACKAGES += \
-    initial-package-stopped-states-aosp.xml \
-    PhotoTable \
-    preinstalled-packages-platform-aosp-product.xml \
-    WallpaperPicker \
-
-
-# Window Extensions
-$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
-
-# Other packages for virtual device testing.
-PRODUCT_PACKAGES += \
-    LargeScreenSettingsProviderOverlay \
-    curl \
-
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += system/bin/curl
-
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
     device/generic/goldfish/64bitonly/product/tablet_images_arm64-v8a_source.prop_template
 
-#
-# All components inherited here go to vendor image
-#
 $(call inherit-product, device/generic/goldfish/board/emu64a/details.mk)
 $(call inherit-product, device/generic/goldfish/product/tablet.mk)
 
-# Overrides
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_tablet_arm64
 PRODUCT_DEVICE := emu64a
 PRODUCT_MODEL := Android SDK Tablet for arm64
-
diff --git a/64bitonly/product/sdk_tablet_x86_64.mk b/64bitonly/product/sdk_tablet_x86_64.mk
index 96e7e420..fa4b078a 100644
--- a/64bitonly/product/sdk_tablet_x86_64.mk
+++ b/64bitonly/product/sdk_tablet_x86_64.mk
@@ -29,69 +29,17 @@ PRODUCT_COPY_FILES+= \
 
 PRODUCT_COPY_FILES += device/generic/goldfish/tablet/data/etc/tablet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet.xml
 
-PRODUCT_CHARACTERISTICS := tablet,nosdcard
-
-
-#
-# 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 excat this product name
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-# Includes all AOSP product packages
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
-
-# Default AOSP sounds
-$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
-
-# Additional settings used in all AOSP builds
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.config.ringtone?=Ring_Synth_04.ogg \
-    ro.config.notification_sound?=pixiedust.ogg \
-
-
-# More AOSP packages
-PRODUCT_PACKAGES += \
-    initial-package-stopped-states-aosp.xml \
-    PhotoTable \
-    preinstalled-packages-platform-aosp-product.xml \
-    WallpaperPicker \
-
-
-# Window Extensions
-$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
-
-# Other packages for virtual device testing.
-PRODUCT_PACKAGES += \
-    LargeScreenSettingsProviderOverlay \
-    curl \
-
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += system/bin/curl
-
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
     device/generic/goldfish/64bitonly/product/tablet_images_x86_64_source.prop_template
 
-#
-# All components inherited here go to vendor image
-#
 $(call inherit-product, device/generic/goldfish/board/emu64x/details.mk)
 $(call inherit-product, device/generic/goldfish/product/tablet.mk)
 
-# Overrides
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_tablet_x86_64
 PRODUCT_DEVICE := emu64x
 PRODUCT_MODEL := Android SDK Tablet for x86_64
-
diff --git a/product/handheld.mk b/product/handheld.mk
new file mode 100644
index 00000000..c4e65c7a
--- /dev/null
+++ b/product/handheld.mk
@@ -0,0 +1,22 @@
+#
+# 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_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)
+
diff --git a/product/phone.mk b/product/phone.mk
index df2c3548..b9f07ce8 100644
--- a/product/phone.mk
+++ b/product/phone.mk
@@ -13,15 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# This file is included by other product makefiles to add all the
-# emulator-related modules to PRODUCT_PACKAGES.
-#
+$(call inherit-product, device/generic/goldfish/product/handheld.mk)
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
 
-DEVICE_PACKAGE_OVERLAYS := device/generic/goldfish/phone/overlay
+DEVICE_PACKAGE_OVERLAYS += device/generic/goldfish/phone/overlay
 PRODUCT_CHARACTERISTICS := emulator
 
 $(call inherit-product, device/generic/goldfish/product/generic.mk)
+
+PRODUCT_PACKAGES += GoldfishSkinConfig
diff --git a/product/tablet.mk b/product/tablet.mk
index 889cfa85..f0603269 100644
--- a/product/tablet.mk
+++ b/product/tablet.mk
@@ -13,14 +13,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# This file is included by other product makefiles to add all the
-# emulator-related modules to PRODUCT_PACKAGES.
-#
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
+$(call inherit-product, device/generic/goldfish/product/handheld.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/generic/goldfish/tablet/overlay
-PRODUCT_CHARACTERISTICS := emulator
+PRODUCT_CHARACTERISTICS := tablet,nosdcard
+
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.config.ringtone?=Ring_Synth_04.ogg \
+    ro.config.notification_sound?=pixiedust.ogg \
+
+PRODUCT_PACKAGES += \
+    initial-package-stopped-states-aosp.xml \
+    PhotoTable \
+    preinstalled-packages-platform-aosp-product.xml \
+    WallpaperPicker \
+    LargeScreenSettingsProviderOverlay \
+    curl \
+
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += system/bin/curl
 
 $(call inherit-product, device/generic/goldfish/product/generic.mk)