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

Issue 1597273005: Move ChromiumMultiDex to BuildConfig. (Closed)

Created:
4 years, 11 months ago by Peter Wen
Modified:
4 years, 10 months ago
Reviewers:
Lei Zhang, Yaron, jbudorick
CC:
chromium-reviews, asvitkine+watch_chromium.org, vmpstr+watch_chromium.org, Benoit L, Theresa
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Also adds debug build flag. BUG=583690 Committed: https://crrev.com/b0d6314305ddd99c0808a0a41e90b7feb89a79ea Cr-Commit-Position: refs/heads/master@{#375666}

Patch Set 1 #

Total comments: 4

Patch Set 2 : Test debug and release. #

Total comments: 2

Patch Set 3 : Use .template to determine debug vs release. #

Patch Set 4 : Add ChromiumBuildInfo.template. #

Patch Set 5 : Remove trigger in TabPersistentStore. #

Patch Set 6 : Consolidate with MultiDex. #

Patch Set 7 : Prevent jni exception in release. #

Total comments: 5

Patch Set 8 : Build rule fixes. #

Patch Set 9 : Rename other instances of generate_multidex_config.x #

Patch Set 10 : Remove RecordHistogram.java #

Patch Set 11 : Rename rest of multidex_config_* #

Patch Set 12 : Too many renames. :) #

Total comments: 2

Patch Set 13 : Add back apk_under_test check. #

Patch Set 14 : Rename to BuildConfig.java #

Patch Set 15 : Add back missing template. #

