Merge "Minify the sdk targets" into main am: 7137d5d46f am: fbabd71b48 am: 18ae5a5b07 am: a171da26af

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

Change-Id: I6fda227d28bf1bca6462a6e48e68faf312551728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust 2023-07-15 00:33:48 +00:00 committed by Automerger Merge Worker
commit c5dcae62c3
4 changed files with 21 additions and 12 deletions

View file

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

View file

@ -14,8 +14,11 @@
# limitations under the License. # limitations under the License.
# #
# 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_arm64.mk) TARGET_SUPPORTS_32_BIT_APPS := true
TARGET_SUPPORTS_64_BIT_APPS := true
PRODUCT_NAME := sdk_arm64 PRODUCT_NAME := sdk_arm64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_arm64

View file

@ -14,8 +14,11 @@
# limitations under the License. # 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_phone_x86.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
PRODUCT_NAME := sdk_x86 PRODUCT_NAME := sdk_x86_64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86

View file

@ -14,8 +14,14 @@
# limitations under the License. # 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_phone_x86_64.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
TARGET_SUPPORTS_32_BIT_APPS := true
TARGET_SUPPORTS_64_BIT_APPS := true
PRODUCT_NAME := sdk_x86_64 PRODUCT_NAME := sdk_x86_64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86_64