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

Commit 74151f2c authored by Liz Kammer's avatar Liz Kammer
Browse files

Add androidmk support for runtime_resource_overlay 

Test: androidmk_test.go
Bug: 148673525
Change-Id: I25c277c52b91e9308e15d92364b5504a8f556c9f
parent cf23ab4c

androidmk/androidmk/android.go

+2 −0
Original line number Diff line number Diff line
@@ -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

androidmk/androidmk/androidmk_test.go

+23 −0
Original line number Diff line number Diff line
@@ -1357,6 +1357,29 @@ cc_binary { 
    // ANDROIDMK TRANSLATION ERROR: value should evaluate to boolean literal

    // LOCAL_32_BIT_ONLY := $(FLAG)



}

`,

	},

	{

		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",



}

`,

	},