summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2019-12-02 19:30:36 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-12-02 19:30:36 +0000
commit0223efdaa1c46f38b282db265d7b636a126d935c (patch)
treeee76dfb5e56d598fbff820db3bb6c8ef5b129d64
parent78056c77f38898cf1276c493f5e6edd7b3832343 (diff)
parentb4f3557fde199051656ed508ee4cde631c32da50 (diff)
downloadbase-0223efdaa1c46f38b282db265d7b636a126d935c.tar.gz
Merge "Put all updatable sources in one filegroup"
-rw-r--r--Android.bp19
1 files changed, 12 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 5efcb776dcf1..6b2883c13b9d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -263,12 +263,19 @@ filegroup {
}
filegroup {
+ name: "framework-updatable-sources",
+ srcs: [
+ ":framework-sdkext-sources",
+ ":updatable-media-srcs",
+ ]
+}
+
+filegroup {
name: "framework-all-sources",
srcs: [
":framework-mime-sources",
":framework-non-updatable-sources",
- ":framework-sdkext-sources",
- ":updatable-media-srcs",
+ ":framework-updatable-sources",
],
}
@@ -979,16 +986,15 @@ packages_to_document = [
stubs_defaults {
name: "framework-doc-stubs-default",
srcs: [
- ":framework-non-updatable-sources",
":framework-mime-sources",
- ":framework-sdkext-sources",
+ ":framework-non-updatable-sources",
+ ":framework-updatable-sources",
"core/java/**/*.logtags",
"test-base/src/**/*.java",
":opt-telephony-srcs",
":opt-net-voip-srcs",
":core-current-stubs-source",
":core_public_api_files",
- ":updatable-media-srcs",
"test-mock/src/**/*.java",
"test-runner/src/**/*.java",
],
@@ -1046,13 +1052,12 @@ stubs_defaults {
name: "metalava-api-stubs-default",
srcs: [
":framework-non-updatable-sources",
- ":framework-sdkext-sources",
+ ":framework-updatable-sources",
"core/java/**/*.logtags",
":opt-telephony-srcs",
":opt-net-voip-srcs",
":core-current-stubs-source",
":core_public_api_files",
- ":updatable-media-srcs",
":ike-api-srcs",
],
libs: ["framework-internal-utils"],