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

Unified Diff: base/BUILD.gn

Issue 1451483002: [Android] Add gn support for multidex. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: agrieve comments 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/gyp/apkbuilder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 9e4270d26009f853e37dc7af883bed4cb43705c8..752ccf6b7e77052da1b0680237d239d7a5eb6920 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1731,6 +1731,9 @@ if (is_android) {
sources = [
"android/java/templates/ChromiumMultiDex.template",
]
+ if (is_debug) {
+ defines = [ "CONFIGURATION_NAME_Debug" ]
+ }
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
package_name = "org/chromium/base/multidex"
}
« 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