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

Issue 2083383003: Reland: Refactor process_resources.py to use aapt's --extra-packages (Closed)

Created:
4 years, 6 months ago by agrieve
Modified:
4 years, 6 months ago
CC:
chromium-reviews, jbudorick+watch_chromium.org, mikecase+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Reland: Refactor process_resources.py to use aapt's --extra-packages Reason for Reland: - No longer generating assignments for non-array styleable fields within onResourcesLoaded() (matches aapt's behaviour) We actually never pass --include-all-resources, so this is just refactoring dead code. I think it's an improvement though, as the new comments explain more of why things work the way they do. TBR=agrieve BUG=none Committed: https://crrev.com/c04a207f591c1cae455fee6c9c7d8b0dbca20abe Cr-Commit-Position: refs/heads/master@{#401355}

Patch Set 1 #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+120 lines, -91 lines) Patch
M build/android/gyp/process_resources.py View 10 chunks +120 lines, -91 lines 2 comments Download

Messages

Total messages: 23 (8 generated)
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2083383003/1
4 years, 6 months ago (2016-06-22 15:31:35 UTC) #2
commit-bot: I haz the power
No L-G-T-M from a valid reviewer yet. CQ run can only be started by full ...
4 years, 6 months ago (2016-06-22 15:31:37 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2083383003/1
4 years, 6 months ago (2016-06-22 17:00:09 UTC) #7
jbudorick
do you have the delta between what you landed originally & the fixed version?
4 years, 6 months ago (2016-06-22 17:03:19 UTC) #9
agrieve
On 2016/06/22 17:03:19, jbudorick (EMEA til June 30) wrote: > do you have the delta ...
4 years, 6 months ago (2016-06-22 17:56:03 UTC) #10
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 6 months ago (2016-06-22 18:21:27 UTC) #12
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/c04a207f591c1cae455fee6c9c7d8b0dbca20abe Cr-Commit-Position: refs/heads/master@{#401355}
4 years, 6 months ago (2016-06-22 18:25:49 UTC) #14
jbudorick
On 2016/06/22 17:56:03, agrieve wrote: > On 2016/06/22 17:03:19, jbudorick (EMEA til June 30) wrote: ...
4 years, 6 months ago (2016-06-23 11:35:08 UTC) #15
phoglund_chromium
This CL breaks WebRTC: https://build.chromium.org/p/tryserver.webrtc/builders/android_rel/builds/14367 when the import bot attempts to import it: https://codereview.webrtc.org/2096523002/ Is ...
4 years, 6 months ago (2016-06-23 12:08:24 UTC) #17
jbudorick
On 2016/06/23 12:08:24, phoglund_chrome wrote: > This CL breaks WebRTC: > https://build.chromium.org/p/tryserver.webrtc/builders/android_rel/builds/14367 > > when ...
4 years, 6 months ago (2016-06-23 12:09:13 UTC) #18
jbudorick
https://codereview.chromium.org/2083383003/diff/1/build/android/gyp/process_resources.py File build/android/gyp/process_resources.py (left): https://codereview.chromium.org/2083383003/diff/1/build/android/gyp/process_resources.py#oldcode480 build/android/gyp/process_resources.py:480: input_paths.extend(p for p in options.extra_r_text_files if os.path.exists(p)) Pretty sure ...
4 years, 6 months ago (2016-06-23 12:33:00 UTC) #19
agrieve
https://codereview.chromium.org/2083383003/diff/1/build/android/gyp/process_resources.py File build/android/gyp/process_resources.py (left): https://codereview.chromium.org/2083383003/diff/1/build/android/gyp/process_resources.py#oldcode480 build/android/gyp/process_resources.py:480: input_paths.extend(p for p in options.extra_r_text_files if os.path.exists(p)) On 2016/06/23 ...
4 years, 6 months ago (2016-06-23 12:49:36 UTC) #20
agrieve
On 2016/06/23 12:49:36, agrieve wrote: > https://codereview.chromium.org/2083383003/diff/1/build/android/gyp/process_resources.py > File build/android/gyp/process_resources.py (left): > > https://codereview.chromium.org/2083383003/diff/1/build/android/gyp/process_resources.py#oldcode480 > ...
4 years, 6 months ago (2016-06-23 13:08:40 UTC) #21
agrieve
A revert of this CL (patchset #1 id:1) has been created in https://codereview.chromium.org/2090303003/ by agrieve@chromium.org. ...
4 years, 6 months ago (2016-06-23 13:09:10 UTC) #22
phoglund_chromium
4 years, 6 months ago (2016-06-23 13:11:36 UTC) #23
Message was sent while issue was closed.
On 2016/06/23 13:08:40, agrieve wrote:
> On 2016/06/23 12:49:36, agrieve wrote:
> >
>
https://codereview.chromium.org/2083383003/diff/1/build/android/gyp/process_r...
> > File build/android/gyp/process_resources.py (left):
> > 
> >
>
https://codereview.chromium.org/2083383003/diff/1/build/android/gyp/process_r...
> > build/android/gyp/process_resources.py:480: input_paths.extend(p for p in
> > options.extra_r_text_files if os.path.exists(p))
> > On 2016/06/23 12:33:00, jbudorick (EMEA til June 30) wrote:
> > > Pretty sure this is responsible for the webrtc failure?
> > 
> > likely. Looking now to see if it'll fix it. There's another CL that depends
on
> > this one, so if it's a simple fix I'd rather do it than revert both changes.
> 
> Looks like for some reason the GYP rules tell process_resources.py to take its
> own R.txt as an input:
>
https://cs.chromium.org/chromium/src/build/java_apk.gypi?q=java_apk.gypi&sq=p...
> 
> Bizarre... But I'll just revert for now since I'm not able to gclient sync to
> make a fix atm.

That's too bad. I'll be around on Monday in case there's any way I can help (OOO
tomorrow and rest of next week). kjellander@ is going OOO as well.

Powered by Google App Engine
This is Rietveld 408576698