diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/android/modules | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/android/modules')
3 files changed, 6 insertions, 6 deletions
diff --git a/chromium/chrome/android/modules/chrome_bundle_tmpl.gni b/chromium/chrome/android/modules/chrome_bundle_tmpl.gni index 76b0d11a6a2..693df7e361d 100644 --- a/chromium/chrome/android/modules/chrome_bundle_tmpl.gni +++ b/chromium/chrome/android/modules/chrome_bundle_tmpl.gni @@ -77,19 +77,19 @@ template("chrome_bundle") { "base_module_target", "bundle_name", "compress_shared_libraries", + "expected_proguard_config", "keystore_name", "keystore_password", "keystore_path", + "lint_suppressions_dep", "lint_suppressions_file", "manifest_package", "min_sdk_version", "proguard_android_sdk_dep", - "proguard_jar_path", "sign_bundle", "static_library_provider", "static_library_synchronized_proguard", - "verify_proguard_flags", - "verify_native_libs_and_assets", + "expected_libs_and_assets", "version_code", ]) command_line_flags_file = "chrome-command-line" diff --git a/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn b/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn index 23ae81de902..acbf5c2329d 100644 --- a/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn +++ b/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn @@ -43,7 +43,8 @@ component("stack_unwinder") { ":jni_headers", ":jni_registration", "//base", - "//chrome/android/features/stack_unwinder/public:memory_regions_map", + "//base:native_unwinder_android", + "//chrome/android/features/stack_unwinder/public:native", ] # stack unwinder native entrypoints belong in the partition. diff --git a/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn b/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn index 0ea5726014b..488f5b253cd 100644 --- a/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn +++ b/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn @@ -20,8 +20,7 @@ source_set("module") { sources = [ "module.cc" ] deps = [ "//base", - "//chrome/android/features/stack_unwinder/public:memory_regions_map", + "//chrome/android/features/stack_unwinder/public:native", "//chrome/android/modules/stack_unwinder/provider:jni_headers", ] - libs = [ "dl" ] } |