Include resources in sdk snapshot of java library impl

Bug: 159607838
Test: m nothing
Change-Id: Ie7ddbffc3957f832abfadb27292c436e8e5dcbf3
This commit is contained in:
Paul Duffin
2020-06-24 12:10:42 +01:00
parent 63a89ef82f
commit 4e77284ab4
2 changed files with 4 additions and 2 deletions

View File

@@ -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()))
}

View File

@@ -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
`),
)