Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/nacl/config.gni") | 6 import("//build/config/nacl/config.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//testing/test.gni") | 8 import("//testing/test.gni") |
| 9 | 9 |
| 10 if (is_android) { | 10 if (is_android) { |
| (...skipping 1713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1724 "android/library_loader/library_loader_hooks.h", | 1724 "android/library_loader/library_loader_hooks.h", |
| 1725 "memory/memory_pressure_listener.h", | 1725 "memory/memory_pressure_listener.h", |
| 1726 ] | 1726 ] |
| 1727 } | 1727 } |
| 1728 | 1728 |
| 1729 # GYP: //base/base.gyp:base_multidex_gen | 1729 # GYP: //base/base.gyp:base_multidex_gen |
| 1730 java_cpp_template("base_multidex_gen") { | 1730 java_cpp_template("base_multidex_gen") { |
| 1731 sources = [ | 1731 sources = [ |
| 1732 "android/java/templates/ChromiumMultiDex.template", | 1732 "android/java/templates/ChromiumMultiDex.template", |
| 1733 ] | 1733 ] |
| 1734 if (is_debug) { | |
| 1735 defines = [ "CONFIGURATION_NAME_Debug" ] | |
| 1736 } | |
|
Nico
2015/11/16 21:46:54
why isn't this needed for gyp?
jbudorick
2015/11/16 21:49:18
it is, though it's handled a little differently th
Nico
2015/11/16 21:57:55
Ah, ok. (You can switch on build type in gyp if yo
jbudorick
2015/11/16 22:00:21
Maybe code search had a bad weekend? It's in there
Nico
2015/11/16 22:04:51
Oh, it's even in this CL, cool, thanks.
…why does
jbudorick
2015/11/16 22:19:33
er... it was in the last one.
jbudorick
2015/11/17 16:27:06
made this define clearly multidex-specific.
jbudorick
2015/11/17 16:27:06
(code search did have a bad weekend: https://build
jbudorick
2015/11/17 16:27:06
also, I tried these when I was writing the gyp pat
| |
| 1734 package_name = "org/chromium/base/multidex" | 1737 package_name = "org/chromium/base/multidex" |
| 1735 } | 1738 } |
| 1736 | 1739 |
| 1737 # GYP: //base/base.gyp:base_native_libraries_gen | 1740 # GYP: //base/base.gyp:base_native_libraries_gen |
| 1738 java_cpp_template("base_native_libraries_gen") { | 1741 java_cpp_template("base_native_libraries_gen") { |
| 1739 sources = [ | 1742 sources = [ |
| 1740 "android/java/templates/NativeLibraries.template", | 1743 "android/java/templates/NativeLibraries.template", |
| 1741 ] | 1744 ] |
| 1742 package_name = "org/chromium/base/library_loader" | 1745 package_name = "org/chromium/base/library_loader" |
| 1743 } | 1746 } |
| 1744 | 1747 |
| 1745 # GYP: //base.gyp:base_java_unittest_support | 1748 # GYP: //base.gyp:base_java_unittest_support |
| 1746 android_library("base_java_unittest_support") { | 1749 android_library("base_java_unittest_support") { |
| 1747 deps = [ | 1750 deps = [ |
| 1748 ":base_java", | 1751 ":base_java", |
| 1749 ] | 1752 ] |
| 1750 java_files = | 1753 java_files = |
| 1751 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 1754 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 1752 } | 1755 } |
| 1753 } | 1756 } |
| OLD | NEW |