Merge "Revert "Minify the sdk targets"" into main am: 21c04ea58c am: cda6860015

Original change: https://android-review.googlesource.com/c/platform/build/+/2658380

Change-Id: Icadec50aaee8f81270422bb5d2452ef2ee9f283c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sebastian Pickl
2023-07-17 11:36:16 +00:00
committed by Automerger Merge Worker
4 changed files with 12 additions and 21 deletions

View File

@@ -14,8 +14,11 @@
# limitations under the License.
#
# Don't modify this file - It's just an alias!
# This is a simple product that uses configures the minimum amount
# needed to build the SDK (without the emulator).
$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_x86.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
PRODUCT_NAME := sdk
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86

View File

@@ -14,11 +14,8 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
# Don't modify this file - It's just an alias!
TARGET_SUPPORTS_32_BIT_APPS := true
TARGET_SUPPORTS_64_BIT_APPS := true
$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_arm64.mk)
PRODUCT_NAME := sdk_arm64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_arm64

View File

@@ -14,11 +14,8 @@
# limitations under the License.
#
# This is a simple product that uses configures the minimum amount
# needed to build the SDK (without the emulator).
# Don't modify this file - It's just an alias!
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_x86.mk)
PRODUCT_NAME := sdk_x86_64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86
PRODUCT_NAME := sdk_x86

View File

@@ -14,14 +14,8 @@
# limitations under the License.
#
# This is a simple product that uses configures the minimum amount
# needed to build the SDK (without the emulator).
# Don't modify this file - It's just an alias!
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
TARGET_SUPPORTS_32_BIT_APPS := true
TARGET_SUPPORTS_64_BIT_APPS := true
$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_x86_64.mk)
PRODUCT_NAME := sdk_x86_64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86_64