Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a114c53 authored by Cole Faust's avatar Cole Faust
Browse files

Minify the sdk targets 

Previously, the "sdk" target was a minimal lunch target that only
included enough to build the sdk. But the "sdk_<arch>" targets
redirected to the "sdk_phone_<arch>" targets, which are much bigger
and capable of building a whole emulator.

Building the sdk on products that can build a whole device complicates
the rest of the build system (for example, it starts enforcing dexpropt
works)

Bug: 290798660
Test: Presubmits
Change-Id: I0ec5110318c43a7feee0b88edbed1cab0b590a47
parent 9ebfc231

target/product/sdk.mk

+2 −5
Original line number Diff line number Diff line
@@ -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

target/product/sdk_arm64.mk

+5 −2
Original line number Diff line number Diff line
@@ -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

target/product/sdk_x86.mk

+6 −3
Original line number Diff line number Diff line
@@ -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

target/product/sdk_x86_64.mk

+8 −2
Original line number Diff line number Diff line
@@ -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