Merge "Minify the sdk targets" into main

This commit is contained in:
Treehugger Robot 2023-08-02 23:31:35 +00:00 committed by Gerrit Code Review
commit 392398cd40
5 changed files with 24 additions and 13 deletions

View file

@ -73,12 +73,14 @@ endif
# We skip it for unbundled app builds where we cannot build veridex. # We skip it for unbundled app builds where we cannot build veridex.
module_run_appcompat := module_run_appcompat :=
ifeq (true,$(non_system_module)) 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) ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
module_run_appcompat := true module_run_appcompat := true
endif endif
endif endif
endif endif
endif
ifeq ($(module_run_appcompat),true) ifeq ($(module_run_appcompat),true)
$(LOCAL_BUILT_MODULE): $(appcompat-files) $(LOCAL_BUILT_MODULE): $(appcompat-files)

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