0

chrome_modern_bundle deletion: Removing chrome_modern_module_descs

Since chrome_modern_bundle is gone, the module descriptors no longer
need to exist.

Bug: 1366416
Change-Id: Iad911c769baf019530f78c2882f7a58bf95f8344
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4262690
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1106466}
This commit is contained in:
Sam Maier
2023-02-16 22:24:05 +00:00
committed by Chromium LUCI CQ
parent 163a97a8bc
commit 30cbc6fce6
3 changed files with 6 additions and 11 deletions

@@ -3742,7 +3742,6 @@ template("libchrome_impl") {
deps += [ "//chrome/browser/android/vr:module_factory" ] deps += [ "//chrome/browser/android/vr:module_factory" ]
} }
module_descs = chrome_modern_module_descs
forward_variables_from(invoker, "*", [ "deps" ]) forward_variables_from(invoker, "*", [ "deps" ])
} }
} }

@@ -39,20 +39,17 @@ if (enable_arcore) {
# paks: (Optional) PAKs going into module. # paks: (Optional) PAKs going into module.
# Each new module needs to add a desc to one of the lists below. # Each new module needs to add a desc to one of the lists below.
# Modules shipped in Chrome Modern (Android L+). # Modules shipped in Monochrome (Android N+).
chrome_modern_module_descs = [ monochrome_module_descs = [
test_dummy_module_desc, test_dummy_module_desc,
stack_unwinder_module_desc, stack_unwinder_module_desc,
] ]
if (enable_vr) { if (enable_vr) {
chrome_modern_module_descs += [ vr_module_desc ] monochrome_module_descs += [ vr_module_desc ]
} }
if (dfmify_dev_ui) { if (dfmify_dev_ui) {
chrome_modern_module_descs += [ dev_ui_module_desc ] monochrome_module_descs += [ dev_ui_module_desc ]
} }
# Modules shipped in Monochrome (Android N+).
monochrome_module_descs = chrome_modern_module_descs
if (false) { # AR DFM is currently disabled if (false) { # AR DFM is currently disabled
monochrome_module_descs += [ ar_module_desc ] monochrome_module_descs += [ ar_module_desc ]
} }

@@ -144,13 +144,12 @@ foo_module_desc = {
``` ```
Then, add the module descriptor to the appropriate descriptor list in Then, add the module descriptor to the appropriate descriptor list in
//chrome/android/modules/chrome_feature_modules.gni, e.g. the Chrome Modern //chrome/android/modules/chrome_feature_modules.gni, e.g. the Monochrome list:
list:
```gn ```gn
import("//chrome/android/modules/foo/foo_module.gni") import("//chrome/android/modules/foo/foo_module.gni")
... ...
chrome_modern_module_descs += [ foo_module_desc ] monochrome_module_descs += [ foo_module_desc ]
``` ```
The next step is to add Foo to the list of feature modules for UMA recording. The next step is to add Foo to the list of feature modules for UMA recording.