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

Commit 392398cd authored Aug 02, 2023 by Treehugger Robot Committed by Gerrit Code Review Aug 02, 2023

Merge "Minify the sdk targets" into main

parents 8e1baff3 92d921ce

core/soong_app_prebuilt.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -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)

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