Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

gn: Implement the "xwalk_runtime_lib_lzma_apk" target #3910

Merged
merged 1 commit into from
Sep 27, 2016

Conversation

rakuco
Copy link
Contributor

@rakuco rakuco commented Sep 26, 2016

This was hopefully the last missing Android target in the gyp->GN
conversion, and it is an ugly one: we are forced to keep a hardcoded
list of all the files we want to compress and ship as assets, which
makes the change to runtime/android/runtime_lib/BUILD.gn bigger than
usual.

Since android_assets() in GN requires a list of all files being
shipped as assets, we can simplify lzma_compress.py and get rid of its
different operation modes: instead of passing --mode=show-output-names
we just list all files that are being compressed in gyp.

While here, also use a temporary directory to perform the compressions
in lzma_compress.py, as it's then removed automatically in case
something goes wrong and we are not left with dangling files in the
build tree.

BUG=XWALK-7285

This was hopefully the last missing Android target in the gyp->GN
conversion, and it is an ugly one: we are forced to keep a hardcoded
list of all the files we want to compress and ship as assets, which
makes the change to `runtime/android/runtime_lib/BUILD.gn` bigger than
usual.

Since `android_assets()` in GN requires a list of all files being
shipped as assets, we can simplify `lzma_compress.py` and get rid of its
different operation modes: instead of passing `--mode=show-output-names`
we just list all files that are being compressed in gyp.

While here, also use a temporary directory to perform the compressions
in `lzma_compress.py`, as it's then removed automatically in case
something goes wrong and we are not left with dangling files in the
build tree.

BUG=XWALK-7285
@crosswalk-trybot
Copy link

crosswalk-trybot commented Sep 26, 2016

Testing patch series with rakuco/crosswalk@d7f43b4 as its head.

Bot Status
Crosswalk Android GN x86-64 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Android GN x86-64/builds/48)
Crosswalk Android GN x86 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Android GN x86/builds/48)
Crosswalk Linux GN [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Linux GN/builds/91)
Crosswalk Android-X86 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Android-X86/builds/4815)
Crosswalk Android x86-64 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Android x86-64/builds/1865)
Crosswalk Linux [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Linux/builds/4805)

@rakuco
Copy link
Contributor Author

rakuco commented Sep 26, 2016

@heke123

@heke123
Copy link
Contributor

heke123 commented Sep 27, 2016

@rakuco Thanks!
LGTM

@rakuco rakuco merged commit f9a7740 into crosswalk-project:master Sep 27, 2016
@rakuco rakuco deleted the gn-runtimeliblzma branch September 27, 2016 07:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants