diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-04-16 11:28:13 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2019-04-17 10:48:08 +0100 |
| commit | 44e033bdc8e9279dd7391603fcdd6b4018ef762d (patch) | |
| tree | 582a720e5f0913d172187203870105901860ce90 /update_prebuilts | |
| parent | 45246bbbb0061d850aa33ecf09da6799c10ed1c9 (diff) | |
| download | platform_prebuilts_sdk-44e033bdc8e9279dd7391603fcdd6b4018ef762d.tar.gz platform_prebuilts_sdk-44e033bdc8e9279dd7391603fcdd6b4018ef762d.tar.bz2 platform_prebuilts_sdk-44e033bdc8e9279dd7391603fcdd6b4018ef762d.zip | |
Update to match changes in pom2bp arguments
The pom2bp -extra-deps argument is being renamed to -extra-static-libs
and a new -extra-libs argument is being added to allow callers to
clearly specify additional static and runtime dependencies. This change
ensures that the update_prebuilts/update_prebuilts.py script will
continue to work.
Test: ./update_prebuilts.py --stx 5280039 - discarded commit
Bug: 73711752
Bug: 130287656
Change-Id: I3e5288696c738af68cf0c32180329e2b9e1c9913
Diffstat (limited to 'update_prebuilts')
| -rwxr-xr-x | update_prebuilts/update_prebuilts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py index b95d03a31..5e966555d 100755 --- a/update_prebuilts/update_prebuilts.py +++ b/update_prebuilts/update_prebuilts.py @@ -418,7 +418,7 @@ def transform_maven_repos(maven_repo_dirs, transformed_dir, extract_res=True, in args.extend(["-rewrite=^" + name + "$=" + maven_to_make[name]['name'] for name in rewriteNames]) args.extend(["-rewrite=^com.squareup:javapoet$=javapoet-prebuilt-jar"]) args.extend(["-rewrite=^com.google.guava:listenablefuture$=guava-listenablefuture-prebuilt-jar"]) - args.extend(["-extra-deps=android-support-car=prebuilt-android.car-stubs"]) + args.extend(["-extra-static-libs=android-support-car=prebuilt-android.car-stubs"]) args.extend(["-host=" + name for name in maven_to_make if maven_to_make[name].get('host')]) # these depend on GSON which is not in AOSP args.extend(["-exclude=androidx.room_room-migration", |