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

Issue 1043913002: Remove most android_webview_build conditions from build. (Closed)

Created:
5 years, 8 months ago by Torne
Modified:
5 years, 8 months ago
Reviewers:
Nico
CC:
chromium-reviews, cc-bugs_chromium.org, klundberg+watch_chromium.org, yfriedman+watch_chromium.org, jbudorick+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Remove most android_webview_build conditions from build. Remove most references to android_webview_build from the build directory now that we no longer support that build configuration. Fold conditions into their parents where appropriate. Leave the variable itself defined to 0 as not all uses in the tree have been removed yet. A few references are left alone here and will be removed separately in later changes that will be larger refactorings to eliminate other variables. BUG=440793 Committed: https://crrev.com/c6fe7a775af41cd98533e89a902b8b67044caa87 Cr-Commit-Position: refs/heads/master@{#323013}

Patch Set 1 #

Total comments: 8

Patch Set 2 : Address comments and rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+203 lines, -485 lines) Patch
D build/android/android_exports.gyp View 1 chunk +0 lines, -43 lines 0 comments Download
D build/android/android_webview_export_whitelist.lst View 1 chunk +0 lines, -16 lines 0 comments Download
M build/android/finalize_apk_action.gypi View 1 chunk +2 lines, -10 lines 0 comments Download
M build/common.gypi View 1 15 chunks +115 lines, -263 lines 0 comments Download
M build/config/android/config.gni View 1 chunk +2 lines, -3 lines 0 comments Download
M build/config/compiler/BUILD.gn View 1 5 chunks +69 lines, -105 lines 0 comments Download
M build/config/features.gni View 1 chunk +1 line, -1 line 0 comments Download
M build/config/gcc/gcc_version.gni View 1 chunk +1 line, -6 lines 0 comments Download
M build/config/sysroot.gni View 1 chunk +12 lines, -16 lines 0 comments Download
M build/jar_file_jni_generator.gypi View 1 chunk +0 lines, -10 lines 0 comments Download
M build/jni_generator.gypi View 1 chunk +0 lines, -10 lines 0 comments Download
M build/module_args/v8.gni View 1 chunk +1 line, -2 lines 0 comments Download

Messages

Total messages: 11 (3 generated)
Torne
Hi Nico, here's one of the big android_webview_build purges. Would you mind taking a look ...
5 years, 8 months ago (2015-03-30 14:22:11 UTC) #2
Nico
lgtm with comments addressed https://codereview.chromium.org/1043913002/diff/1/build/common.gypi File build/common.gypi (left): https://codereview.chromium.org/1043913002/diff/1/build/common.gypi#oldcode2095 build/common.gypi:2095: 'grit_defines': ['-D', 'is_android_webview_build'], You need ...
5 years, 8 months ago (2015-03-30 17:55:46 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1043913002/20001
5 years, 8 months ago (2015-03-31 10:52:33 UTC) #6
commit-bot: I haz the power
Committed patchset #2 (id:20001)
5 years, 8 months ago (2015-03-31 11:50:55 UTC) #7
commit-bot: I haz the power
Patchset 2 (id:??) landed as https://crrev.com/c6fe7a775af41cd98533e89a902b8b67044caa87 Cr-Commit-Position: refs/heads/master@{#323013}
5 years, 8 months ago (2015-03-31 11:51:44 UTC) #8
Torne
https://codereview.chromium.org/1043913002/diff/1/build/common.gypi File build/common.gypi (left): https://codereview.chromium.org/1043913002/diff/1/build/common.gypi#oldcode2095 build/common.gypi:2095: 'grit_defines': ['-D', 'is_android_webview_build'], On 2015/03/30 17:55:46, Nico wrote: > ...
5 years, 8 months ago (2015-03-31 13:50:02 UTC) #9
Nico
https://codereview.chromium.org/1043913002/diff/1/build/common.gypi File build/common.gypi (left): https://codereview.chromium.org/1043913002/diff/1/build/common.gypi#oldcode2095 build/common.gypi:2095: 'grit_defines': ['-D', 'is_android_webview_build'], On 2015/03/31 13:50:02, Torne wrote: > ...
5 years, 8 months ago (2015-03-31 15:28:03 UTC) #10
Nico
5 years, 8 months ago (2015-03-31 15:33:29 UTC) #11
Message was sent while issue was closed.
https://codereview.chromium.org/1043913002/diff/1/build/common.gypi
File build/common.gypi (left):

https://codereview.chromium.org/1043913002/diff/1/build/common.gypi#oldcode2095
build/common.gypi:2095: 'grit_defines': ['-D', 'is_android_webview_build'],
On 2015/03/31 15:28:03, Nico wrote:
> On 2015/03/31 13:50:02, Torne wrote:
> > On 2015/03/30 17:55:46, Nico wrote:
> > > You need to delete this conditional too:
> > >
> >
>
https://code.google.com/p/chromium/codesearch#chromium/src/components/resourc...
> > 
> > Already being removed in my components change:
> > https://codereview.chromium.org/1041673002/
> 
> That's not good enough. This CL here removes the is_android_webview_build grit
> define, so now dom_distiller_resources.grdp incorrectly won't be included
while
> this Cl is in the tree but the one you linked to isn't yet. Please revert this
> part quickly, and reland it only after your other CL is in.

You're right, the grd file checks "if this isn't set", so not setting it
shouldn't change anything. Sorry for the noise.

Powered by Google App Engine
This is Rietveld 408576698