Roll internal Google Play Services (Chromium part)

Roll internal Google Play Services (Chromium part)

BUG=613768
Committed: https://crrev.com/27d98c86363d66c877e8ca29c1d34e3578eaa179
Cr-Commit-Position: refs/heads/master@{#400736}

[paulmiller, 2016-06-15 00:33:49]

Description was changed from

==========
Roll internal Google Play Services (Chromium part)

BUG=613768
==========

to

==========
Roll internal Google Play Services (Chromium part)

BUG=613768
==========

[paulmiller, 2016-06-15 00:33:49]

paulmiller@chromium.org changed reviewers:
+ agrieve@chromium.org, jbudorick@chromium.org, mariakhomenko@chromium.org

[paulmiller, 2016-06-15 00:35:12]

On 2016/06/15 00:33:49, paulmiller wrote:
> mailto:paulmiller@chromium.org changed reviewers:
> + mailto:agrieve@chromium.org, mailto:jbudorick@chromium.org,
mailto:mariakhomenko@chromium.org

jbudorick@ for preprocess, agrieve@ for gni, mariakhomenko@ for browser

PTAL.

[agrieve, 2016-06-15 01:01:11]

lgtm. One question about the script though.

https://codereview.chromium.org/2063703004/diff/20001/build/android/play_serv...
File build/android/play_services/preprocess.py (right):

https://codereview.chromium.org/2063703004/diff/20001/build/android/play_serv...
build/android/play_services/preprocess.py:230: # Beginning with v3, resource
file names are not necessarily unique, and
Aren't filenames sometimes used by java code? I know drawables are deleted, but
aren't layouts also referenced by name? Maybe do this only when
res_type.startswith('values')?

[jbudorick, 2016-06-15 01:11:59]

preprocess lgtm w/ nit + agrieve's comment

https://codereview.chromium.org/2063703004/diff/20001/build/android/play_serv...
File build/android/play_services/preprocess.py (right):

https://codereview.chromium.org/2063703004/diff/20001/build/android/play_serv...
build/android/play_services/preprocess.py:170: assert client[-3:] == '_1p'
Can this instead remove _1p if it's present & otherwise simply returned client?
This kind of assertion worries me.

[Maria, 2016-06-15 02:50:18]

lgtm

https://codereview.chromium.org/2063703004/diff/20001/build/config/android/in...
File build/config/android/internal_rules.gni (right):

https://codereview.chromium.org/2063703004/diff/20001/build/config/android/in...
build/config/android/internal_rules.gni:1613: assert(!defined(input_jars_paths)
|| input_jars_paths != [] || true)  # Mark as used
nit: long line

[Maria, 2016-06-15 02:51:11]

On 2016/06/15 02:50:18, Maria wrote:
> lgtm
> 
>
https://codereview.chromium.org/2063703004/diff/20001/build/config/android/in...
> File build/config/android/internal_rules.gni (right):
> 
>
https://codereview.chromium.org/2063703004/diff/20001/build/config/android/in...
> build/config/android/internal_rules.gni:1613:
assert(!defined(input_jars_paths)
> || input_jars_paths != [] || true)  # Mark as used
> nit: long line

Actually, taking the nit back, I think my code review tool was set to 80 for
some reason

[paulmiller, 2016-06-15 19:06:35]

https://codereview.chromium.org/2063703004/diff/20001/build/android/play_serv...
File build/android/play_services/preprocess.py (right):

https://codereview.chromium.org/2063703004/diff/20001/build/android/play_serv...
build/android/play_services/preprocess.py:170: assert client[-3:] == '_1p'
On 2016/06/15 01:11:59, jbudorick wrote:
> Can this instead remove _1p if it's present & otherwise simply returned
client?
> This kind of assertion worries me.

Done.

https://codereview.chromium.org/2063703004/diff/20001/build/android/play_serv...
build/android/play_services/preprocess.py:230: # Beginning with v3, resource
file names are not necessarily unique, and
On 2016/06/15 01:01:11, agrieve wrote:
> Aren't filenames sometimes used by java code? I know drawables are deleted,
but
> aren't layouts also referenced by name? Maybe do this only when
> res_type.startswith('values')?

I don't see any gmscore resource file names hard-coded anywhere, and they
probably shouldn't be, given that gmscore seems to consider them to be arbitrary
(see internal bug 28882714 comment #3).

Then again, the only other non-"drawable" res_type is "color", and those are
still prefixed, so I'll do as you suggest.

[paulmiller, 2016-06-16 18:03:19]

The CQ bit was checked by paulmiller@chromium.org

[paulmiller, 2016-06-16 18:03:20]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org, agrieve@chromium.org, mariakhomenko@chromium.org
Link to the patchset: https://codereview.chromium.org/2063703004/#ps40001
(title: "preprocess tweaks")

[commit-bot: I haz the power, 2016-06-16 18:03:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2063703004/40001

[commit-bot: I haz the power, 2016-06-16 20:32:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-16 20:32:51]

Try jobs failed on following builders:
  linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[paulmiller, 2016-06-16 20:51:13]

The CQ bit was checked by paulmiller@chromium.org

[commit-bot: I haz the power, 2016-06-16 20:52:09]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2063703004/40001

[paulmiller, 2016-06-16 23:49:34]

The CQ bit was unchecked by paulmiller@chromium.org

[paulmiller, 2016-06-16 23:50:40]

Flaky tests are flaky. giving up for today.

[paulmiller, 2016-06-20 17:40:55]

The CQ bit was checked by paulmiller@chromium.org

[commit-bot: I haz the power, 2016-06-20 17:41:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2063703004/40001

[commit-bot: I haz the power, 2016-06-20 18:41:52]

Description was changed from

==========
Roll internal Google Play Services (Chromium part)

BUG=613768
==========

to

==========
Roll internal Google Play Services (Chromium part)

BUG=613768
==========

[commit-bot: I haz the power, 2016-06-20 18:41:53]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-06-20 18:43:02]

Description was changed from

==========
Roll internal Google Play Services (Chromium part)

BUG=613768
==========

to

==========
Roll internal Google Play Services (Chromium part)

BUG=613768

Committed: https://crrev.com/27d98c86363d66c877e8ca29c1d34e3578eaa179
Cr-Commit-Position: refs/heads/master@{#400736}
==========

[commit-bot: I haz the power, 2016-06-20 18:43:03]

Patchset 3 (id:??) landed as
https://crrev.com/27d98c86363d66c877e8ca29c1d34e3578eaa179
Cr-Commit-Position: refs/heads/master@{#400736}

[paulmiller, 2016-06-20 19:58:23]

A revert of this CL (patchset #3 id:40001) has been created in
https://codereview.chromium.org/2085723002/ by paulmiller@chromium.org.

The reason for reverting is: downstream part broke.