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

Commit 86701df2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main am: 130079c8 

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



Change-Id: I7304313fe0f16ded6825dec72f42ac86b0e607e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95d97ff0 130079c8

androidmk/androidmk/android.go

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ func init() { 
			"LOCAL_ARM_MODE_HACK":           "instruction_set",

			"LOCAL_SDK_VERSION":             "sdk_version",

			"LOCAL_MIN_SDK_VERSION":         "min_sdk_version",

			"LOCAL_TARGET_SDK_VERSION":      "target_sdk_version",

			"LOCAL_NDK_STL_VARIANT":         "stl",

			"LOCAL_JAR_MANIFEST":            "manifest",

			"LOCAL_CERTIFICATE":             "certificate",

androidmk/androidmk/androidmk_test.go

+2 −0
Original line number Diff line number Diff line
@@ -1450,6 +1450,7 @@ LOCAL_PACKAGE_NAME := foo 
LOCAL_PRODUCT_MODULE := true

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_SDK_VERSION := current

LOCAL_TARGET_SDK_VERSION := target_version

LOCAL_RRO_THEME := FooTheme



include $(BUILD_RRO_PACKAGE)
@@ -1460,6 +1461,7 @@ runtime_resource_overlay { 
	product_specific: true,



	sdk_version: "current",

	target_sdk_version: "target_version",

	theme: "FooTheme",



}