diff options
-rw-r--r-- | 64bitonly/product/sdk_phone64_x86_64.mk | 2 | ||||
-rw-r--r-- | 64bitonly/product/sdk_slim_arm64.mk | 47 | ||||
-rw-r--r-- | 64bitonly/product/sdk_slim_x86_64.mk | 46 | ||||
-rw-r--r-- | product/base_handheld.mk | 21 | ||||
-rw-r--r-- | product/handheld.mk | 7 | ||||
-rw-r--r-- | product/slim_handheld.mk | 34 |
6 files changed, 77 insertions, 80 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/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/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) + |