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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/config/android/rules.gni

Issue 1597273005: Move ChromiumMultiDex to BuildConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevent jni exception in release. 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 side-by-side diff with in-line comments
Download patch
« base/android/java/src/org/chromium/base/metrics/RecordHistogram.java ('K') | « base/base.gyp ('k') | build/java_apk.gypi » ('j') | build/java_apk.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 1c65d215314c84a8c2ab2fa2e7d8fef341032044..ecd99ce70ac753051dbc1164f981883aa68afbba 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1486,9 +1486,9 @@ template("android_apk") {
if (!defined(invoker.apk_under_test)) {
java_cpp_template("${_template_name}__multidex_config_java") {
jbudorick 2016/01/21 01:51:15 This name should change.
Peter Wen 2016/01/21 15:18:24 Done. Also switched this to always build, even und
- package_name = "org/chromium/base/multidex"
+ package_name = "org/chromium/base"
sources = [
- "//base/android/java/templates/ChromiumMultiDex.template",
+ "//base/android/java/templates/ChromiumBuildConfig.template",
]
defines = []
« base/android/java/src/org/chromium/base/metrics/RecordHistogram.java ('K') | « base/base.gyp ('k') | build/java_apk.gypi » ('j') | build/java_apk.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698