Patch Set 16 : Rebase. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+48 lines, -65 lines) Patch
M base/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 4 chunks +8 lines, -8 lines 0 comments Download
M base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java View 1 2 3 4 5 6 7 8 9 10 11 12 13 2 chunks +2 lines, -1 line 0 comments Download
A + base/android/java/templates/BuildConfig.template View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 chunks +10 lines, -4 lines 0 comments Download
D base/android/java/templates/ChromiumMultiDex.template View 1 2 3 4 5 1 chunk +0 lines, -25 lines 0 comments Download
M base/base.gyp View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 4 chunks +8 lines, -8 lines 0 comments Download
M build/config/android/rules.gni View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 2 chunks +4 lines, -4 lines 0 comments Download
M build/java_apk.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 13 5 chunks +15 lines, -15 lines 0 comments Download
M tools/android/eclipse/.classpath View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 47 (12 generated)
Peter Wen
Hi Yaron, Is this the type of crash-guard that you were thinking of? cc'ing Benoit ...
4 years, 11 months ago (2016-01-18 16:46:09 UTC) #2
Peter Wen
On 2016/01/18 16:46:09, Peter Wen wrote: > Hi Yaron, > > Is this the type ...
4 years, 11 months ago (2016-01-18 16:50:22 UTC) #3
Yaron
https://codereview.chromium.org/1597273005/diff/1/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java File base/android/java/src/org/chromium/base/metrics/RecordHistogram.java (right): https://codereview.chromium.org/1597273005/diff/1/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java#newcode10 base/android/java/src/org/chromium/base/metrics/RecordHistogram.java:10: import org.chromium.chrome.browser.ChromeVersionInfo; Unfortunately this dep won't work because you're ...
4 years, 11 months ago (2016-01-18 17:51:10 UTC) #4
Peter Wen
On 2016/01/18 17:51:10, Yaron wrote: > https://codereview.chromium.org/1597273005/diff/1/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java > File base/android/java/src/org/chromium/base/metrics/RecordHistogram.java > (right): > > https://codereview.chromium.org/1597273005/diff/1/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java#newcode10 ...
4 years, 11 months ago (2016-01-18 17:55:35 UTC) #5
Yaron
On 2016/01/18 17:55:35, Peter Wen wrote: > On 2016/01/18 17:51:10, Yaron wrote: > > > ...
4 years, 11 months ago (2016-01-18 17:56:27 UTC) #6
Peter Wen
Switched to using @RemovableInRelease. Tested locally with debug/release builds and works great. Exception in debug ...
4 years, 11 months ago (2016-01-18 22:18:08 UTC) #7
Yaron
lgtm when that's gone (assuming trybots go green with it) https://codereview.chromium.org/1597273005/diff/20001/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java File chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java (right): https://codereview.chromium.org/1597273005/diff/20001/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java#newcode166 ...
4 years, 11 months ago (2016-01-19 15:57:27 UTC) #8
Peter Wen
On 2016/01/19 15:57:27, Yaron wrote: > lgtm when that's gone (assuming trybots go green with ...
4 years, 11 months ago (2016-01-19 19:58:04 UTC) #9
Peter Wen
Hi Yaron, I've found a more comprehensive way of using .template to match java's debug ...
4 years, 11 months ago (2016-01-20 20:14:03 UTC) #10
Peter Wen
Fixed as discussed offline. Adding jbudorick@ for multidex and build change.
4 years, 11 months ago (2016-01-20 22:15:40 UTC) #12
jbudorick
https://codereview.chromium.org/1597273005/diff/120001/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java File base/android/java/src/org/chromium/base/metrics/RecordHistogram.java (right): https://codereview.chromium.org/1597273005/diff/120001/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java#newcode29 base/android/java/src/org/chromium/base/metrics/RecordHistogram.java:29: private static void raiseExceptionInDebug(String name) { This no longer ...
4 years, 11 months ago (2016-01-21 01:51:15 UTC) #13
Peter Wen
Thanks for the quick review, PTAL. https://codereview.chromium.org/1597273005/diff/120001/build/config/android/rules.gni File build/config/android/rules.gni (right): https://codereview.chromium.org/1597273005/diff/120001/build/config/android/rules.gni#newcode1488 build/config/android/rules.gni:1488: java_cpp_template("${_template_name}__multidex_config_java") { On ...
4 years, 11 months ago (2016-01-21 15:18:24 UTC) #14
Peter Wen
I am no longer planning to change RecordHistogram since RecordHistogram.initialize() is not actually required, since ...
4 years, 11 months ago (2016-01-21 20:27:18 UTC) #15
Yaron
On 2016/01/21 20:27:18, Peter Wen wrote: > I am no longer planning to change RecordHistogram ...
4 years, 10 months ago (2016-02-02 22:44:00 UTC) #16
Peter Wen
@jbudorick - PTAL, this CL now just renames ChromiumMultidex and adds a debug flag for ...
4 years, 10 months ago (2016-02-08 16:24:48 UTC) #18
Peter Wen
Friendly ping. :)
4 years, 10 months ago (2016-02-10 21:41:01 UTC) #19
jbudorick
https://codereview.chromium.org/1597273005/diff/220001/build/config/android/rules.gni File build/config/android/rules.gni (left): https://codereview.chromium.org/1597273005/diff/220001/build/config/android/rules.gni#oldcode1487 build/config/android/rules.gni:1487: if (!defined(invoker.apk_under_test)) { Removing this condition makes me worry ...
4 years, 10 months ago (2016-02-10 21:45:46 UTC) #20
jbudorick
On 2016/02/10 21:41:01, Peter Wen wrote: > Friendly ping. :) sorry about the delay, lost ...
4 years, 10 months ago (2016-02-10 21:46:18 UTC) #21
Peter Wen
Thanks! :) https://codereview.chromium.org/1597273005/diff/220001/build/config/android/rules.gni File build/config/android/rules.gni (left): https://codereview.chromium.org/1597273005/diff/220001/build/config/android/rules.gni#oldcode1487 build/config/android/rules.gni:1487: if (!defined(invoker.apk_under_test)) { On 2016/02/10 21:45:46, jbudorick ...
4 years, 10 months ago (2016-02-10 21:56:48 UTC) #22
jbudorick
On 2016/02/10 21:56:48, Peter Wen wrote: > Thanks! :) > > https://codereview.chromium.org/1597273005/diff/220001/build/config/android/rules.gni > File build/config/android/rules.gni ...
4 years, 10 months ago (2016-02-10 22:00:44 UTC) #23
jbudorick
On 2016/02/10 22:00:44, jbudorick wrote: > On 2016/02/10 21:56:48, Peter Wen wrote: > > Thanks! ...
4 years, 10 months ago (2016-02-10 22:38:34 UTC) #24
Peter Wen
On 2016/02/10 22:38:34, jbudorick wrote: > On 2016/02/10 22:00:44, jbudorick wrote: > > Debug builds ...
4 years, 10 months ago (2016-02-10 23:21:03 UTC) #25
jbudorick
On 2016/02/10 23:21:03, Peter Wen wrote: > On 2016/02/10 22:38:34, jbudorick wrote: > > On ...
4 years, 10 months ago (2016-02-11 01:54:59 UTC) #26
Peter Wen
On 2016/02/11 01:54:59, jbudorick wrote: > On 2016/02/10 23:21:03, Peter Wen wrote: > > Thanks! ...
4 years, 10 months ago (2016-02-11 20:39:27 UTC) #27
jbudorick
On 2016/02/11 20:39:27, Peter Wen wrote: > On 2016/02/11 01:54:59, jbudorick wrote: > > On ...
4 years, 10 months ago (2016-02-11 20:41:53 UTC) #28
Yaron
On 2016/02/11 20:41:53, jbudorick wrote: > On 2016/02/11 20:39:27, Peter Wen wrote: > > On ...
4 years, 10 months ago (2016-02-11 20:44:39 UTC) #29
jbudorick
On 2016/02/11 20:44:39, Yaron wrote: > On 2016/02/11 20:41:53, jbudorick wrote: > > On 2016/02/11 ...
4 years, 10 months ago (2016-02-11 20:47:04 UTC) #30
Yaron
On 2016/02/11 20:47:04, jbudorick wrote: > On 2016/02/11 20:44:39, Yaron wrote: > > On 2016/02/11 ...
4 years, 10 months ago (2016-02-11 20:55:25 UTC) #31
jbudorick
On 2016/02/11 20:55:25, Yaron wrote: > On 2016/02/11 20:47:04, jbudorick wrote: > > On 2016/02/11 ...
4 years, 10 months ago (2016-02-11 20:58:30 UTC) #32
Peter Wen
+thestig@ for OWNERS base/BUILD.gn and base/base.gyp.
4 years, 10 months ago (2016-02-11 21:17:58 UTC) #35
Lei Zhang
On 2016/02/11 21:17:58, Peter Wen wrote: > +thestig@ for OWNERS base/BUILD.gn and base/base.gyp. lgtm
4 years, 10 months ago (2016-02-11 21:47:51 UTC) #36
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1597273005/280001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1597273005/280001
4 years, 10 months ago (2016-02-11 22:50:39 UTC) #39
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1597273005/300001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1597273005/300001
4 years, 10 months ago (2016-02-16 20:35:37 UTC) #43
commit-bot: I haz the power
Committed patchset #16 (id:300001)
4 years, 10 months ago (2016-02-16 21:30:00 UTC) #45
commit-bot: I haz the power
4 years, 10 months ago (2016-02-16 22:55:02 UTC) #47
Message was sent while issue was closed.
Patchset 16 (id:??) landed as
https://crrev.com/b0d6314305ddd99c0808a0a41e90b7feb89a79ea
Cr-Commit-Position: refs/heads/master@{#375666}

Powered by Google App Engine
This is Rietveld 408576698