| commit | e372ef1c99f5570d50b9bae32b9af7222a18223c | [log] [tgz] |
|---|---|---|
| author | Peter Wen <[email protected]> | Thu Nov 20 15:46:51 2025 |
| committer | Copybara-Service <[email protected]> | Thu Nov 20 15:52:43 2025 |
| tree | 0d3b97bb3fe2933c06574f992d52e15a82bde492 | |
| parent | 44a7e72e16ce2fd0b214aa5beaa7d212d5beba37 [diff] |
android: Use merged manifest for lint targets The lint.py script previously performed its own manifest merging, which is redundant with the dedicated `merge_manifest` step for APKs. This prevented node removals that are performed in the regular manifest merger step from benefitting lint (results in duplicate elements for lint's manually-merged manifest). This CL updates the `android_lint` rule to accept a pre-merged manifest for `android_apk` and removes support for lint from `android_app_bundle` targets, as we would need to support multiple config XML files, one for each bundle, in order to have a chance of making it work. The manual manifest merging code has been removed. The custom fix for duplicate FingerprintDialogActivity has also been removed. Bug: 457436186 Change-Id: I769a8f03d61223813b53fca49f9670c051254f71 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7119818 Auto-Submit: Peter Wen <[email protected]> Commit-Queue: Andrew Grieve <[email protected]> Owners-Override: Andrew Grieve <[email protected]> Reviewed-by: Andrew Grieve <[email protected]> Cr-Commit-Position: refs/heads/main@{#1547829} NOKEYCHECK=True GitOrigin-RevId: b4af6bf277867bf76ce97b86eb783893cd88de6b
Note: the canonical copy of the boundary interfaces lives in the chromium repository; this subdirectory of chromium is mirrored into the Android project for use by the webkit AndroidX module.
If you‘re reading this file in the Android repository, don’t make changes in this folder. Please make changes in chromium, or contact the OWNERS in frameworks/support/webkit/.
If you're reading this file in the chromium repository, you should feel free to make changes. Please be aware that this folder has strict import requirements (enforced by DEPS), because it must continue to build when mirrored into Android.