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

Merge "Skip obsolete JACK flags"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-19 17:40:34 +00:00
committed by Gerrit Code Review
parent 1f74135f97 e02e41a9ea
commit 734879bc6a
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
androidmk/cmd/androidmk/android.go
View File

@@ -76,6 +76,8 @@ var rewriteProperties = map[string](func(variableAssignmentContext) error){
"LOCAL_ANNOTATION_PROCESSOR_CLASSES": skip, // Soong gets the processor classes from the plugin "LOCAL_ANNOTATION_PROCESSOR_CLASSES": skip, // Soong gets the processor classes from the plugin
"LOCAL_CTS_TEST_PACKAGE": skip, // Obsolete "LOCAL_CTS_TEST_PACKAGE": skip, // Obsolete
"LOCAL_JACK_ENABLED": skip, // Obselete
"LOCAL_JACK_FLAGS": skip, // Obselete
} }
// adds a group of properties all having the same type // adds a group of properties all having the same type

16
androidmk/cmd/androidmk/androidmk_test.go
View File

@@ -1091,6 +1091,22 @@ android_app {
static_libs: FOO, static_libs: FOO,
static_libs: ["javalib"], static_libs: ["javalib"],
java_resource_dirs: FOO, java_resource_dirs: FOO,
}
`,
},
{
desc: "blah",
in: `
include $(CLEAR_VARS)
LOCAL_MODULE := foo
LOCAL_JACK_ENABLED := incremental
LOCAL_JACK_FLAGS := --multi-dex native
include $(BUILD_PACKAGE)
`,
expected: `
android_app {
name: "foo",
} }
`, `,
}, },