Commit 1b40b498 authored by Samuel Huang's avatar Samuel Huang Committed by Commit Bot

[DevUI DFM] Make DevUI DFM Java classes and resources available for unit_tests.

This CL applies a similar fix as http://crrev.com/c/1807069 (for APK
breakage) to unit_tests. In addition, we also include DevUI DFM classes
that are in the base module.

This change will be needed for tests to work, once the set of chosen
DevUI pages are associated en mass with the DevUI DFM.

Bug: 927131
Change-Id: I4caa7fba245b77aed3b880846c436a2fc9e99ca8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1835066
Commit-Queue: Samuel Huang <huangs@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702729}
parent d59cd9cc
...@@ -10,6 +10,9 @@ declare_args() { ...@@ -10,6 +10,9 @@ declare_args() {
dev_ui_module_desc = { dev_ui_module_desc = {
name = "dev_ui" name = "dev_ui"
# These deps are also used to support non-bundle flows, e.g., APK builds and
# unit tests.
java_deps = [ java_deps = [
"//chrome/android/features/dev_ui:java", "//chrome/android/features/dev_ui:java",
"//chrome/android/features/dev_ui:pak_assets", "//chrome/android/features/dev_ui:pak_assets",
......
...@@ -39,6 +39,7 @@ assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome") ...@@ -39,6 +39,7 @@ assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome")
if (is_android) { if (is_android) {
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
import("//chrome/android/features/dev_ui/dev_ui_module.gni")
import("//tools/v8_context_snapshot/v8_context_snapshot.gni") import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
} else { } else {
include_js_tests = !(is_asan || is_msan || is_tsan) include_js_tests = !(is_asan || is_msan || is_tsan)
...@@ -3663,6 +3664,15 @@ test("unit_tests") { ...@@ -3663,6 +3664,15 @@ test("unit_tests") {
} else { } else {
deps += [ "//v8:v8_external_startup_data_assets" ] deps += [ "//v8:v8_external_startup_data_assets" ]
} }
if (dfmify_dev_ui) {
# If DevUI DFM is on, include Java classes and native resource split so
# that DevUI page tests would work.
deps += [
"//chrome/android/features/dev_ui:java",
"//chrome/android/features/dev_ui:pak_assets",
"//chrome/android/modules/dev_ui/provider:java",
]
}
srcjar_deps = [ srcjar_deps = [
"//components/module_installer/android:module_installer_build_config", "//components/module_installer/android:module_installer_build_config",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment