diff --git a/java/java.go b/java/java.go index 0757127aa..37fc5f75e 100644 --- a/java/java.go +++ b/java/java.go @@ -44,7 +44,7 @@ func init() { PropertyName: "java_libs", }, func(j *Library) android.Path { - implementationJars := j.ImplementationJars() + implementationJars := j.ImplementationAndResourcesJars() if len(implementationJars) != 1 { panic(fmt.Errorf("there must be only one implementation jar from %q", j.Name())) } diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 77a4e94b3..7496b207d 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -23,6 +23,7 @@ func testSdkWithJava(t *testing.T, bp string) *testSdkResult { fs := map[string][]byte{ "Test.java": nil, + "resource.test": nil, "aidl/foo/bar/Test.aidl": nil, // For java_sdk_library @@ -348,6 +349,7 @@ func TestSnapshotWithJavaImplLibrary(t *testing.T) { java_library { name: "myjavalib", srcs: ["Test.java"], + java_resources: ["resource.txt"], aidl: { export_include_dirs: ["aidl"], }, @@ -381,7 +383,7 @@ module_exports_snapshot { `), checkAllCopyRules(` -.intermediates/myjavalib/android_common/javac/myjavalib.jar -> java/myjavalib.jar +.intermediates/myjavalib/android_common/withres/myjavalib.jar -> java/myjavalib.jar aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl `), )