Merge "Move tablet specific stuff into tablet.mk" into main
diff --git a/64bitonly/product/sdk_tablet_arm64.mk b/64bitonly/product/sdk_tablet_arm64.mk
index 27ad14e..9dbff3b 100644
--- a/64bitonly/product/sdk_tablet_arm64.mk
+++ b/64bitonly/product/sdk_tablet_arm64.mk
@@ -29,65 +29,17 @@
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 \
-
-# 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 3b5f218..fa4b078 100644
--- a/64bitonly/product/sdk_tablet_x86_64.mk
+++ b/64bitonly/product/sdk_tablet_x86_64.mk
@@ -29,65 +29,17 @@
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 \
-
-# 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/tablet.mk b/product/tablet.mk
index 889cfa8..12492c1 100644
--- a/product/tablet.mk
+++ b/product/tablet.mk
@@ -13,14 +13,28 @@
# 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/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)
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)
