commit 4be65809d7bbefbc4ab59b01eeed475794e8856c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 04 07:20:55 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 04 07:20:55 2019 +0000
tree fabfc1c5ce3b346944748630346334953eb88d37
parent cc5b384ea501cc6cc899452f8758e33ca08f13a9
parent 38449af64fec68617762a693ea7d80f126bb4146

Merge "Ignore missing prebuilt_apis of java_sdk_library"

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index ddc47ea..117bbc2 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1911,6 +1911,10 @@
 	return variation
 }
 
+func (c *Module) IDEInfo(dpInfo *android.IdeInfo) {
+	dpInfo.Srcs = append(dpInfo.Srcs, c.Srcs().Strings()...)
+}
+
 //
 // Defaults
 //

java/java.go

diff --git a/java/java.go b/java/java.go
index ecc3608..d230810 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1133,7 +1133,6 @@
 	}
 
 	jars = append(jars, deps.staticJars...)
-	jars = append(jars, deps.staticResourceJars...)
 
 	manifest := j.overrideManifest
 	if !manifest.Valid() && j.properties.Manifest != nil {