diff options
| author | Colin Cross <ccross@android.com> | 2017-07-19 11:22:16 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-07-19 23:19:58 +0000 |
| commit | e8dc34a3721617cb43a73b45627ff0a99d8eb436 (patch) | |
| tree | a41d5883591e5fc4aa50cf79d39cac7bd0619e0c /java/java_test.go | |
| parent | be1da475d0b1a398b8d05f93b9b76cab2b45f3a3 (diff) | |
Rename java module and property names for consistency
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
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/java_test.go b/java/java_test.go index 91b1506a1..bd6451cb8 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -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"], } |