diff options
| author | Liz Kammer <eakammer@google.com> | 2020-05-07 11:22:53 -0700 |
|---|---|---|
| committer | Liz Kammer <eakammer@google.com> | 2020-05-07 14:40:57 -0700 |
| commit | 74151f2c8cce360c3dd7dd06915a13010ecdc878 (patch) | |
| tree | 0f9259028aca992776e8dbcf3ab96a2217f0f626 /androidmk | |
| parent | cf23ab4cd80fd4448473126787fe1fce84c68a3b (diff) | |
Add androidmk support for runtime_resource_overlay
Test: androidmk_test.go
Bug: 148673525
Change-Id: I25c277c52b91e9308e15d92364b5504a8f556c9f
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/androidmk/android.go | 2 | ||||
| -rw-r--r-- | androidmk/androidmk/androidmk_test.go | 23 |
2 files changed, 25 insertions, 0 deletions
diff --git a/androidmk/androidmk/android.go b/androidmk/androidmk/android.go index f863f8d5e..5a62324c1 100644 --- a/androidmk/androidmk/android.go +++ b/androidmk/androidmk/android.go @@ -111,6 +111,7 @@ func init() { "LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING": "dex_preopt.profile", "LOCAL_TEST_CONFIG": "test_config", + "LOCAL_RRO_THEME": "theme", }) addStandardProperties(bpparser.ListType, map[string]string{ @@ -925,6 +926,7 @@ var moduleTypes = map[string]string{ "BUILD_HOST_JAVA_LIBRARY": "java_library_host", "BUILD_HOST_DALVIK_JAVA_LIBRARY": "java_library_host_dalvik", "BUILD_PACKAGE": "android_app", + "BUILD_RRO_PACKAGE": "runtime_resource_overlay", "BUILD_CTS_EXECUTABLE": "cc_binary", // will be further massaged by bpfix depending on the output path "BUILD_CTS_SUPPORT_PACKAGE": "cts_support_package", // will be rewritten to android_test by bpfix diff --git a/androidmk/androidmk/androidmk_test.go b/androidmk/androidmk/androidmk_test.go index 3e1d48632..d9bde9407 100644 --- a/androidmk/androidmk/androidmk_test.go +++ b/androidmk/androidmk/androidmk_test.go @@ -1360,6 +1360,29 @@ cc_binary { } `, }, + { + desc: "runtime_resource_overlay", + in: ` +include $(CLEAR_VARS) +LOCAL_PACKAGE_NAME := foo +LOCAL_PRODUCT_MODULE := true +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +LOCAL_SDK_VERSION := current +LOCAL_RRO_THEME := FooTheme + +include $(BUILD_RRO_PACKAGE) +`, + expected: ` +runtime_resource_overlay { + name: "foo", + product_specific: true, + resource_dirs: ["res"], + sdk_version: "current", + theme: "FooTheme", + +} +`, + }, } func TestEndToEnd(t *testing.T) { |