diff options
| author | Brian Orr <brianorr@google.com> | 2021-06-15 12:47:53 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-06-17 13:37:54 -0700 |
| commit | 71c831703ae59baf47e0afe611fecd714c481cdf (patch) | |
| tree | 06731a987032723085b9e1a65951cf96abbc19cf /core/java/Android.bp | |
| parent | 065c9e9a6e9d61d4383a91721eb56a3de253bdbe (diff) | |
| parent | 81833820d54b9a6b27894f9f8dfd72222d416992 (diff) | |
Merge SP1A.210604.001
Change-Id: I5200ee05285ae422d5e9c1c00f45709a5d6188be
Diffstat (limited to 'core/java/Android.bp')
| -rw-r--r-- | core/java/Android.bp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/Android.bp b/core/java/Android.bp index 793d0ef164fa..6c001f305ce7 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -169,6 +169,7 @@ filegroup { filegroup { name: "framework-jobscheduler-shared-srcs", srcs: [ + ":modules-utils-preconditions-srcs", "com/android/internal/util/ArrayUtils.java", "com/android/internal/util/BitUtils.java", "com/android/internal/util/CollectionUtils.java", @@ -178,7 +179,6 @@ filegroup { "com/android/internal/util/FastXmlSerializer.java", "com/android/internal/util/FunctionalUtils.java", "com/android/internal/util/ParseUtils.java", - "com/android/internal/util/Preconditions.java", "com/android/internal/util/RingBufferIndices.java", "com/android/internal/util/StatLogger.java", "com/android/internal/util/XmlUtils.java", @@ -189,9 +189,9 @@ filegroup { filegroup { name: "framework-permission-s-shared-srcs", srcs: [ + ":modules-utils-preconditions-srcs", "com/android/internal/infra/AndroidFuture.java", "com/android/internal/infra/ServiceConnector.java", - "com/android/internal/util/Preconditions.java", "com/android/internal/infra/AndroidFuture.aidl", "com/android/internal/infra/IAndroidFuture.aidl", "android/os/HandlerExecutor.java", @@ -323,6 +323,7 @@ aidl_interface { filegroup { name: "framework-telephony-common-shared-srcs", srcs: [ + ":modules-utils-preconditions-srcs", "android/os/RegistrantList.java", "android/os/Registrant.java", "android/util/IndentingPrintWriter.java", @@ -336,7 +337,6 @@ filegroup { "com/android/internal/util/HexDump.java", "com/android/internal/util/IState.java", "com/android/internal/util/IndentingPrintWriter.java", - "com/android/internal/util/Preconditions.java", "com/android/internal/util/State.java", "com/android/internal/util/StateMachine.java", "com/android/internal/util/UserIcons.java", @@ -348,10 +348,10 @@ filegroup { filegroup { name: "framework-cellbroadcast-shared-srcs", srcs: [ + ":modules-utils-preconditions-srcs", "android/os/HandlerExecutor.java", "android/util/LocalLog.java", "com/android/internal/util/IState.java", - "com/android/internal/util/Preconditions.java", "com/android/internal/util/State.java", "com/android/internal/util/StateMachine.java", ], @@ -360,10 +360,10 @@ filegroup { filegroup { name: "framework-ims-common-shared-srcs", srcs: [ + ":modules-utils-preconditions-srcs", "android/os/RegistrantList.java", "android/os/Registrant.java", "com/android/internal/os/SomeArgs.java", - "com/android/internal/util/Preconditions.java", ], } |