Revert "Renaming monochrome_public_bundle to m_32_64_p_b for 64-bit builds"
This reverts commit c58c4142cb5f18148d4e42f98270204bbe5c19f0.
Reason for revert: sus for archive bot build failures
https://ci.chromium.org/ui/p/chromium/builders/ci/android-arm64-archive-rel/5005/overview
Original change's description:
> Renaming monochrome_public_bundle to m_32_64_p_b for 64-bit builds
>
> The goal is to switch the name "monochrome_public_bundle" to build a
> 64-bit primary Chrome. This is the first step, where we make
> "monochrome_public_bundle" an alias to what it used to be. The next
> step will be to change what the alias points to.
>
> This is also true for all other monochrome and trichrome targets that
> default to a 32_64 configuration.
>
> Bug: 1479998
> Change-Id: I0cfa0a84f79dc9013af72c7d653be4187c65ccda
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4858642
> Reviewed-by: Richard (Torne) Coles <torne@chromium.org>
> Commit-Queue: Sam Maier <smaier@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1202715}
Bug: 1479998
Change-Id: Ib6b49bb30d46733db2a1722b03b7bcc4fa5bea6b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4902603
Commit-Queue: Nina Satragno <nsatragno@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Nina Satragno <nsatragno@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1202758}
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
index 9d41bd6a..4b5b864 100644
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -41,30 +41,10 @@
}
if (android_64bit_target_cpu) {
- _main_trichrome_library_provider =
- "//chrome/android:trichrome_library_32_64_apk"
- _main_trichrome_webview_apk_target = "trichrome_webview_32_64_apk"
- _main_trichrome_webview_bundle_target = "trichrome_webview_32_64_bundle"
- _main_trichrome_webview_base_bundle_module_target =
- "trichrome_webview_32_64_base_bundle_module"
- _main_system_webview_apk_target = "system_webview_32_64_apk"
- _main_system_webview_bundle_target = "system_webview_32_64_bundle"
- _main_system_webview_base_bundle_module_target =
- "system_webview_32_64_base_bundle_module"
-
# We are assuming that all webview targets have the same Java - if this
# is no longer true, we should add more targets to this array.
webview_java_for_jni_targets = [ ":system_webview_64_bundle" ]
} else {
- _main_trichrome_library_provider = "//chrome/android:trichrome_library_apk"
- _main_trichrome_webview_apk_target = "trichrome_webview_apk"
- _main_trichrome_webview_bundle_target = "trichrome_webview_bundle"
- _main_trichrome_webview_base_bundle_module_target =
- "trichrome_webview_base_bundle_module"
- _main_system_webview_apk_target = "system_webview_apk"
- _main_system_webview_bundle_target = "system_webview_bundle"
- _main_system_webview_base_bundle_module_target =
- "system_webview_base_bundle_module"
webview_java_for_jni_targets = [ ":system_webview_bundle" ]
}
@@ -81,12 +61,7 @@
deps = [ ":system_webview_64_apk" ]
}
} else {
- if (android_64bit_target_cpu) {
- group("system_webview_apk") {
- deps = [ ":system_webview_32_64_apk" ]
- }
- }
- standalone_system_webview_apk_tmpl(_main_system_webview_apk_target) {
+ standalone_system_webview_apk_tmpl("system_webview_apk") {
apk_name = "SystemWebView"
}
}
@@ -117,21 +92,14 @@
[ "//third_party/androidx:androidx_recyclerview_recyclerview_java" ]
}
+_main_webview_bundle_target = ":system_webview_bundle"
if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
+ _main_webview_bundle_target = ":system_webview_64_bundle"
group("system_webview_bundle") {
deps = [ ":system_webview_64_bundle" ]
}
} else {
- if (android_64bit_target_cpu) {
- group("system_webview_bundle") {
- deps = [ ":system_webview_32_64_bundle" ]
- }
- group("system_webview_base_bundle_module") {
- deps = [ ":system_webview_32_64_base_bundle_module" ]
- }
- }
- standalone_system_webview_apk_tmpl(
- _main_system_webview_base_bundle_module_target) {
+ standalone_system_webview_apk_tmpl("system_webview_base_bundle_module") {
target_type = "android_app_bundle_module"
is_base_module = true
@@ -141,8 +109,8 @@
}
}
- system_webview_bundle(_main_system_webview_bundle_target) {
- base_module_target = ":$_main_system_webview_base_bundle_module_target"
+ system_webview_bundle("system_webview_bundle") {
+ base_module_target = ":system_webview_base_bundle_module"
bundle_name = "SystemWebView"
min_sdk_version = default_min_sdk_version
}
@@ -150,7 +118,7 @@
if (is_official_build) {
# Used for binary size monitoring.
create_app_bundle_minimal_apks("system_webview_minimal_apks") {
- deps = [ ":$_main_system_webview_bundle_target" ]
+ deps = [ ":system_webview_bundle" ]
bundle_path = "$root_build_dir/apks/SystemWebView.aab"
}
@@ -216,18 +184,13 @@
deps = [ ":trichrome_webview_64_apk" ]
}
} else {
- if (android_64bit_target_cpu) {
- group("trichrome_webview_apk") {
- deps = [ ":trichrome_webview_32_64_apk" ]
- }
- }
- trichrome_webview_tmpl(_main_trichrome_webview_apk_target) {
+ trichrome_webview_tmpl("trichrome_webview_apk") {
apk_name = "TrichromeWebView"
if (android_64bit_target_cpu) {
is_64_bit_browser = false
include_64_bit_webview = true
}
- static_library_provider = _main_trichrome_library_provider
+ static_library_provider = "//chrome/android:trichrome_library_apk"
}
}
@@ -245,15 +208,7 @@
deps = [ ":trichrome_webview_64_bundle" ]
}
} else {
- if (android_64bit_target_cpu) {
- group("trichrome_webview_bundle") {
- deps = [ ":trichrome_webview_32_64_bundle" ]
- }
- group("trichrome_webview_base_bundle_module") {
- deps = [ ":trichrome_webview_32_64_base_bundle_module" ]
- }
- }
- trichrome_webview_tmpl(_main_trichrome_webview_base_bundle_module_target) {
+ trichrome_webview_tmpl("trichrome_webview_base_bundle_module") {
target_type = "android_app_bundle_module"
is_base_module = true
if (android_64bit_target_cpu) {
@@ -265,14 +220,14 @@
expected_android_manifest =
"expectations/trichrome_webview_bundle.AndroidManifest.expected"
}
- static_library_provider = _main_trichrome_library_provider
+ static_library_provider = "//chrome/android:trichrome_library_apk"
}
- system_webview_bundle(_main_trichrome_webview_bundle_target) {
+ system_webview_bundle("trichrome_webview_bundle") {
is_trichrome = true
- base_module_target = ":$_main_trichrome_webview_base_bundle_module_target"
+ base_module_target = ":trichrome_webview_base_bundle_module"
bundle_name = "TrichromeWebView"
- static_library_provider = _main_trichrome_library_provider
+ static_library_provider = "//chrome/android:trichrome_library_apk"
if (enable_libs_and_assets_verification) {
expected_libs_and_assets =
"expectations/$target_name.$target_cpu.libs_and_assets.expected"
@@ -304,7 +259,7 @@
if (is_official_build && !skip_secondary_abi_for_cq) {
# Used for binary size monitoring.
create_app_bundle_minimal_apks("trichrome_webview_minimal_apks") {
- deps = [ ":$_main_trichrome_webview_bundle_target" ]
+ deps = [ ":trichrome_webview_bundle" ]
bundle_path = "$root_build_dir/apks/TrichromeWebView.aab"
}
diff --git a/android_webview/tools/system_webview_shell/lint-baseline.xml b/android_webview/tools/system_webview_shell/lint-baseline.xml
index a072526..f42a5a6 100644
--- a/android_webview/tools/system_webview_shell/lint-baseline.xml
+++ b/android_webview/tools/system_webview_shell/lint-baseline.xml
@@ -7,7 +7,7 @@
errorLine1=" <activity android:name="org.chromium.test.broker.OnDeviceInstrumentationBroker" android:exported="true"/>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
- file="gen/android_webview/tools/system_webview_shell/system_webview_shell_apk__lint/AndroidManifest.xml"
+ file="gen/android_webview/tools/system_webview_shell/system_webview_shell_apk__lint/gen/android_webview/system_webview_shell_apk/AndroidManifest.xml"
line="185"
column="29"/>
</issue>
@@ -117,7 +117,7 @@
errorLine1=" <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/ShellTheme" android:enableOnBackInvokedCallback="true" android:networkSecurityConfig="@xml/network_security_config" android:debuggable="true">"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
- file="gen/android_webview/tools/system_webview_shell/system_webview_shell_apk__lint/AndroidManifest.xml"
+ file="gen/android_webview/tools/system_webview_shell/system_webview_shell_apk__lint/gen/android_webview/system_webview_shell_apk/AndroidManifest.xml"
line="67"
column="224"/>
</issue>
diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py
index ae6556f6..23c598e 100755
--- a/build/android/gyp/lint.py
+++ b/build/android/gyp/lint.py
@@ -271,10 +271,9 @@
extra_manifest_paths,
min_sdk_version,
android_sdk_version)
- # Just use a hardcoded name, since we may have different target names (and
- # thus different manifest_paths) using the same lint baseline. Eg.
- # trichrome_chrome_bundle and trichrome_chrome_32_64_bundle.
- lint_android_manifest_path = os.path.join(lint_gen_dir, 'AndroidManifest.xml')
+ # Include the rebased manifest_path in the lint generated path so that it is
+ # clear in error messages where the original AndroidManifest.xml came from.
+ lint_android_manifest_path = os.path.join(lint_gen_dir, manifest_path)
_WriteXmlFile(android_manifest_tree.getroot(), lint_android_manifest_path)
resource_root_dir = os.path.join(lint_gen_dir, _RES_ZIP_DIR)
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 472b7e6f..965a16f 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -286,12 +286,8 @@
enable_startup_profiles = false
# The target to use as the system WebView implementation.
- if (android_64bit_target_cpu) {
- if (skip_secondary_abi_for_cq) {
- system_webview_apk_target = "//android_webview:system_webview_64_apk"
- } else {
- system_webview_apk_target = "//android_webview:system_webview_32_64_apk"
- }
+ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
+ system_webview_apk_target = "//android_webview:system_webview_64_apk"
} else {
system_webview_apk_target = "//android_webview:system_webview_apk"
}
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 5f8fbc55..4d058be4 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1077,11 +1077,7 @@
_cache_dir = "$root_build_dir/android_lint_cache"
# Save generated xml files in a consistent location for debugging.
- if (defined(invoker.lint_gen_dir)) {
- _lint_gen_dir = invoker.lint_gen_dir
- } else {
- _lint_gen_dir = "$target_gen_dir/$target_name"
- }
+ _lint_gen_dir = "$target_gen_dir/$target_name"
_backported_methods = "//third_party/r8/backported_methods.txt"
script = "//build/android/gyp/lint.py"
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 9e1c64b..cac756a 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -3123,7 +3123,6 @@
forward_variables_from(invoker,
[
"lint_baseline_file",
- "lint_gen_dir",
"lint_suppressions_file",
"min_sdk_version",
])
@@ -3143,7 +3142,6 @@
not_needed(invoker,
[
"lint_baseline_file",
- "lint_gen_dir",
"lint_jar_path",
"lint_min_sdk_version",
"lint_suppressions_dep",
@@ -3262,7 +3260,6 @@
"keystore_password",
"keystore_path",
"lint_baseline_file",
- "lint_gen_dir",
"lint_min_sdk_version",
"lint_suppressions_dep",
"lint_suppressions_file",
@@ -5144,7 +5141,6 @@
forward_variables_from(invoker,
[
"lint_baseline_file",
- "lint_gen_dir",
"lint_jar_path",
"lint_suppressions_file",
])
@@ -5164,7 +5160,6 @@
not_needed(invoker,
[
"lint_baseline_file",
- "lint_gen_dir",
"lint_jar_path",
"lint_min_sdk_version",
"lint_suppressions_dep",
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 4bae4d27..91f3226 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -110,7 +110,6 @@
"is_monochrome",
"is_trichrome",
"lint_baseline_file",
- "lint_gen_dir",
"lint_min_sdk_version",
"lint_suppressions_file",
"static_library_provider",
@@ -2648,18 +2647,6 @@
resources_package = "org.chromium.chrome.base"
}
- if (android_64bit_target_cpu) {
- _main_monochrome_public_bundle_target = "monochrome_32_64_public_bundle"
- _main_monochrome_public_apk_target = "monochrome_32_64_public_apk"
- _main_trichrome_chrome_bundle_target = "trichrome_chrome_32_64_bundle"
- _main_trichrome_library_apk_target = "trichrome_library_32_64_apk"
- } else {
- _main_monochrome_public_bundle_target = "monochrome_public_bundle"
- _main_monochrome_public_apk_target = "monochrome_public_apk"
- _main_trichrome_chrome_bundle_target = "trichrome_chrome_bundle"
- _main_trichrome_library_apk_target = "trichrome_library_apk"
- }
-
if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
group("trichrome_library_apk") {
deps = [ ":trichrome_library_64_apk" ]
@@ -2668,15 +2655,7 @@
deps = [ ":monochrome_64_public_apk" ]
}
} else {
- if (android_64bit_target_cpu) {
- group("trichrome_library_apk") {
- deps = [ ":trichrome_library_32_64_apk" ]
- }
- group("monochrome_public_apk") {
- deps = [ ":monochrome_32_64_public_apk" ]
- }
- }
- chrome_public_apk_or_module_tmpl(_main_monochrome_public_apk_target) {
+ chrome_public_apk_or_module_tmpl("monochrome_public_apk") {
is_monochrome = true
apk_name = "MonochromePublic"
target_type = "android_apk"
@@ -2686,7 +2665,7 @@
}
}
- trichrome_library_apk_tmpl(_main_trichrome_library_apk_target) {
+ trichrome_library_apk_tmpl("trichrome_library_apk") {
apk_name = "TrichromeLibrary"
if (android_64bit_target_cpu) {
@@ -2970,7 +2949,7 @@
"$root_build_dir/apks/MonochromePublic64.apk.mapping"
}
} else {
- apk_under_test = ":$_main_monochrome_public_apk_target"
+ apk_under_test = ":monochrome_public_apk"
if (!is_java_debug) {
proguard_mapping_path =
"$root_build_dir/apks/MonochromePublic.apk.mapping"
@@ -3032,8 +3011,7 @@
"$root_build_dir/apks/MonochromePublic64.aab.mapping"
}
} else {
- apk_under_test =
- "//chrome/android:${_main_monochrome_public_bundle_target}_apks"
+ apk_under_test = "//chrome/android:monochrome_public_bundle_apks"
if (!is_java_debug) {
proguard_mapping_path =
"$root_build_dir/apks/MonochromePublic.aab.mapping"
@@ -3090,8 +3068,7 @@
}
} else {
apk_under_test = "//chrome/android:trichrome_chrome_bundle_apks"
- additional_apks =
- [ "//chrome/android:$_main_trichrome_library_apk_target" ]
+ additional_apks = [ "//chrome/android:trichrome_library_apk" ]
if (!is_java_debug) {
proguard_mapping_path =
"$root_build_dir/apks/TrichromeChrome.aab.mapping"
@@ -3145,7 +3122,7 @@
assert(disable_android_lint)
}
if (!disable_android_lint) {
- deps = [ ":${_main_monochrome_public_bundle_target}__lint" ]
+ deps = [ ":monochrome_public_bundle__lint" ]
if (defined(additional_chrome_lint_targets)) {
deps += additional_chrome_lint_targets
}
@@ -3160,18 +3137,9 @@
deps = [ ":trichrome_chrome_64_bundle" ]
}
} else {
- if (android_64bit_target_cpu) {
- group("monochrome_public_bundle") {
- deps = [ ":monochrome_32_64_public_bundle" ]
- }
- group("trichrome_chrome_bundle") {
- deps = [ ":trichrome_chrome_32_64_bundle" ]
- }
- }
-
# Public webview targets don't work with non-public sdks.
# https://crbug.com/1000763
- chrome_public_bundle(_main_monochrome_public_bundle_target) {
+ chrome_public_bundle("monochrome_public_bundle") {
is_monochrome = true
bundle_name = "MonochromePublic"
@@ -3181,11 +3149,6 @@
enable_lint = true
lint_baseline_file = "expectations/lint-baseline.xml"
lint_suppressions_file = "expectations/lint-suppressions.xml"
-
- # Since this target's name changes if we are 32 or 64 bit, we want to keep
- # the gen_dir the same for the lint baseline files.
- lint_gen_dir = "$target_gen_dir/monochrome_public_bundle__lint"
-
add_view_trace_events = true
if (android_64bit_target_cpu) {
@@ -3206,7 +3169,7 @@
if (is_official_build) {
# Used for binary size monitoring.
create_app_bundle_minimal_apks("monochrome_public_minimal_apks") {
- deps = [ ":$_main_monochrome_public_bundle_target" ]
+ deps = [ ":monochrome_public_bundle" ]
bundle_path = "$root_build_dir/apks/MonochromePublic.aab"
}
@@ -3218,10 +3181,10 @@
}
}
- chrome_public_bundle(_main_trichrome_chrome_bundle_target) {
+ chrome_public_bundle("trichrome_chrome_bundle") {
is_trichrome = true
bundle_name = "TrichromeChrome"
- static_library_provider = ":$_main_trichrome_library_apk_target"
+ static_library_provider = ":trichrome_library_apk"
add_view_trace_events = true
art_profile_path = "//chrome/android/baseline_profiles/profile.txt"
if (android_64bit_target_cpu) {
@@ -3241,7 +3204,7 @@
# Creates .zip of .apk splits suitable for the Android system image.
system_image_apks("trichrome_chrome_system_zip") {
- apk_or_bundle_target = ":$_main_trichrome_chrome_bundle_target"
+ apk_or_bundle_target = ":trichrome_chrome_bundle"
input_apk_or_bundle = "$root_out_dir/apks/TrichromeChrome.aab"
output = "$root_out_dir/apks/TrichromeChromeSystem.zip"
stub_output = "$root_out_dir/apks/TrichromeChrome-Stub.apk"
@@ -3249,7 +3212,7 @@
# Combines all splits into a single .apk for the Android system image.
system_image_apks("trichrome_chrome_system_apk") {
- apk_or_bundle_target = ":$_main_trichrome_chrome_bundle_target"
+ apk_or_bundle_target = ":trichrome_chrome_bundle"
input_apk_or_bundle = "$root_out_dir/apks/TrichromeChrome.aab"
output = "$root_out_dir/apks/TrichromeChromeSystem.apk"
fuse_apk = true
@@ -3271,14 +3234,14 @@
# Used for binary size monitoring.
create_app_bundle_minimal_apks("trichrome_chrome_minimal_apks") {
- deps = [ ":$_main_trichrome_chrome_bundle_target" ]
+ deps = [ ":trichrome_chrome_bundle" ]
bundle_path = "$root_build_dir/apks/TrichromeChrome.aab"
}
group("trichrome_minimal_apks") {
deps = [
- ":$_main_trichrome_library_apk_target",
":trichrome_chrome_minimal_apks",
+ ":trichrome_library_apk",
"//android_webview:trichrome_webview_minimal_apks",
]
}
@@ -3889,7 +3852,7 @@
deps = []
if (enable_libs_and_assets_verification) {
deps += [
- ":${_main_monochrome_public_bundle_target}_validate_libs_and_assets",
+ ":monochrome_public_bundle_validate_libs_and_assets",
":trichrome_chrome_bundle_validate_libs_and_assets",
":trichrome_library_apk_validate_libs_and_assets",
"//android_webview:trichrome_webview_bundle_validate_libs_and_assets",
@@ -3910,8 +3873,8 @@
}
if (enable_manifest_verification) {
deps += [
- ":${_main_monochrome_public_bundle_target}_validate_manifests",
- ":${_main_monochrome_public_bundle_target}_validate_proguard_config",
+ ":monochrome_public_bundle_validate_manifests",
+ ":monochrome_public_bundle_validate_proguard_config",
":trichrome_chrome_bundle__base_bundle_module_validate_android_manifest",
":trichrome_library_apk_validate_android_manifest",
"//android_webview:system_webview_base_bundle_module_validate_android_manifest",
diff --git a/chrome/android/expectations/lint-baseline.xml b/chrome/android/expectations/lint-baseline.xml
index 07d9e20..517c951 100644
--- a/chrome/android/expectations/lint-baseline.xml
+++ b/chrome/android/expectations/lint-baseline.xml
@@ -2388,7 +2388,7 @@
errorLine1=" <service android:name="org.chromium.android_webview.services.DeveloperUiService" android:foregroundServiceType="specialUse" android:exported="true" android:process=":webview_service" tools:ignore="ExportedService">"
errorLine2=" ^">
<location
- file="gen/chrome/android/monochrome_public_bundle__lint/AndroidManifest.xml"
+ file="gen/chrome/android/monochrome_public_bundle__lint/gen/chrome/android/monochrome_public_bundle__base_bundle_module/AndroidManifest.xml"
line="602"
column="5"/>
</issue>
@@ -2696,7 +2696,7 @@
errorLine1=" <application android:name="org.chromium.chrome.browser.base.SplitMonochromeApplication" android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="@string/app_name" android:memtagMode="async" android:largeHeap="false" android:manageSpaceActivity="@string/manage_space_activity" android:supportsRtl="true" android:zygotePreloadName="org.chromium.content_public.app.ZygotePreload" android:allowBackup="false" android:networkSecurityConfig="@xml/network_security_config" android:allowAudioPlaybackCapture="false" android:appComponentFactory="org.chromium.chrome.browser.base.SplitCompatAppComponentFactory" android:enableOnBackInvokedCallback="true" android:multiArch="true" android:extractNativeLibs="false">"
errorLine2=" ~~~~~">
<location
- file="gen/chrome/android/monochrome_public_bundle__lint/AndroidManifest.xml"
+ file="gen/chrome/android/monochrome_public_bundle__lint/gen/chrome/android/monochrome_public_bundle__base_bundle_module/AndroidManifest.xml"
line="250"
column="444"/>
</issue>
diff --git a/chromecast/android/lint-baseline.xml b/chromecast/android/lint-baseline.xml
index e8ef6f5..1017075ad 100644
--- a/chromecast/android/lint-baseline.xml
+++ b/chromecast/android/lint-baseline.xml
@@ -62,7 +62,7 @@
errorLine1="<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="org.chromium.chromecast.shell">"
errorLine2=" ~~~~~~~~">
<location
- file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml"
+ file="gen/chromecast/cast_shell_apk__lint/gen/cast_shell_manifest/AndroidManifest.xml"
line="2"
column="2"/>
</issue>
@@ -73,7 +73,7 @@
errorLine1="<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="org.chromium.chromecast.shell">"
errorLine2=" ~~~~~~~~">
<location
- file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml"
+ file="gen/chromecast/cast_shell_apk__lint/gen/cast_shell_manifest/AndroidManifest.xml"
line="2"
column="2"/>
</issue>
@@ -93,7 +93,7 @@
id="RtlEnabled"
message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
<location
- file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml"/>
+ file="gen/chromecast/cast_shell_apk__lint/gen/cast_shell_manifest/AndroidManifest.xml"/>
</issue>
</issues>
diff --git a/remoting/android/lint-baseline.xml b/remoting/android/lint-baseline.xml
index 22e4b3df..d73238c7 100644
--- a/remoting/android/lint-baseline.xml
+++ b/remoting/android/lint-baseline.xml
@@ -95,7 +95,7 @@
errorLine1=" <application android:label="@string/product_name_android" android:name="org.chromium.chromoting.RemotingApplication" android:icon="@mipmap/ic_launcher" android:theme="@style/BaseTheme" android:allowBackup="false" android:resizeableActivity="true" android:supportsPictureInPicture="false">"
errorLine2=" ~~~~~">
<location
- file="gen/remoting/android/remoting_apk__lint/AndroidManifest.xml"
+ file="gen/remoting/android/remoting_apk__lint/gen/remoting/android/AndroidManifest.xml"
line="16"
column="209"/>
</issue>
@@ -126,7 +126,7 @@
id="RtlEnabled"
message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
<location
- file="gen/remoting/android/remoting_apk__lint/AndroidManifest.xml"/>
+ file="gen/remoting/android/remoting_apk__lint/gen/remoting/android/AndroidManifest.xml"/>
</issue>
</issues>
