summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2020-09-29 15:50:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-29 15:50:19 +0000
commit1f541e24ea668153feffd7ae58255d812b2c0479 (patch)
tree72e5bb061693594013700c0bf249278184eaac34
parentb09385b5a1a5abd897426b6bc28b9f3bedfa3e22 (diff)
parent860f8b380b8d6d3f3c2e562e433e96056e04470f (diff)
Merge "Use ART stubs source generated by java_sdk_library" am: b996945678 am: 54fa7623bc am: ad9299dcdb am: 471182f89e am: 860f8b380b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428569 Change-Id: I530d440c283af2e592a13f08a694ec788b9adf29
-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 c82fee0fe8ac..04761880604b 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 852fcc6128c4..a3a209458679 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",
],