diff options
| author | Zach Johnson <zachoverflow@google.com> | 2019-11-09 17:13:44 -0800 |
|---|---|---|
| committer | Zach Johnson <zachoverflow@google.com> | 2019-11-19 15:21:08 -0800 |
| commit | 3fe6a690a017751d749ed3f70ebeac867e8ceccd (patch) | |
| tree | aaa055ebe070b39e559db2b0a652296c92ce5d93 /update_prebuilts | |
| parent | 2727fe50998824ef4317a3cc5f266064dcf69c0b (diff) | |
| download | platform_prebuilts_sdk-3fe6a690a017751d749ed3f70ebeac867e8ceccd.tar.gz platform_prebuilts_sdk-3fe6a690a017751d749ed3f70ebeac867e8ceccd.tar.bz2 platform_prebuilts_sdk-3fe6a690a017751d749ed3f70ebeac867e8ceccd.zip | |
Add room-compiler dependency on jetbrains-annotations
Bug: 142747680
Test: m
Change-Id: I3e5ef00d90e39ff8d9ea6967f59cd6daa0e147b9
Diffstat (limited to 'update_prebuilts')
| -rwxr-xr-x | update_prebuilts/update_prebuilts.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py index 8fdb5fdb8..fd5895c25 100755 --- a/update_prebuilts/update_prebuilts.py +++ b/update_prebuilts/update_prebuilts.py @@ -444,7 +444,8 @@ def transform_maven_repos(maven_repo_dirs, transformed_dir, extract_res=True, in args.extend(["-rewrite=^kotlinx-metadata-jvm$=kotlin-metadata"]) args.extend(["-rewrite=^gson$=gson-prebuilt-jar"]) args.extend(["-extra-static-libs=android-support-car=prebuilt-android.car-stubs"]) - args.extend(["-extra-static-libs=androidx.room_room-compiler=guava-21.0"]) + # remove jetbrains-annotations after b/144726918 is fixed + args.extend(["-extra-static-libs=androidx.room_room-compiler=guava-21.0,jetbrains-annotations"]) args.extend(["-host=" + name for name in maven_to_make if maven_to_make[name].get('host')]) args.extend(["-host-and-device=" + name for name in maven_to_make if maven_to_make[name].get('host_and_device')]) # these depend on GSON which is not in AOSP |