commit e859d9af9caad1515db90c8f789a24e47acd2fa9
author Tor Norbye <tnorbye@google.com> Sat Jan 12 20:07:42 2019 -0800
committer android-build-merger <android-build-merger@google.com> Sat Jan 12 20:07:42 2019 -0800
tree 94844d0582126452bfff1b136a1a3072f54246ce
parent 0d80a9505c8496468e60b896d07405f0aa62ab0d
parent 517e7d161c6a46301d9af3daf1c0c3f2968e0a2c

Switch car-lib over from doclava to metalava
am: 517e7d161c

Change-Id: Id955715010dbd55bbf5b98d92652cb3e45aa1004

car-lib/Android.bp

diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 287949e..2a54676 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -71,7 +71,7 @@
     installable: true,
 }
 
-doc_defaults {
+stubs_defaults {
     name: "android.car-docs-default",
     srcs: [
         "src/**/*.java",
@@ -80,7 +80,6 @@
     libs: [
         "android.car",
     ],
-    custom_template: "droiddoc-templates-sdk",
     product_variables: {
         pdk: {
             enabled: false,
@@ -110,13 +109,13 @@
     ],
 }
 
-droiddoc {
+droidstubs {
     name: "android.car-stubs-docs",
     defaults: ["android.car-docs-default"],
     api_tag_name: "ANDROID_CAR",
     api_filename: "api.txt",
     removed_api_filename: "removed.txt",
-    args: "-hide 113 -hide 110 -nodocs -stubpackages android.car* ",
+    args: "--hide DeprecationMismatch --hide UnavailableSymbol --UnhiddenSystemApi --hide HiddenTypedefConstant --hide ReferencesHidden --no-docs --stub-packages android.car* ",
     installable: false,
     check_api: {
         last_released: {
@@ -136,14 +135,14 @@
     },
 }
 
-droiddoc {
+droidstubs {
     name: "android.car-system-stubs-docs",
     defaults: ["android.car-docs-default"],
     api_tag_name: "ANDROID_CAR_SYSTEM",
     api_filename: "api.txt",
     removed_api_filename: "removed.txt",
-    args: "-hide 113 -hide 110 -nodocs -stubpackages android.car* " +
-        "-showAnnotation android.annotation.SystemApi ",
+    args: "--hide DeprecationMismatch --hide UnavailableSymbol --hide UnhiddenSystemApi --hide HiddenTypedefConstant --hide ReferencesHidden --no-docs --stub-packages android.car* " +
+        "--show-annotation android.annotation.SystemApi ",
     installable: false,
     check_api: {
         last_released: {
@@ -163,7 +162,7 @@
     },
 }
 
-droiddoc {
+droidstubs {
     name: "android.car-stub-docs",
     srcs: [
         "src/**/*.java",
@@ -173,8 +172,7 @@
     ],
     api_tag_name: "ANDROID_CAR_STUB",
     api_filename: "api.txt",
-    custom_template: "droiddoc-templates-sdk",
-    args: "-nodocs -stubpackages android.car* ",
+    args: "--hide DeprecationMismatch --hide UnavailableSymbol --UnhiddenSystemApi --hide HiddenTypedefConstant --hide ReferencesHidden --no-docs --stub-packages android.car* ",
     installable: false,
     product_variables: {
         pdk: {

car-support-lib/Android.bp

diff --git a/car-support-lib/Android.bp b/car-support-lib/Android.bp
index 2d4269e..18e7b03 100644
--- a/car-support-lib/Android.bp
+++ b/car-support-lib/Android.bp
@@ -56,13 +56,13 @@
     },
 }
 
-droiddoc {
+droidstubs {
     name: "android.support.car-stubs-docs",
     defaults: ["android.support.car-docs-default"],
     api_tag_name: "ANDROID_SUPPORT_CAR",
     api_filename: "api.txt",
     removed_api_filename: "removed.txt",
-    args: "-hide 113 -hide 110 -nodocs -stubpackages android.support.car* ",
+    args: "--hide DeprecationMismatch -hide UnavailableSymbol --hide UnhiddenSystemApi --hide HiddenTypedefConstant --hide ReferencesHidden --no-docs --stub-packages android.support.car* ",
     installable: false,
     check_api: {
         current: {