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

Side by Side Diff: base/BUILD.gn

Issue 1418243003: Add GN template for android_assets(). Use it in content_shell_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | build/android/gyp/apkbuilder.py » ('j') | build/android/gyp/write_build_config.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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/config/compiler/compiler.gni") 5 import("//build/config/compiler/compiler.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 import("//third_party/icu/config.gni")
8 9
9 if (is_android) { 10 if (is_android) {
10 import("//build/config/android/rules.gni") 11 import("//build/config/android/rules.gni")
11 } 12 }
12 13
13 config("base_implementation") { 14 config("base_implementation") {
14 defines = [ "BASE_IMPLEMENTATION" ] 15 defines = [ "BASE_IMPLEMENTATION" ]
15 } 16 }
16 17
17 if (is_win) { 18 if (is_win) {
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 1015
1015 if (!is_debug) { 1016 if (!is_debug) {
1016 configs -= [ "//build/config/compiler:default_optimization" ] 1017 configs -= [ "//build/config/compiler:default_optimization" ]
1017 configs += [ "//build/config/compiler:optimize_max" ] 1018 configs += [ "//build/config/compiler:optimize_max" ]
1018 } 1019 }
1019 1020
1020 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1021 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1021 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 1022 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
1022 } 1023 }
1023 1024
1025 if (is_android) {
pkotwicz 2015/10/24 03:46:03 Shouldn't this ideally be in third_party/icu third
agrieve 2015/10/25 17:32:09 My thinking was that it was fine here since base/i
1026 android_assets("icu_assets") {
1027 if (icu_use_data_file) {
1028 deps = [
1029 "//third_party/icu:icudata",
1030 ]
1031 sources = [
1032 "$root_build_dir/icudtl.dat",
1033 ]
1034 }
1035 enable_compression = false
1036 }
1037 }
1038
1024 if (is_ios || is_win || (is_linux && !is_chromeos)) { 1039 if (is_ios || is_win || (is_linux && !is_chromeos)) {
1025 # TODO(GYP): Figure out which of these work and are needed on other platforms. 1040 # TODO(GYP): Figure out which of these work and are needed on other platforms.
1026 test("base_perftests") { 1041 test("base_perftests") {
1027 sources = [ 1042 sources = [
1028 "message_loop/message_pump_perftest.cc", 1043 "message_loop/message_pump_perftest.cc",
1029 1044
1030 # "test/run_all_unittests.cc", 1045 # "test/run_all_unittests.cc",
1031 "threading/thread_perftest.cc", 1046 "threading/thread_perftest.cc",
1032 ] 1047 ]
1033 deps = [ 1048 deps = [
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
1686 1701
1687 # GYP: //base.gyp:base_java_unittest_support 1702 # GYP: //base.gyp:base_java_unittest_support
1688 android_library("base_java_unittest_support") { 1703 android_library("base_java_unittest_support") {
1689 deps = [ 1704 deps = [
1690 ":base_java", 1705 ":base_java",
1691 ] 1706 ]
1692 java_files = 1707 java_files =
1693 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1708 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1694 } 1709 }
1695 } 1710 }
OLDNEW
« no previous file with comments | « no previous file | build/android/gyp/apkbuilder.py » ('j') | build/android/gyp/write_build_config.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698