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

Merge "Handle LOCAL_JAVA_RESOURCE_FILES variable"

Browse Source
This commit is contained in:
Treehugger Robot
2019-04-06 03:02:04 +00:00
committed by Gerrit Code Review
parent 45a5a287af 9223a6262a
commit a0dd60879b
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,7 @@ func init() {
"LOCAL_RENDERSCRIPT_FLAGS": "renderscript.flags", "LOCAL_RENDERSCRIPT_FLAGS": "renderscript.flags",
"LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs", "LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs",
"LOCAL_JAVA_RESOURCE_FILES": "java_resources",
"LOCAL_JAVACFLAGS": "javacflags", "LOCAL_JAVACFLAGS": "javacflags",
"LOCAL_ERROR_PRONE_FLAGS": "errorprone.javacflags", "LOCAL_ERROR_PRONE_FLAGS": "errorprone.javacflags",
"LOCAL_DX_FLAGS": "dxflags", "LOCAL_DX_FLAGS": "dxflags",

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

@@ -577,6 +577,10 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src gen) LOCAL_SRC_FILES := $(call all-java-files-under, src gen)
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_JAVA_RESOURCE_FILES := foo bar
include $(BUILD_STATIC_JAVA_LIBRARY)
`, `,
expected: ` expected: `
java_library { java_library {
@@ -604,6 +608,13 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
"gen/**/*.java", "gen/**/*.java",
], ],
} }
java_library {
java_resources: [
"foo",
"bar",
],
}
`, `,
}, },
{ {