Merge "Switch to metalava for dalvik/ docs"
diff --git a/dx/src/Android.bp b/dx/src/Android.bp
index f3409eb..9459e27 100644
--- a/dx/src/Android.bp
+++ b/dx/src/Android.bp
@@ -12,12 +12,28 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-droiddoc_host {
- name: "dx-docs",
+droidstubs_host {
+ name: "dx-doc-stubs",
srcs: [
"com/**/*.java",
],
- args: "-hidden",
+ args: "--hidden",
+ create_doc_stubs: true,
+ product_variables: {
+ pdk: {
+ enabled: false,
+ },
+ unbundled_build: {
+ enabled: false,
+ },
+ },
+}
+
+droiddoc_host {
+ name: "dx-docs",
+ srcs: [
+ ":dx-doc-stubs",
+ ],
custom_template: "droiddoc-templates-sdk",
create_stubs: false,
product_variables: {
diff --git a/tools/dexdeps/src/Android.bp b/tools/dexdeps/src/Android.bp
index de12901..ad76e4d 100644
--- a/tools/dexdeps/src/Android.bp
+++ b/tools/dexdeps/src/Android.bp
@@ -12,10 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+droidstubs {
+ name: "dexdeps-doc-stubs",
+ srcs: [
+ "com/**/*.java",
+ ],
+ create_doc_stubs: true,
+}
+
droiddoc {
name: "dexdeps-docs",
srcs: [
- "com/**/*.java",
+ ":dexdeps-doc-stubs",
],
custom_template: "droiddoc-templates-sdk",
create_stubs: false,
