Skip to content

Commit

Permalink
Reland "Android: Define paths to expectation files in leaf targets"
Browse files Browse the repository at this point in the history 
This reverts commit 44a0301.

Reason for reland: Wasn't the culprit (see bug)

Original change's description:
> Revert "Android: Define paths to expectation files in leaf targets"
>
> This reverts commit 4a914f2.
>
> Reason for revert: Build failure in https://ci.chromium.org/p/chrome/builders/ci/arm64-unpublished-builder and https://ci.chromium.org/p/chrome/builders/official/android-arm-official-next
>
> Possible reason might be renaming //chrome/android:monochrome_public_bundle__base_libs_and_assets_expectations and //chrome/android:trichrome_chrome_bundle__base_libs_and_assets_expectations
>
> Original change's description:
> > Android: Define paths to expectation files in leaf targets
> >
> > This is easier to follow then deriving it in the templates.
> >
> > Also changes webview expectations apk->bundle
> >
> > Bug: 1095654
> > Change-Id: I5952ee9a660e4f32b22ef4100fea2f231d9eb96d
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2245880
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Reviewed-by: Richard Coles <torne@chromium.org>
> > Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#780157}
>
> TBR=torne@chromium.org,agrieve@chromium.org,mheikal@chromium.org
>
> Change-Id: I8ef314098ae3949d21fc885b885b467314f6d695
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1096987
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2252344
> Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
> Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#780271}

TBR=torne@chromium.org,agrieve@chromium.org,mheikal@chromium.org,triploblastic@chromium.org

No-Presubmit: true
Bug: 1096987
Change-Id: I67937a8b09d9ecca0be3356ae17fc517c8be5ce0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2254438
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780314}
  • Loading branch information
@agrieve
agrieve authored and Commit Bot committed Jun 19, 2020
1 parent d3eaf40 commit f1d7031
Show file tree
Hide file tree
Showing 25 changed files with 185 additions and 226 deletions.
35 changes: 17 additions & 18 deletions android_webview/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ if (enable_resource_whitelist_generation) {
"$target_gen_dir/system_webview_pak_whitelist.txt"
}

# Having //clank present causes different flags because of how play services
# is wired up.
# The channel is required because manifest entries vary based on channel.
_verify_android_configuration =
!is_java_debug && !enable_chrome_android_internal &&
android_channel == "stable"

