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

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: review1 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') | no next file with comments »
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_flags") { 14 config("base_flags") {
14 if (is_clang) { 15 if (is_clang) {
15 cflags = [ 16 cflags = [
16 # Don't die on dtoa code that uses a char as an array index. 17 # Don't die on dtoa code that uses a char as an array index.
17 # This is required solely for base/third_party/dmg_fp/dtoa_wrapper.cc. 18 # This is required solely for base/third_party/dmg_fp/dtoa_wrapper.cc.
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 1026
1026 if (!is_debug) { 1027 if (!is_debug) {
1027 configs -= [ "//build/config/compiler:default_optimization" ] 1028 configs -= [ "//build/config/compiler:default_optimization" ]
1028 configs += [ "//build/config/compiler:optimize_max" ] 1029 configs += [ "//build/config/compiler:optimize_max" ]
1029 } 1030 }
1030 1031
1031 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1032 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1032 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 1033 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
1033 } 1034 }
1034 1035
1036 if (is_android) {
1037 android_assets("icu_assets") {
brettw 2015/10/25 23:51:22 Can this be in the ICU file instead of base?
agrieve 2015/10/26 15:43:48 pkotwicz suggested this as well, but I think it's
1038 if (icu_use_data_file) {
1039 deps = [
1040 "//third_party/icu:icudata",
1041 ]
1042 sources = [
1043 "$root_build_dir/icudtl.dat",
1044 ]
1045 }
1046 disable_compression = true
1047 }
1048 }
1049
1035 if (is_ios || is_win || (is_linux && !is_chromeos)) { 1050 if (is_ios || is_win || (is_linux && !is_chromeos)) {
1036 # TODO(GYP): Figure out which of these work and are needed on other platforms. 1051 # TODO(GYP): Figure out which of these work and are needed on other platforms.
1037 test("base_perftests") { 1052 test("base_perftests") {
1038 sources = [ 1053 sources = [
1039 "message_loop/message_pump_perftest.cc", 1054 "message_loop/message_pump_perftest.cc",
1040 1055
1041 # "test/run_all_unittests.cc", 1056 # "test/run_all_unittests.cc",
1042 "threading/thread_perftest.cc", 1057 "threading/thread_perftest.cc",
1043 ] 1058 ]
1044 deps = [ 1059 deps = [
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
1697 1712
1698 # GYP: //base.gyp:base_java_unittest_support 1713 # GYP: //base.gyp:base_java_unittest_support
1699 android_library("base_java_unittest_support") { 1714 android_library("base_java_unittest_support") {
1700 deps = [ 1715 deps = [
1701 ":base_java", 1716 ":base_java",
1702 ] 1717 ]
1703 java_files = 1718 java_files =
1704 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1719 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1705 } 1720 }
1706 } 1721 }
OLDNEW
« no previous file with comments | « no previous file | build/android/gyp/apkbuilder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698