diff options
| author | Anton Hansson <hansson@google.com> | 2019-12-02 11:43:14 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-02 11:43:14 -0800 |
| commit | 371cf3ce5e35310cba324692ec1876b87c13aa63 (patch) | |
| tree | 8bd5fbedebd52315c56a1e87aaf1235506697078 | |
| parent | cec994c03f6d809ea31bb1edd0464aa42f5a066d (diff) | |
| parent | 0223efdaa1c46f38b282db265d7b636a126d935c (diff) | |
| download | base-371cf3ce5e35310cba324692ec1876b87c13aa63.tar.gz | |
Merge "Put all updatable sources in one filegroup"
am: 0223efdaa1
Change-Id: I71435d12e53df84c5ee0b14558b49cb497eae8f7
| -rw-r--r-- | Android.bp | 19 |
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"], |