StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iefe8dfbf1f372021abe10b26e9b5bdd448e8b046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-28 09:53:13 +00:00
committed by Automerger Merge Worker
parent caf25476a0 130079c893
commit f6a132e0a5
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
androidmk/androidmk/android.go
View File

@@ -106,6 +106,7 @@ func init() {
"LOCAL_ARM_MODE_HACK": "instruction_set", "LOCAL_ARM_MODE_HACK": "instruction_set",
"LOCAL_SDK_VERSION": "sdk_version", "LOCAL_SDK_VERSION": "sdk_version",
"LOCAL_MIN_SDK_VERSION": "min_sdk_version", "LOCAL_MIN_SDK_VERSION": "min_sdk_version",
"LOCAL_TARGET_SDK_VERSION": "target_sdk_version",
"LOCAL_NDK_STL_VARIANT": "stl", "LOCAL_NDK_STL_VARIANT": "stl",
"LOCAL_JAR_MANIFEST": "manifest", "LOCAL_JAR_MANIFEST": "manifest",
"LOCAL_CERTIFICATE": "certificate", "LOCAL_CERTIFICATE": "certificate",

2
androidmk/androidmk/androidmk_test.go
View File

@@ -1450,6 +1450,7 @@ LOCAL_PACKAGE_NAME := foo
LOCAL_PRODUCT_MODULE := true LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_TARGET_SDK_VERSION := target_version
LOCAL_RRO_THEME := FooTheme LOCAL_RRO_THEME := FooTheme
include $(BUILD_RRO_PACKAGE) include $(BUILD_RRO_PACKAGE)
@@ -1460,6 +1461,7 @@ runtime_resource_overlay {
product_specific: true, product_specific: true,
sdk_version: "current", sdk_version: "current",
target_sdk_version: "target_version",
theme: "FooTheme", theme: "FooTheme",
} }