summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye2019-01-12 22:11:48 -0600
committerandroid-build-merger2019-01-12 22:11:48 -0600
commitfc28074fab7a092d5c05a9d60ef32126518e15c8 (patch)
tree94844d0582126452bfff1b136a1a3072f54246ce
parentc6e0ea320307879dffdc76da7e8b05040fc70f01 (diff)
parente859d9af9caad1515db90c8f789a24e47acd2fa9 (diff)
downloadplatform-packages-services-car-fc28074fab7a092d5c05a9d60ef32126518e15c8.tar.gz
platform-packages-services-car-fc28074fab7a092d5c05a9d60ef32126518e15c8.tar.xz
platform-packages-services-car-fc28074fab7a092d5c05a9d60ef32126518e15c8.zip
Switch car-lib over from doclava to metalava am: 517e7d161c
am: e859d9af9c Change-Id: I5951401462ca0b09fdc14bb72f0d5d04e3f4ad51
-rw-r--r--car-lib/Android.bp18
-rw-r--r--car-support-lib/Android.bp4
2 files changed, 10 insertions, 12 deletions
diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 287949e0..2a546761 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -71,7 +71,7 @@ java_library {
71 installable: true, 71 installable: true,
72} 72}
73 73
74doc_defaults { 74stubs_defaults {
75 name: "android.car-docs-default", 75 name: "android.car-docs-default",
76 srcs: [ 76 srcs: [
77 "src/**/*.java", 77 "src/**/*.java",
@@ -80,7 +80,6 @@ doc_defaults {
80 libs: [ 80 libs: [
81 "android.car", 81 "android.car",
82 ], 82 ],
83 custom_template: "droiddoc-templates-sdk",
84 product_variables: { 83 product_variables: {
85 pdk: { 84 pdk: {
86 enabled: false, 85 enabled: false,
@@ -110,13 +109,13 @@ genrule {
110 ], 109 ],
111} 110}
112 111
113droiddoc { 112droidstubs {
114 name: "android.car-stubs-docs", 113 name: "android.car-stubs-docs",
115 defaults: ["android.car-docs-default"], 114 defaults: ["android.car-docs-default"],
116 api_tag_name: "ANDROID_CAR", 115 api_tag_name: "ANDROID_CAR",
117 api_filename: "api.txt", 116 api_filename: "api.txt",
118 removed_api_filename: "removed.txt", 117 removed_api_filename: "removed.txt",
119 args: "-hide 113 -hide 110 -nodocs -stubpackages android.car* ", 118 args: "--hide DeprecationMismatch --hide UnavailableSymbol --UnhiddenSystemApi --hide HiddenTypedefConstant --hide ReferencesHidden --no-docs --stub-packages android.car* ",
120 installable: false, 119 installable: false,
121 check_api: { 120 check_api: {
122 last_released: { 121 last_released: {
@@ -136,14 +135,14 @@ droiddoc {
136 }, 135 },
137} 136}
138 137
139droiddoc { 138droidstubs {
140 name: "android.car-system-stubs-docs", 139 name: "android.car-system-stubs-docs",
141 defaults: ["android.car-docs-default"], 140 defaults: ["android.car-docs-default"],
142 api_tag_name: "ANDROID_CAR_SYSTEM", 141 api_tag_name: "ANDROID_CAR_SYSTEM",
143 api_filename: "api.txt", 142 api_filename: "api.txt",
144 removed_api_filename: "removed.txt", 143 removed_api_filename: "removed.txt",
145 args: "-hide 113 -hide 110 -nodocs -stubpackages android.car* " + 144 args: "--hide DeprecationMismatch --hide UnavailableSymbol --hide UnhiddenSystemApi --hide HiddenTypedefConstant --hide ReferencesHidden --no-docs --stub-packages android.car* " +
146 "-showAnnotation android.annotation.SystemApi ", 145 "--show-annotation android.annotation.SystemApi ",
147 installable: false, 146 installable: false,
148 check_api: { 147 check_api: {
149 last_released: { 148 last_released: {
@@ -163,7 +162,7 @@ droiddoc {
163 }, 162 },
164} 163}
165 164
166droiddoc { 165droidstubs {
167 name: "android.car-stub-docs", 166 name: "android.car-stub-docs",
168 srcs: [ 167 srcs: [
169 "src/**/*.java", 168 "src/**/*.java",
@@ -173,8 +172,7 @@ droiddoc {
173 ], 172 ],
174 api_tag_name: "ANDROID_CAR_STUB", 173 api_tag_name: "ANDROID_CAR_STUB",
175 api_filename: "api.txt", 174 api_filename: "api.txt",
176 custom_template: "droiddoc-templates-sdk", 175 args: "--hide DeprecationMismatch --hide UnavailableSymbol --UnhiddenSystemApi --hide HiddenTypedefConstant --hide ReferencesHidden --no-docs --stub-packages android.car* ",
177 args: "-nodocs -stubpackages android.car* ",
178 installable: false, 176 installable: false,
179 product_variables: { 177 product_variables: {
180 pdk: { 178 pdk: {
diff --git a/car-support-lib/Android.bp b/car-support-lib/Android.bp
index 2d4269e9..18e7b03f 100644
--- a/car-support-lib/Android.bp
+++ b/car-support-lib/Android.bp
@@ -56,13 +56,13 @@ doc_defaults {
56 }, 56 },
57} 57}
58 58
59droiddoc { 59droidstubs {
60 name: "android.support.car-stubs-docs", 60 name: "android.support.car-stubs-docs",
61 defaults: ["android.support.car-docs-default"], 61 defaults: ["android.support.car-docs-default"],
62 api_tag_name: "ANDROID_SUPPORT_CAR", 62 api_tag_name: "ANDROID_SUPPORT_CAR",
63 api_filename: "api.txt", 63 api_filename: "api.txt",
64 removed_api_filename: "removed.txt", 64 removed_api_filename: "removed.txt",
65 args: "-hide 113 -hide 110 -nodocs -stubpackages android.support.car* ", 65 args: "--hide DeprecationMismatch -hide UnavailableSymbol --hide UnhiddenSystemApi --hide HiddenTypedefConstant --hide ReferencesHidden --no-docs --stub-packages android.support.car* ",
66 installable: false, 66 installable: false,
67 check_api: { 67 check_api: {
68 current: { 68 current: {