Merge "Minify the sdk targets" into main am: 7137d5d46f
am: fbabd71b48
am: 18ae5a5b07
am: a171da26af
am: c5dcae62c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2656958 Change-Id: I3d786a692dee0306919d01f35c30aec3593c6f2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
6d04cd8571
4 changed files with 21 additions and 12 deletions
|
@ -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_x86.mk)
|
||||
|
||||
PRODUCT_NAME := sdk
|
||||
PRODUCT_BRAND := Android
|
||||
PRODUCT_DEVICE := mainline_x86
|
||||
|
|
|
@ -14,8 +14,11 @@
|
|||
# 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_BRAND := Android
|
||||
PRODUCT_DEVICE := mainline_arm64
|
||||
|
|
|
@ -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_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
|
||||
|
|
|
@ -14,8 +14,14 @@
|
|||
# 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_BRAND := Android
|
||||
PRODUCT_DEVICE := mainline_x86_64
|
||||
|
|
Loading…
Reference in a new issue