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

Commit cda68600 authored Jul 17, 2023 by Sebastian Pickl Committed by Automerger Merge Worker Jul 17, 2023

Merge "Revert "Minify the sdk targets"" into main am: 21c04ea5

Original change: https://android-review.googlesource.com/c/platform/build/+/2658380

Change-Id: I6ad3419a4e9e43ba8774de4a436842ca475e0dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ddd01722 21c04ea5

target/product/sdk.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!
		# 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_x86.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)

		PRODUCT_NAME := sdk
		PRODUCT_BRAND := Android
		PRODUCT_DEVICE := mainline_x86

target/product/sdk_arm64.mk

+2 −5

Original line number	Diff line number	Diff line
		@@ -14,11 +14,8 @@
		# limitations under the License.
		#

		$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
		# Don't modify this file - It's just an alias!

		TARGET_SUPPORTS_32_BIT_APPS := true
		TARGET_SUPPORTS_64_BIT_APPS := true
		$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_arm64.mk)

		PRODUCT_NAME := sdk_arm64
		PRODUCT_BRAND := Android
		PRODUCT_DEVICE := mainline_arm64

target/product/sdk_x86.mk

+3 −6

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_phone_x86.mk)

		PRODUCT_NAME := sdk_x86_64
		PRODUCT_BRAND := Android
		PRODUCT_DEVICE := mainline_x86
		PRODUCT_NAME := sdk_x86

target/product/sdk_x86_64.mk

+2 −8

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

		TARGET_SUPPORTS_32_BIT_APPS := true
		TARGET_SUPPORTS_64_BIT_APPS := true
		$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_x86_64.mk)

		PRODUCT_NAME := sdk_x86_64
		PRODUCT_BRAND := Android
		PRODUCT_DEVICE := mainline_x86_64