Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Side by Side Diff: ui/base/BUILD.gn

Issue 1922023002: 🐻 Fix ui_base_unittests on Android Swarming (adds missing data) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gen-isolates-android
Patch Set: @classmethod Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/android/pylib/utils/isolator.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/sanitizers/sanitizers.gni") 7 import("//build/config/sanitizers/sanitizers.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//ui/base/ui_features.gni") 10 import("//ui/base/ui_features.gni")
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 ] 923 ]
924 } 924 }
925 925
926 if (is_chromeos) { 926 if (is_chromeos) {
927 deps += [ 927 deps += [
928 "//chromeos", 928 "//chromeos",
929 "//ui/events:dom_keycode_converter", 929 "//ui/events:dom_keycode_converter",
930 ] 930 ]
931 } 931 }
932 932
933 if (is_linux || is_mac || is_win) { 933 if (is_android || is_linux || is_mac || is_win) {
934 # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak 934 # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
935 # instead of depending directly on the non-test .pak files, but depending 935 # instead of depending directly on the non-test .pak files, but depending
936 # on ui_test_pak seems to have no effect. 936 # on ui_test_pak seems to have no effect.
937 data += [ 937 data += [
938 "test/data/data_pack_unittest/truncated-header.pak", 938 "test/data/data_pack_unittest/truncated-header.pak",
939 "$root_out_dir/ui_test.pak", # TODO(brettw): remove this line. 939 "$root_out_dir/ui_test.pak", # TODO(brettw): remove this line.
940 ] 940 ]
941 data_deps += [ 941 data_deps += [
942 "//ui/resources:ui_test_pak", # TODO(brettw): this does nothing. 942 "//ui/resources:ui_test_pak", # TODO(brettw): this does nothing.
943 "//third_party/mesa:osmesa", 943 "//third_party/mesa:osmesa",
944 ] 944 ]
945 } else if (is_android) {
946 data += [ "test/data/data_pack_unittest/truncated-header.pak" ]
947 } 945 }
948 if (is_linux || is_win) { 946 if (is_linux || is_win) {
949 data += [ 947 data += [
950 # TODO(brettw): Remove these two lines. 948 # TODO(brettw): Remove these two lines.
951 "$root_out_dir/ui/en-US.pak", 949 "$root_out_dir/ui/en-US.pak",
952 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", 950 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
953 ] 951 ]
954 } 952 }
955 if (is_mac) { 953 if (is_mac) {
956 data += [ "$root_out_dir/ui_unittests Framework.framework/" ] 954 data += [ "$root_out_dir/ui_unittests Framework.framework/" ]
957 955
958 if (is_asan && symbol_level == 0) { 956 if (is_asan && symbol_level == 0) {
959 # TODO(crbug.com/330301): make this conditional on mac_strip_release. 957 # TODO(crbug.com/330301): make this conditional on mac_strip_release.
960 # data += [ "$root_out_dir/ui_base_unittests.dSYM/" ] 958 # data += [ "$root_out_dir/ui_base_unittests.dSYM/" ]
961 } 959 }
962 } 960 }
963 } 961 }
964 962
965 if (is_mac) { 963 if (is_mac) {
966 mac_framework_bundle("ui_unittests_framework") { 964 mac_framework_bundle("ui_unittests_framework") {
967 testonly = true 965 testonly = true
968 deps = [ 966 deps = [
969 "//ui/resources:ui_test_pak_bundle_data", 967 "//ui/resources:ui_test_pak_bundle_data",
970 ] 968 ]
971 info_plist = "test/framework-Info.plist" 969 info_plist = "test/framework-Info.plist"
972 output_name = "ui_unittests Framework" 970 output_name = "ui_unittests Framework"
973 } 971 }
974 } 972 }
OLDNEW
« no previous file with comments | « build/android/pylib/utils/isolator.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698