template("standalone_system_webview_apk_tmpl") {
system_webview_apk_or_module_tmpl(target_name) {
forward_variables_from(invoker, "*")
Expand All @@ -38,15 +45,6 @@ template("standalone_system_webview_apk_tmpl") {
# Standalone WebView APK.
standalone_system_webview_apk_tmpl("system_webview_apk") {
apk_name = "SystemWebView"

# Having //clank present causes different flags because of how play services
# is wired up.
# The channel is required because manifest entries vary based on channel.
_verify_android_configuration =
!enable_chrome_android_internal && android_channel == "stable"
if (_verify_android_configuration) {
verify_manifest = true
}
}

# This version of the WebView APK doesn't include WebLayer java and resources.
Expand All @@ -61,6 +59,11 @@ if (enable_webview_bundles) {
standalone_system_webview_apk_tmpl("system_webview_base_bundle_module") {
target_type = "android_app_bundle_module"
is_base_module = true

if (_verify_android_configuration) {
expected_android_manifest =
"expectations/system_webview_bundle.AndroidManifest.expected"
}
}

system_webview_bundle("system_webview_bundle") {
Expand Down Expand Up @@ -136,21 +139,17 @@ trichrome_webview_tmpl("trichrome_webview_apk") {
if (!is_java_debug) {
static_library_synchronized_proguard = trichrome_synchronized_proguard
}

# Having //clank present causes different flags because of how play services
# is wired up.
# The channel is required because manifest entries vary based on channel.
_verify_android_configuration =
!enable_chrome_android_internal && android_channel == "stable"
if (_verify_android_configuration) {
verify_manifest = true
}
}

if (enable_webview_bundles) {
trichrome_webview_tmpl("trichrome_webview_base_bundle_module") {
target_type = "android_app_bundle_module"
is_base_module = true

if (_verify_android_configuration) {
expected_android_manifest =
"expectations/trichrome_webview_bundle.AndroidManifest.expected"
}
}

system_webview_bundle("trichrome_webview_bundle") {
Expand Down
4 changes: 4 additions & 0 deletions android_webview/expectations/OWNERS
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Anyone can approve expectation updates. These expectation files exist to
# prevent changing them without knowing, and to provide a git history of
# changes to these important aggregated files.
*
2 changes: 2 additions & 0 deletions android_webview/expectations/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
For more details about these expectation files, refer to documentation at
[//chrome/android/expectations/README.md](/chrome/android/expectations/README.md)
0 ...stem_webview_apk.AndroidManifest.expected → ...m_webview_bundle.AndroidManifest.expected
View file
File renamed without changes.
0 ...rome_webview_apk.AndroidManifest.expected → ...e_webview_bundle.AndroidManifest.expected
View file
File renamed without changes.
157 changes: 56 additions & 101 deletions build/config/android/internal_rules.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1180,45 +1180,39 @@ if (enable_java_templates) {
_args += invoker.args
}

if (defined(invoker.verify_proguard_flags_target_name)) {
_expectations_target = "${invoker.verify_proguard_flags_target_name}" +
"_proguard_expectations"
if (defined(invoker.expected_proguard_config)) {
_expectations_target =
"${invoker.top_target_name}_validate_proguard_config"
action_with_pydeps(_expectations_target) {
_expected_configs_file =
get_label_info(":${invoker.verify_proguard_flags_target_name}",
"dir") +
"/java/${invoker.verify_proguard_flags_target_name}" +
".proguard_flags.expected"
_failed_proguard_expectation_file =
"$android_configuration_failure_dir/" +
string_replace(_expected_configs_file, "/", "_")
_expectation_stamp = "${target_gen_dir}/${_expectations_target}.stamp"
if (fail_on_android_expectations) {
args += [ "--fail-on-expectations" ]
}
script = _script

# Need to depend on all deps so that proguard.txt within .aar files get
# extracted.
deps = _deps
pool = _pool
depfile = "${target_gen_dir}/${target_name}.d"
inputs = [
invoker.build_config,
_expected_configs_file,
invoker.expected_proguard_config,
]
_failure_file =
"$android_configuration_failure_dir/" +
string_replace(invoker.expected_proguard_config, "/", "_")
_expectation_stamp = "$target_gen_dir/$target_name.stamp"
outputs = [ _expectation_stamp ]
args = _args + [
"--depfile",
rebase_path(depfile, root_build_dir),
"--proguard-expectations-failure-file",
rebase_path(_failed_proguard_expectation_file, root_build_dir),
rebase_path(_failure_file, root_build_dir),
"--expected-configs-file",
rebase_path(_expected_configs_file, root_build_dir),
rebase_path(invoker.expected_proguard_config, root_build_dir),
"--stamp",
rebase_path(_expectation_stamp, root_build_dir),
"--only-verify-expectations",
]
if (fail_on_android_expectations) {
args += [ "--fail-on-expectations" ]
}
}
_deps += [ ":$_expectations_target" ]
}
Expand Down Expand Up @@ -1355,13 +1349,14 @@ if (enable_java_templates) {
"deps",
"disable_checkdiscard",
"disable_r8_outlining",
"expected_proguard_config",
"is_static_library",
"modules",
"proguard_mapping_path",
"proguard_sourcefile_suffix",
"supports_jdk_library_desugaring",
"testonly",
"verify_proguard_flags_target_name",
"top_target_name",
"visibiity",
])
inputs = []
Expand Down Expand Up @@ -2531,43 +2526,26 @@ if (enable_java_templates) {
_args += [ "--is-bundle-module" ]
}

if (defined(invoker.verify_manifest_target_name)) {
if (defined(invoker.expected_android_manifest)) {
_expectations_target =
"${invoker.verify_manifest_target_name}_manifest_expectations"
"${invoker.top_target_name}_validate_android_manifest"
action_with_pydeps(_expectations_target) {
_target_src_dir = get_label_info(":$target_name", "dir")
_normalized_output = "${invoker.android_manifest}.normalized"
_manifest_expectations_failure_filepath =
_failure_file =
"$android_configuration_failure_dir/" +
"${invoker.verify_manifest_target_name}.AndroidManifest.failed"
string_replace(invoker.expected_android_manifest, "/", "_")
inputs = [
invoker.android_manifest,
invoker.build_config,
invoker.expected_android_manifest,
]
if (defined(invoker.expected_manifest_base_expectation)) {
if (defined(invoker.expected_android_manifest_base)) {
_args += [
"--expected-manifest-base-expectation",
rebase_path(invoker.expected_manifest_base_expectation,
root_build_dir),
rebase_path(invoker.expected_android_manifest_base, root_build_dir),
]
inputs += [ invoker.expected_manifest_base_expectation ]

# When invoker.expected_manifest_base_expectation is defined, we use
# a different file extension to indicate that the expected file is a
# diff file.
# In addition, we set expected_manifest_base_expectation only for
# internal targets, therefore, the expected file is in a different
# directory.
_expected_file =
"$_target_src_dir/" +
"${invoker.verify_manifest_target_name}.AndroidManifest" +
".diff.expected"
} else {
_expected_file =
"$_target_src_dir/java/" +
"${invoker.verify_manifest_target_name}.AndroidManifest.expected"
inputs += [ invoker.expected_android_manifest_base ]
}
inputs += [ _expected_file ]
if (fail_on_android_expectations) {
_args += [ "--fail-on-expectations" ]
}
Expand All @@ -2580,12 +2558,11 @@ if (enable_java_templates) {
script = _script
args = _args + [
"--expected-file",
rebase_path(_expected_file, root_build_dir),
rebase_path(invoker.expected_android_manifest, root_build_dir),
"--android-manifest-normalized",
rebase_path(_normalized_output, root_build_dir),
"--android-manifest-expectations-failure-file",
rebase_path(_manifest_expectations_failure_filepath,
root_build_dir),
rebase_path(_failure_file, root_build_dir),
"--only-verify-expectations",
]
}
Expand Down Expand Up @@ -2700,9 +2677,8 @@ if (enable_java_templates) {
# keystore_password: Keystore password.
# uncompress_shared_libraries: (optional, default false) Whether to store
# native libraries inside the APK uncompressed and page-aligned.
# verify_native_libs_and_assets_target_name: (optional): If set, will verify
# the list of included native libraries and assets is consistent with an
# expectation file.
# expected_libs_and_assets: (optional): Verify the list of included native
# libraries and assets is consistent with the given expectation file.
template("package_apk") {
forward_variables_from(invoker,
[
Expand Down Expand Up @@ -2828,43 +2804,33 @@ if (enable_java_templates) {
_args += [ "--secondary-native-lib-placeholders=$_secondary_native_lib_placeholders" ]
}

if (defined(invoker.verify_native_libs_and_assets_target_name)) {
if (defined(invoker.expected_libs_and_assets)) {
_expectations_target =
"${invoker.verify_native_libs_and_assets_target_name}" +
"_libs_and_assets_expectations"
"${invoker.top_target_name}_validate_libs_and_assets"
action_with_pydeps(_expectations_target) {
_stamp = "$target_gen_dir/$target_name.stamp"
_target_src_dir = get_label_info(":$target_name", "dir")
_expected_native_libs_and_assets =
"$_target_src_dir/java/" +
"${invoker.verify_native_libs_and_assets_target_name}." +
"${target_cpu}.native_libs_and_assets.expected"
_native_libs_and_assets_expectation_failure_filepath =
_failure_file =
"$android_configuration_failure_dir/" +
"${invoker.verify_native_libs_and_assets_target_name}." +
"${target_cpu}.native_libs_and_assets.failed"
if (fail_on_android_expectations) {
_args += [ "--fail-on-expectations" ]
}

string_replace(invoker.expected_libs_and_assets, "/", "_")
inputs = [
invoker.build_config,
_expected_native_libs_and_assets,
invoker.expected_libs_and_assets,
]
deps = [ invoker.build_config_dep ]
outputs = [ _stamp ]
script = _script
args =
_args + [
"--expected-native-libs-and-assets",
rebase_path(_expected_native_libs_and_assets, root_build_dir),
"--native-libs-and-assets-expectation-failure-file",
rebase_path(_native_libs_and_assets_expectation_failure_filepath,
root_build_dir),
"--stamp",
rebase_path(_stamp, root_build_dir),
"--only-verify-expectations",
]
args = _args + [
"--expected-native-libs-and-assets",
rebase_path(invoker.expected_libs_and_assets, root_build_dir),
"--native-libs-and-assets-expectation-failure-file",
rebase_path(_failure_file, root_build_dir),
"--stamp",
rebase_path(_stamp, root_build_dir),
"--only-verify-expectations",
]
if (fail_on_android_expectations) {
args += [ "--fail-on-expectations" ]
}
}
_deps += [ ":$_expectations_target" ]
}
Expand Down Expand Up @@ -3880,9 +3846,8 @@ if (enable_java_templates) {
# packaged into each module.
# is_multi_abi: If true will add a library placeholder for the missing ABI if
# either the primary or the secondary ABI has no native libraries set.
# verify_native_libs_and_assets_target_name: (optional): If set, will verify
# the list of included native libraries and assets is consistent with an
# expectation file.
# expected_libs_and_assets: (optional): Verify the list of included native
# libraries and assets is consistent with the given expectation file.
# proguard_enabled: Optional. True if proguarding is enabled for this
# bundle. Default is to enable this only for release builds. Note that
# this will always perform synchronized proguarding.
Expand Down Expand Up @@ -3976,26 +3941,14 @@ template("create_android_app_bundle_module") {
]
}

if (defined(invoker.verify_native_libs_and_assets_target_name)) {
_expectations_target =
"${invoker.verify_native_libs_and_assets_target_name}" +
"_libs_and_assets_expectations"
if (defined(invoker.expected_libs_and_assets)) {
_expectations_target = "${invoker.top_target_name}_validate_libs_and_assets"
action_with_pydeps(_expectations_target) {
_stamp = "$target_gen_dir/$target_name.stamp"
_target_src_dir = get_label_info(":$target_name", "dir")
_expected_native_libs_and_assets =
"$_target_src_dir/java/" +
"${invoker.verify_native_libs_and_assets_target_name}." +
"${target_cpu}.native_libs_and_assets.expected"
_native_libs_and_assets_expectation_failure_filepath =
"$android_configuration_failure_dir/" +
"${invoker.verify_native_libs_and_assets_target_name}." +
"${target_cpu}.native_libs_and_assets.failed"
if (fail_on_android_expectations) {
_args += [ "--fail-on-expectations" ]
}
_failure_file = "$android_configuration_failure_dir/" +
string_replace(invoker.expected_libs_and_assets, "/", "_")
inputs = [
_expected_native_libs_and_assets,
invoker.expected_libs_and_assets,
invoker.build_config,
invoker.native_libraries_config,
]
Expand All @@ -4011,14 +3964,16 @@ template("create_android_app_bundle_module") {
script = _script
args = _args + [
"--expected-native-libs-and-assets",
rebase_path(_expected_native_libs_and_assets, root_build_dir),
rebase_path(invoker.expected_libs_and_assets, root_build_dir),
"--native-libs-and-assets-expectation-failure-file",
rebase_path(_native_libs_and_assets_expectation_failure_filepath,
root_build_dir),
rebase_path(_failure_file, root_build_dir),
"--stamp",
rebase_path(_stamp, root_build_dir),
"--only-verify-expectations",
]
if (fail_on_android_expectations) {
args += [ "--fail-on-expectations" ]
}
}
_deps += [ ":$_expectations_target" ]
}
Expand Down
Loading

0 comments on commit f1d7031

Please sign in to comment.