Merge "Put all updatable sources in one filegroup" am: 0223efdaa1 am: 371cf3ce5e
am: 022f6f2ab7
Change-Id: I079cb8dc6729f62b03eb262a5e0a17141f069087
diff --git a/Android.bp b/Android.bp
index 5c0d7c5..c1f6860 100644
--- a/Android.bp
+++ b/Android.bp
@@ -266,12 +266,19 @@
}
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",
],
}
@@ -1026,16 +1033,15 @@
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",
],
@@ -1093,13 +1099,12 @@
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"],