Move stub providers to droidstubs.go
They fit better there than in droiddoc.go.
Test: m nothing
Change-Id: I44588f1df2094f14881f920246bd19ffc6e1615c
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 01c0f16..56e6247 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -193,23 +193,6 @@
return false
}
-// Used by xsd_config
-type ApiFilePath interface {
- ApiFilePath() android.Path
-}
-
-type ApiStubsSrcProvider interface {
- StubsSrcJar() android.Path
-}
-
-// Provider of information about API stubs, used by java_sdk_library.
-type ApiStubsProvider interface {
- ApiFilePath
- RemovedApiFilePath() android.Path
-
- ApiStubsSrcProvider
-}
-
//
// Javadoc
//
diff --git a/java/droidstubs.go b/java/droidstubs.go
index 2676f3d..3011250 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -146,6 +146,23 @@
Write_sdk_values *bool
}
+// Used by xsd_config
+type ApiFilePath interface {
+ ApiFilePath() android.Path
+}
+
+type ApiStubsSrcProvider interface {
+ StubsSrcJar() android.Path
+}
+
+// Provider of information about API stubs, used by java_sdk_library.
+type ApiStubsProvider interface {
+ ApiFilePath
+ RemovedApiFilePath() android.Path
+
+ ApiStubsSrcProvider
+}
+
// droidstubs passes sources files through Metalava to generate stub .java files that only contain the API to be
// documented, filtering out hidden classes and methods. The resulting .java files are intended to be passed to
// a droiddoc module to generate documentation.