tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minify the sdk targets

Browse source 
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: m sdk dist sdk_repo device-tests platform_tests on sdk_x86_64-userdebug
Change-Id: I76f38cf19172a5f5fae423175d5e03670137a0df
This commit is contained in:
Cole Faust 2023-07-13 16:40:30 -07:00
parent 8cad379e98
commit 92d921ce24
5 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/soong_app_prebuilt.mk
View file

@ -73,12 +73,14 @@ endif
# We skip it for unbundled app builds where we cannot build veridex.
module_run_appcompat :=
ifeq (true,$(non_system_module))
ifeq (,$(TARGET_BUILD_APPS)) # ! unbundled app build
ifeq (,$(TARGET_BUILD_APPS)) # not unbundled app build
ifeq (,$(filter sdk,$(MAKECMDGOALS))) # not sdk build (which is another form of unbundled build)
ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
module_run_appcompat := true
endif
endif
endif
endif
ifeq ($(module_run_appcompat),true)
$(LOCAL_BUILT_MODULE): $(appcompat-files)

7
target/product/sdk.mk
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_x86.mk)
PRODUCT_NAME := sdk
PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86

7
target/product/sdk_arm64.mk
View file

@ -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

9
target/product/sdk_x86.mk
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_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

10
target/product/sdk_x86_64.mk
View file

@ -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