diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/chrome/android/features/dev_ui | |
parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/android/features/dev_ui')
-rw-r--r-- | chromium/chrome/android/features/dev_ui/BUILD.gn | 5 | ||||
-rw-r--r-- | chromium/chrome/android/features/dev_ui/dev_ui_module.gni | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chromium/chrome/android/features/dev_ui/BUILD.gn b/chromium/chrome/android/features/dev_ui/BUILD.gn index 7185d8eb3c2..235eda604e3 100644 --- a/chromium/chrome/android/features/dev_ui/BUILD.gn +++ b/chromium/chrome/android/features/dev_ui/BUILD.gn @@ -22,11 +22,10 @@ android_library("java") { } android_assets("pak_assets") { - renaming_sources = - [ "$root_gen_dir/chrome/bluetooth_internals_resources.pak" ] + renaming_sources = [ "$root_gen_dir/chrome/dev_ui_page_resources.pak" ] renaming_destinations = [ "dev_ui_resources.pak" ] deps = [ - "//chrome/browser/resources/bluetooth_internals:resources", + "//chrome/browser/resources:dev_ui_paks", ] disable_compression = true } diff --git a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni index 683a7197681..c8b6120c36e 100644 --- a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni +++ b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni @@ -5,11 +5,14 @@ declare_args() { # Whether Developer UI (chrome:// pages) should be split into a separate # Dynamic Feature Module (DFM: //docs/android_dynamic_feature_modules.md). - dfmify_dev_ui = false + dfmify_dev_ui = true } dev_ui_module_desc = { name = "dev_ui" + + # These deps are also used to support non-bundle flows, e.g., APK builds and + # unit tests. java_deps = [ "//chrome/android/features/dev_ui:java", "//chrome/android/features/dev_ui:pak_assets", |