Commit 67c91b19 authored by sdefresne's avatar sdefresne Committed by Commit bot

Add //ios/chrome/app/resources group target.

Rename old target //ios/chrome/app/resources to the more correct name
//ios/chrome/app/resources:ios_resources.

Add a new group target //ios/chrome/app/resources to allow multiple
target to get all resources required in the application bundle and
to act as "chrome" target (i.e. EarlGrey tests).

BUG=672516

Review-Url: https://codereview.chromium.org/2563023002
Cr-Commit-Position: refs/heads/master@{#437846}
parent 0861de9d
...@@ -3,12 +3,14 @@ ...@@ -3,12 +3,14 @@
# found in the LICENSE file. # found in the LICENSE file.
import("//ios/build/config.gni") import("//ios/build/config.gni")
import("//ios/public/provider/chrome/browser/build_config.gni")
import("//testing/test.gni") import("//testing/test.gni")
test("ios_chrome_unittests") { test("ios_chrome_unittests") {
deps = [ deps = [
# Ensure that all unit tests are run. # Ensure that all unit tests are run and packed resources available.
"//ios/chrome/test:run_all_unittests", "//ios/chrome/test:run_all_unittests",
ios_packed_resources_target,
# Add unit_tests target here. # Add unit_tests target here.
"//ios/chrome/app:unit_tests", "//ios/chrome/app:unit_tests",
......
...@@ -10,7 +10,17 @@ import("//ios/chrome/tools/strings/generate_localizable_strings.gni") ...@@ -10,7 +10,17 @@ import("//ios/chrome/tools/strings/generate_localizable_strings.gni")
import("//ios/public/provider/chrome/browser/build_config.gni") import("//ios/public/provider/chrome/browser/build_config.gni")
import("//tools/grit/grit_rule.gni") import("//tools/grit/grit_rule.gni")
grit("resources") { group("resources") {
public_deps = [
":launchscreen_xib",
":quick_action_icons",
":system_strings",
ios_application_icons_target,
ios_packed_resources_target,
]
}
grit("ios_resources") {
source = "ios_resources.grd" source = "ios_resources.grd"
output_dir = "$root_gen_dir/ios/chrome" output_dir = "$root_gen_dir/ios/chrome"
use_qualified_include = true use_qualified_include = true
...@@ -53,7 +63,7 @@ repack("repack_unscaled_resources") { ...@@ -53,7 +63,7 @@ repack("repack_unscaled_resources") {
"$root_gen_dir/ui/resources/webui_resources.pak", "$root_gen_dir/ui/resources/webui_resources.pak",
] ]
deps = [ deps = [
":resources", ":ios_resources",
"//components/resources", "//components/resources",
"//ios/web:resources", "//ios/web:resources",
"//net:net_resources", "//net:net_resources",
......
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