Merge changes I6f869824,Ie4d28bf5 into main

* changes:
  Move phone specific stuff into phone.mk
  Remove window_extensions.mk from tablet...mk files

7 files changed, 7 insertions, 99 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..27ad14e4 100644
--- a/64bitonly/product/sdk_tablet_arm64.mk
+++ b/64bitonly/product/sdk_tablet_arm64.mk
@@ -69,10 +69,6 @@ PRODUCT_PACKAGES += \
     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 \
diff --git a/64bitonly/product/sdk_tablet_x86_64.mk b/64bitonly/product/sdk_tablet_x86_64.mk
index 96e7e420..3b5f218e 100644
--- a/64bitonly/product/sdk_tablet_x86_64.mk
+++ b/64bitonly/product/sdk_tablet_x86_64.mk
@@ -69,10 +69,6 @@ PRODUCT_PACKAGES += \
     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 \
diff --git a/product/phone.mk b/product/phone.mk
index df2c3548..383e713c 100644
--- a/product/phone.mk
+++ b/product/phone.mk
@@ -13,15 +13,16 @@
 # 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/generic_system.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.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