Add Manifest Merging support to android_library / android_prebuilt() rules |
||
Issue descriptionThere's a manifest merger .jar in the sdk, but we don't currently have support for running it. This would be a nice-to-have, especially since .aar files require this.
,
Jul 25 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/f8a3108b74daf9d5334fa1d9c4255f8004eb2b26 commit f8a3108b74daf9d5334fa1d9c4255f8004eb2b26 Author: Andrew Grieve <agrieve@chromium.org> Date: Tue Jul 25 02:43:05 2017 Android: Add depfile to merge_manifest.py Fixes AndroidManifest.xml not being rebuilt when a dependent manifest is change (for incremental builds). BUG= 643967 Change-Id: Idac20e9c9d409ad5ad14ab575f8ee520ecc6b532 Reviewed-on: https://chromium-review.googlesource.com/582937 Reviewed-by: Eric Stevenson <estevenson@chromium.org> Commit-Queue: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/master@{#489196} [modify] https://crrev.com/f8a3108b74daf9d5334fa1d9c4255f8004eb2b26/build/android/gyp/merge_manifest.py [modify] https://crrev.com/f8a3108b74daf9d5334fa1d9c4255f8004eb2b26/build/config/android/rules.gni
,
Jul 28 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/9eec19d03d142ed912e3efe6439bc2bb642fead9 commit 9eec19d03d142ed912e3efe6439bc2bb642fead9 Author: Andrew Grieve <agrieve@chromium.org> Date: Fri Jul 28 03:04:36 2017 Android: Add option to skip R.java creation for android_resources() The downstream version of play services requires this to support AndroidManifest.xml merging. BUG= 643967 Change-Id: I3a8662aedc8c5c6cbc4ce0e895f92ab5cbedb7e1 Reviewed-on: https://chromium-review.googlesource.com/584129 Reviewed-by: Paul Miller <paulmiller@chromium.org> Commit-Queue: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/master@{#490230} [modify] https://crrev.com/9eec19d03d142ed912e3efe6439bc2bb642fead9/build/android/gyp/process_resources.py [modify] https://crrev.com/9eec19d03d142ed912e3efe6439bc2bb642fead9/build/config/android/internal_rules.gni [modify] https://crrev.com/9eec19d03d142ed912e3efe6439bc2bb642fead9/build/config/android/rules.gni
,
Jul 28 2017
The following revision refers to this bug: https://chrome-internal.googlesource.com/clank/internal/apps/+/895297c6f50f5e22129f35ae6f9cedb8034c2464 commit 895297c6f50f5e22129f35ae6f9cedb8034c2464 Author: Andrew Grieve <agrieve@chromium.org> Date: Fri Jul 28 21:13:24 2017
,
Aug 8 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/9bcaab4819577593864de7af4ecd159c8836e9f2 commit 9bcaab4819577593864de7af4ecd159c8836e9f2 Author: Ingemar Ådahl <ingemara@opera.com> Date: Tue Aug 08 08:05:31 2017 Remove redundant GMS version meta-data The <meta-data> is merged into the final apk manifest from dependency manifests. //third_party/android_tools:google_play_services_basement_java provides the manifest and accompanying resource value. Bug: 643967 Change-Id: I09590a6c060e4e92c45e928ad57d64546d90f7e3 Reviewed-on: https://chromium-review.googlesource.com/567138 Reviewed-by: Yuwei Huang <yuweih@chromium.org> Reviewed-by: Ted Choc <tedchoc@chromium.org> Commit-Queue: Ingemar Ådahl <ingemara@opera.com> Cr-Commit-Position: refs/heads/master@{#492568} [modify] https://crrev.com/9bcaab4819577593864de7af4ecd159c8836e9f2/chrome/android/java/AndroidManifest.xml [modify] https://crrev.com/9bcaab4819577593864de7af4ecd159c8836e9f2/chrome/test/android/unit_tests_apk/AndroidManifest.xml [modify] https://crrev.com/9bcaab4819577593864de7af4ecd159c8836e9f2/remoting/android/java/AndroidManifest.xml.jinja2
,
Aug 14 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/451dc02fd3d4d19944d2def04a9d00cc69b3fc2f commit 451dc02fd3d4d19944d2def04a9d00cc69b3fc2f Author: Ingemar Ådahl <ingemara@opera.com> Date: Mon Aug 14 13:40:16 2017 Remove ignore_manifest in android_aar_prebuilt Manifest merging is now supported! \o/ Bug: 643967 Change-Id: I460e4635fc2dc34592f50aed03f4056a5f402364 Reviewed-on: https://chromium-review.googlesource.com/567078 Reviewed-by: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Brandon Jones <bajones@chromium.org> Commit-Queue: Ingemar Ådahl <ingemara@opera.com> Cr-Commit-Position: refs/heads/master@{#494041} [modify] https://crrev.com/451dc02fd3d4d19944d2def04a9d00cc69b3fc2f/build/config/android/rules.gni [modify] https://crrev.com/451dc02fd3d4d19944d2def04a9d00cc69b3fc2f/build/secondary/third_party/android_tools/BUILD.gn [modify] https://crrev.com/451dc02fd3d4d19944d2def04a9d00cc69b3fc2f/third_party/gvr-android-sdk/BUILD.gn
,
Aug 15 2017
This is now done. Thanks Ingemar! |
||
►
Sign in to add a comment |
||
Comment 1 by bugdroid1@chromium.org
, Jul 10 2017