commit 186c771cb4d0ba556ab0051c6d44e502926f614e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 28 01:41:25 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 28 01:41:25 2018 +0000
tree 4938e52eac9be27c943f9c8c6e8d796b7095d964
parent dc208bb2bb40c546d9a662dd427f916a3562dc83
parent 36ff7dcbf432367801fa099426c019a3d3a5604e

Merge "In java.go, add implement check for both Dependency and IDE relevant interfaces"

java/java.go

diff --git a/java/java.go b/java/java.go
index 094fbff..71967a8 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1420,9 +1420,12 @@
 	return instrumentedJar
 }
 
-var _ Dependency = (*Library)(nil)
+var _ Dependency = (*Module)(nil)
 
 func (j *Module) HeaderJars() android.Paths {
+	if j.headerJarFile == nil {
+		return nil
+	}
 	return android.Paths{j.headerJarFile}
 }
 
@@ -1441,14 +1444,19 @@
 }
 
 func (j *Module) ImplementationAndResourcesJars() android.Paths {
+	if j.implementationAndResourcesJar == nil {
+		return nil
+	}
 	return android.Paths{j.implementationAndResourcesJar}
 }
 
 func (j *Module) AidlIncludeDirs() android.Paths {
+	// exportAidlIncludeDirs is type android.Paths already
 	return j.exportAidlIncludeDirs
 }
 
 func (j *Module) ExportedSdkLibs() []string {
+	// exportedSdkLibs is type []string
 	return j.exportedSdkLibs
 }
 
@@ -1808,6 +1816,9 @@
 var _ Dependency = (*Import)(nil)
 
 func (j *Import) HeaderJars() android.Paths {
+	if j.combinedClasspathFile == nil {
+		return nil
+	}
 	return android.Paths{j.combinedClasspathFile}
 }
 
@@ -1823,6 +1834,9 @@
 }
 
 func (j *Import) ImplementationAndResourcesJars() android.Paths {
+	if j.combinedClasspathFile == nil {
+		return nil
+	}
 	return android.Paths{j.combinedClasspathFile}
 }
 
@@ -1834,6 +1848,10 @@
 	return j.exportedSdkLibs
 }
 
+// Add compile time check for interface implementation
+var _ android.IDEInfo = (*Import)(nil)
+var _ android.IDECustomizedModuleName = (*Import)(nil)
+
 // Collect information for opening IDE project files in java/jdeps.go.
 const (
 	removedPrefix = "prebuilt_"