commit 07cb42853f73b8096f682dcf8d845bcda87934ab
author Anton Hansson <hansson@google.com> Wed Oct 04 18:33:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 04 18:33:50 2023 +0000
tree e5fadeef62073890d36e7c5f56c961d5ce357c02
parent 1a76c8e2f74fd9c8efb05a7f56f20c7626cfdc45
parent e6a15d30163ca332eaa1131234b9bb902b2c8097

Merge "Specify lint-baseline for docs builds" into main am: 209ae2e5d2 am: 405169e822 am: a0316c8503 am: 5cd836f221 am: e6a15d3016

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2769722

Change-Id: I728c6e35eef4f382a3555eda34a50e2b99b22748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

api/ApiDocs.bp

diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp
index fbcaa52..6461c00 100644
--- a/api/ApiDocs.bp
+++ b/api/ApiDocs.bp
@@ -209,6 +209,7 @@
     custom_template: "droiddoc-templates-sdk",
     resourcesdir: "docs/html/reference/images/",
     resourcesoutdir: "reference/android/images/",
+    lint_baseline: "javadoc-lint-baseline",
     hdf: [
         "dac true",
         "sdk.codename O",

api/javadoc-lint-baseline

diff --git a/api/javadoc-lint-baseline b/api/javadoc-lint-baseline
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/api/javadoc-lint-baseline