Граф коммитов

7 Коммитов

Автор SHA1 Сообщение Дата
Nico Weber c6146bde21 Reformat all gn files in /build/config.
`gn format` recently changed its formatting behavior
for deps, source, and a few other elements when they
are assigned (with =) single-element lists to be consistent
with the formatting of updates (with +=) with single-element.

Now that we've rolled in a GN binary with the change,
reformat all files so that people don't get presubmit
warnings due to this.

This CL was uploaded by git cl split.

R=dpranke@chromium.org

Bug: 1041419
Change-Id: I490a7c39e7121c8f7129edfedc10680061732645
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1998138
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#732013}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 33c370bccf84fcb0ba9954926439463811a4da16
2020-01-15 16:48:59 +00:00
Andrew Grieve 59f4bb0792 Reland "Cronet: Simplify repackage rules"
This reverts commit 8adb2d699d485be7080541f9b37fffea60ef1983.

Reason for reland: Fixed the bug :)

> Original change's description:
> > Cronet: Simplify repackage rules
> >
> > * Use dist_jar() rather than a custom script
> >   * Avoids needing to extract .jars.
> >   * Avoids needing to reference ".javac.jar" files, which
> >     are somewhat of an implementation detail.
> >
> > * Added jar_excluded_patterns support to dist_jar()
> >
> > * Merges zip.py and dist_jar.py, since they were doing the
> >   same thing.
> >
> > Spot checked that these two jars are the same before/after:
> > * cronet/cronet_impl_common_java.jar
> > * cronet/cronet_impl_native_java.jar
> >

TBR=pauljensen@chromium.org,agrieve@chromium.org,estevenson@chromium.org

Bug: 910311
Change-Id: I87508b663d3747a1d0b367cdddb1b19e2f02ef8f
Reviewed-on: https://chromium-review.googlesource.com/c/1356138
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#612566}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 9ff177951cbb95cd251058b7934a5005f4871517
2018-11-30 04:55:56 +00:00
agrieve e19b43e9a6 Revert "Cronet: Simplify repackage rules"
This reverts commit b74cdf4b03c3748352b6c7641a5701cd1958d511.

Reason for revert: Broke compile of remoting_me2me_host_archive
(see bug)

Original change's description:
> Cronet: Simplify repackage rules
> 
> * Use dist_jar() rather than a custom script
>   * Avoids needing to extract .jars.
>   * Avoids needing to reference ".javac.jar" files, which
>     are somewhat of an implementation detail.
> 
> * Added jar_excluded_patterns support to dist_jar()
> 
> * Merges zip.py and dist_jar.py, since they were doing the
>   same thing.
> 
> Spot checked that these two jars are the same before/after:
> * cronet/cronet_impl_common_java.jar
> * cronet/cronet_impl_native_java.jar
> 
> Change-Id: I4d5a5f495ce0376ef2e53b6d4e3c9ebbc3d75ae1
> Reviewed-on: https://chromium-review.googlesource.com/c/1349872
> Reviewed-by: Paul Jensen <pauljensen@chromium.org>
> Reviewed-by: Eric Stevenson <estevenson@chromium.org>
> Commit-Queue: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#612210}

TBR=pauljensen@chromium.org,agrieve@chromium.org,estevenson@chromium.org

Bug: 910311
Change-Id: I0d06a36a1694e378bdfafda21f63fd2e5f258239
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/1355887
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#612347}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8adb2d699d485be7080541f9b37fffea60ef1983
2018-11-29 20:51:26 +00:00
Andrew Grieve 2e8d648c53 Cronet: Simplify repackage rules
* Use dist_jar() rather than a custom script
  * Avoids needing to extract .jars.
  * Avoids needing to reference ".javac.jar" files, which
    are somewhat of an implementation detail.

* Added jar_excluded_patterns support to dist_jar()

* Merges zip.py and dist_jar.py, since they were doing the
  same thing.

Spot checked that these two jars are the same before/after:
* cronet/cronet_impl_common_java.jar
* cronet/cronet_impl_native_java.jar

Change-Id: I4d5a5f495ce0376ef2e53b6d4e3c9ebbc3d75ae1
Reviewed-on: https://chromium-review.googlesource.com/c/1349872
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#612210}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b74cdf4b03c3748352b6c7641a5701cd1958d511
2018-11-29 15:50:38 +00:00
agrieve 4e62debd8b Fix android depfiles to always list GN's outputs[0]
Ninja complains with:
expected depfile 'foo.d' to mention 'bar', got 'baz'

Running ninja twice now reports "no work to do" again.

This change required updating all calls to build_utils.WriteDepFile() so
that the output is passed in. While doing this, I also made the helper
add in GetPythonDependencies() by default.

build/android/gyp/ant.py I just deleted rather than updating since it's
GYP-only.

BUG=646165

Review-Url: https://codereview.chromium.org/2336173003
Cr-Original-Commit-Position: refs/heads/master@{#418455}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4eb18a55cde4daf2ef43330d0304ec73ef546f96
2016-09-14 02:06:20 +00:00
brettw d70ec5d78b Use gn_helpers to deserialize GN lists.
The Android build code doesn't properly unescape the GN lists, use the official Python GN parser instead of ast for the zip script.

Document what should be done for build_utils, but don't fix it due to cast shell build errors as explained in the comment I added.

Update mojo zip script to use the gn helpers.

BUG=573132, 571022

Review URL: https://codereview.chromium.org/1618243004

Cr-Original-Commit-Position: refs/heads/master@{#372461}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 81687d8362fd2dbf0acab8f1deee5b91ee1e5a49
2016-01-29 23:23:56 +00:00
mostynb d4f3865913 move zip template to a non-android-specific .gni file
The zip template really isn't android-specific, let's move it to its
own .gni file which doesn't assert(is_android).

Review URL: https://codereview.chromium.org/1345733002

Cr-Original-Commit-Position: refs/heads/master@{#349016}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3dba3175c9f137742ddb10dbe9a10a5417186402
2015-09-15 22:16:32 +00:00