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

Commit 13feeb7b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Convert LOCAL_COMPATIBILITY_SUPPORT_FILES to data: attribute in androidmk"

parents acce05a5 0d11feb4

androidmk/cmd/androidmk/android.go

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ func init() { 
			"LOCAL_SYSTEM_SHARED_LIBRARIES":       "system_shared_libs",

			"LOCAL_ASFLAGS":                       "asflags",

			"LOCAL_CLANG_ASFLAGS":                 "clang_asflags",

			"LOCAL_COMPATIBILITY_SUPPORT_FILES":   "data",

			"LOCAL_CONLYFLAGS":                    "conlyflags",

			"LOCAL_CPPFLAGS":                      "cppflags",

			"LOCAL_REQUIRED_MODULES":              "required",

androidmk/cmd/androidmk/androidmk_test.go

+2 −0
Original line number Diff line number Diff line
@@ -809,6 +809,7 @@ include $(CLEAR_VARS) 
LOCAL_PACKAGE_NAME := FooTest

LOCAL_COMPATIBILITY_SUITE := cts

LOCAL_CTS_TEST_PACKAGE := foo.bar

LOCAL_COMPATIBILITY_SUPPORT_FILES := file1

include $(BUILD_CTS_PACKAGE)

`,

		expected: `
@@ -817,6 +818,7 @@ android_test { 
    defaults: ["cts_defaults"],

    test_suites: ["cts"],



    data: ["file1"],

}

`,

	},