diff options
author | Anton Hansson <hansson@google.com> | 2021-03-31 14:33:20 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-31 14:33:20 +0000 |
commit | 9a7ad7fa85cf9c68238c8b33d3402424d0bf08d4 (patch) | |
tree | 64dca4e5e5e2623095b796b0e88543e891544c26 | |
parent | 599f5459692609ef43da8dc0ed34d4abcde02e23 (diff) | |
parent | 703cde03220572b27fefa4cd6fa7534a1c4e0c50 (diff) |
Merge "Delete framework-updatable-sources filegroup"
-rw-r--r-- | Android.bp | 16 | ||||
-rw-r--r-- | ApiDocs.bp | 16 |
2 files changed, 14 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp index 3fb03c245d25..cf3bbb751f1e 100644 --- a/Android.bp +++ b/Android.bp @@ -399,22 +399,6 @@ filegroup { ], } -filegroup { - name: "framework-updatable-sources", - srcs: [ - ":framework-connectivity-sources", - ":framework-mediaprovider-sources", - ":framework-permission-sources", - ":framework-sdkextensions-sources", - ":framework-statsd-sources", - ":framework-tethering-srcs", - ":framework-wifi-updatable-sources", - ":ike-srcs", - ":updatable-media-srcs", - ], - visibility: ["//visibility:private"], -} - java_library { name: "framework-updatable-stubs-module_libs_api", static_libs: [ diff --git a/ApiDocs.bp b/ApiDocs.bp index ff3dc8db1ee5..d3bef7f9046b 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -59,11 +59,23 @@ stubs_defaults { name: "framework-doc-stubs-default", srcs: [ ":framework-non-updatable-stub-sources", - ":framework-updatable-sources", - "test-base/src/**/*.java", + + // Module sources ":art.module.public.api{.public.stubs.source}", ":conscrypt.module.public.api{.public.stubs.source}", + ":framework-connectivity-sources", + ":framework-mediaprovider-sources", + ":framework-permission-sources", + ":framework-sdkextensions-sources", + ":framework-statsd-sources", + ":framework-tethering-srcs", + ":framework-wifi-updatable-sources", ":i18n.module.public.api{.public.stubs.source}", + ":ike-srcs", + ":updatable-media-srcs", + + // No longer part of the stubs, but are included in the docs. + "test-base/src/**/*.java", "test-mock/src/**/*.java", "test-runner/src/**/*.java", ], |