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

Side by Side Diff: base/BUILD.gn

Issue 1611363003: Add support for iOS application bundle to GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-bundles
Patch Set: Filter .xcassets from the copy_bundle_data step Created 4 years, 11 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 | « no previous file | build/config/ios/BuildInfo.plist » ('j') | build/config/ios/rules.gni » ('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 # HOW TO WRITE CONDITIONALS IN THIS FILE 5 # HOW TO WRITE CONDITIONALS IN THIS FILE
6 # ====================================== 6 # ======================================
7 # 7 #
8 # In many other places, one would write a conditional that expresses all the 8 # In many other places, one would write a conditional that expresses all the
9 # cases when a source file is used or unused, and then either add or subtract 9 # cases when a source file is used or unused, and then either add or subtract
10 # it from the sources list in that case 10 # it from the sources list in that case
(...skipping 1859 matching lines...) Expand 10 before | Expand all | Expand 10 after
1870 "//third_party/icu", 1870 "//third_party/icu",
1871 ] 1871 ]
1872 1872
1873 # Some unittests depend on the ALLOCATOR_SHIM macro. 1873 # Some unittests depend on the ALLOCATOR_SHIM macro.
1874 configs += [ "//base/allocator:allocator_shim_define" ] 1874 configs += [ "//base/allocator:allocator_shim_define" ]
1875 1875
1876 data = [ 1876 data = [
1877 "test/data/", 1877 "test/data/",
1878 ] 1878 ]
1879 1879
1880 if (is_ios) {
1881 bundle_test_name = "baseunittests"
Dirk Pranke 2016/01/29 00:54:25 are underscores not allowed in the application ids
sdefresne 2016/02/05 10:20:00 They are, but when using gyp, //testing/gtest.gyp
Dirk Pranke 2016/02/10 01:18:13 Okay. We should probably preserve compatibility, t
1882 test_data_files = [
Dirk Pranke 2016/01/29 00:54:25 I think having to specify *every* test file may en
sdefresne 2016/02/05 10:20:00 I agree that not listing all the files would make
Dirk Pranke 2016/02/10 01:18:12 True. Maybe we should modify copy() to allow a rec
1883 "test/data/file_util/binary_file.bin",
1884 "test/data/file_util/binary_file_diff.bin",
1885 "test/data/file_util/binary_file_same.bin",
1886 "test/data/file_util/blank_line.txt",
1887 "test/data/file_util/blank_line_crlf.txt",
1888 "test/data/file_util/crlf.txt",
1889 "test/data/file_util/different.txt",
1890 "test/data/file_util/different_first.txt",
1891 "test/data/file_util/different_last.txt",
1892 "test/data/file_util/empty1.txt",
1893 "test/data/file_util/empty2.txt",
1894 "test/data/file_util/first1.txt",
1895 "test/data/file_util/first2.txt",
1896 "test/data/file_util/original.txt",
1897 "test/data/file_util/red.png",
1898 "test/data/file_util/same.txt",
1899 "test/data/file_util/same_length.txt",
1900 "test/data/file_util/shortened.txt",
1901 "test/data/file_version_info_unittest/FileVersionInfoTest1.dll",
1902 "test/data/file_version_info_unittest/FileVersionInfoTest2.dll",
1903 "test/data/json/bom_feff.json",
1904 "test/data/pe_image/pe_image_test_32.dll",
1905 "test/data/pe_image/pe_image_test_64.dll",
1906 "test/data/prefs/invalid.json",
1907 "test/data/prefs/read.json",
1908 "test/data/prefs/write.golden.json",
1909 "test/data/serializer_nested_test.json",
1910 "test/data/serializer_test.json",
1911 "test/data/serializer_test_nowhitespace.json",
1912 ]
1913 }
1914
1880 # Allow more direct string conversions on platforms with native utf8 1915 # Allow more direct string conversions on platforms with native utf8
1881 # strings 1916 # strings
1882 if (is_mac || is_ios || is_chromeos) { 1917 if (is_mac || is_ios || is_chromeos) {
1883 defines = [ "SYSTEM_NATIVE_UTF8" ] 1918 defines = [ "SYSTEM_NATIVE_UTF8" ]
1884 } 1919 }
1885 1920
1886 if (is_android) { 1921 if (is_android) {
1887 deps += [ 1922 deps += [
1888 ":base_java", 1923 ":base_java",
1889 ":base_java_unittest_support", 1924 ":base_java_unittest_support",
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
2138 2173
2139 # GYP: //base.gyp:base_java_unittest_support 2174 # GYP: //base.gyp:base_java_unittest_support
2140 android_library("base_java_unittest_support") { 2175 android_library("base_java_unittest_support") {
2141 deps = [ 2176 deps = [
2142 ":base_java", 2177 ":base_java",
2143 ] 2178 ]
2144 java_files = 2179 java_files =
2145 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 2180 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
2146 } 2181 }
2147 } 2182 }
OLDNEW
« no previous file with comments | « no previous file | build/config/ios/BuildInfo.plist » ('j') | build/config/ios/rules.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698