summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2020-09-16 14:26:47 +0100
committerPaul Duffin <paulduffin@google.com>2020-09-28 19:50:24 +0100
commit404b26a761a4ea212a85fbc0c63e7e61f1b6a030 (patch)
treed815a3b84a75898c5eb098d497a30811ec729152
parentecea8deae9f5909811537c68dd78144a0a84d5fd (diff)
Use ART stubs source generated by java_sdk_library
Bug: 168301990 Test: Built offline-sdk-docs with and without the change and diffed them. There were some changes other than the timestamp.js file. With these changes classes that implemented the Object.equals(Object) method had some extra documentation that explained that the parameter could be null. The reason for this change is that the stubs generated with this change includes android.annotation.Nullable whereas previously they included androidx.annotation.Nullable. The change is a very minor improvement over what is currently uploaded to developer.android.com/reference so not worth backporting. Diffed api/public/current.txt against frameworks/base/api/current.txt and made sure that the latter was a superset of the former and there were no differences in the area that overlapped. Change-Id: I3767948b4659b18b813c8eed66258af98ac4a241
-rw-r--r--ApiDocs.bp2
-rw-r--r--StubLibraries.bp2
2 files changed, 2 insertions, 2 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp
index ca921ff97c35..df12eb38e0d7 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -65,7 +65,7 @@ stubs_defaults {
"test-base/src/**/*.java",
":opt-telephony-srcs",
":opt-net-voip-srcs",
- ":art-module-public-api-stubs-source",
+ ":art.module.public.api{.public.stubs.source}",
":conscrypt.module.public.api{.public.stubs.source}",
":android_icu4j_public_api_files",
"test-mock/src/**/*.java",
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 4b0df44d8016..9e087f020246 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -47,7 +47,7 @@ stubs_defaults {
"core/java/**/*.logtags",
":opt-telephony-srcs",
":opt-net-voip-srcs",
- ":art-module-public-api-stubs-source",
+ ":art.module.public.api{.public.stubs.source}",
":android_icu4j_public_api_files",
"**/package.html",
],