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

Rename java module and property names for consistency

Browse Source 
prebuilt_java_library -> java_prebuilt_library
prebuilt_sdk -> android_prebuilt_sdk
java_resource_dirs -> resource_dirs
exclude_java_resource_dirs -> exclude_resource_dirs
java_libs -> libs
java_static_libs -> static_libs

Test: java_test.go
Change-Id: Icb0eefa6663844e20ad0a8729fb2c90ec916c3eb
This commit is contained in:
Colin Cross
2017-07-19 11:22:16 -07:00
parent be1da475d0
commit e8dc34a372
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java_test.go
View File

@@ -55,7 +55,7 @@ func testJava(t *testing.T, bp string) *android.TestContext {
ctx := android.NewTestContext()
ctx.RegisterModuleType("android_app", android.ModuleFactoryAdaptor(AndroidAppFactory))
ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(JavaLibraryFactory))
ctx.RegisterModuleType("prebuilt_java_library", android.ModuleFactoryAdaptor(JavaPrebuiltFactory))
ctx.RegisterModuleType("java_prebuilt_library", android.ModuleFactoryAdaptor(JavaPrebuiltFactory))
ctx.Register()
extraModules := []string{"core-libart", "frameworks", "sdk_v14"}
@@ -91,8 +91,8 @@ func TestSimple(t *testing.T) {
java_library {
name: "foo",
srcs: ["a.java"],
java_libs: ["bar"],
java_static_libs: ["baz"],
libs: ["bar"],
static_libs: ["baz"],
}
java_library {
@@ -201,16 +201,16 @@ func TestPrebuilts(t *testing.T) {
java_library {
name: "foo",
srcs: ["a.java"],
java_libs: ["bar"],
java_static_libs: ["baz"],
libs: ["bar"],
static_libs: ["baz"],
}
prebuilt_java_library {
java_prebuilt_library {
name: "bar",
srcs: ["a.jar"],
}
prebuilt_java_library {
java_prebuilt_library {
name: "baz",
srcs: ["b.jar"],
}