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

[Android] Directly depend on the .so's we want to strip #3909

Merged

Conversation

rakuco
Copy link
Contributor

@rakuco rakuco commented Sep 22, 2016

This fixes a regression introduced in commit 8f3c7d3 ("[Android] Stop
depending on xwalk_core_shell from xwalk_core_library"), where
libxwalkdummy.so and libxwalkcore.so were not being stripped and
added to xwalk_core_library/ (which is then used for the AAR and
xwalk_app_template) in incremental builds, leading to outdated,
existing versions being used instead.

The bug was caused by us not explicitly depending on both unstripped
shared libraries in the action that includes
strip_native_libraries.gypi: we were previously only depending on
native_libraries.json being updated whenever those shared libraries
changed, but write_ordered_libraries.py only updates the JSON file if
its contents are actually different (if we started depending on other
shared libraries, for example).

BUG=XWALK-7335

This fixes a regression introduced in commit 8f3c7d3 ("[Android] Stop
depending on xwalk_core_shell from xwalk_core_library"), where
`libxwalkdummy.so` and `libxwalkcore.so` were not being stripped and
added to `xwalk_core_library/` (which is then used for the AAR and
`xwalk_app_template`) in incremental builds, leading to outdated,
existing versions being used instead.

The bug was caused by us not explicitly depending on both unstripped
shared libraries in the action that includes
`strip_native_libraries.gypi`: we were previously only depending on
`native_libraries.json` being updated whenever those shared libraries
changed, but `write_ordered_libraries.py` only updates the JSON file if
its contents are actually different (if we started depending on other
shared libraries, for example).

BUG=XWALK-7335
@crosswalk-trybot
Copy link

crosswalk-trybot commented Sep 22, 2016

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

Bot Status
Crosswalk Android GN x86-64 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Android GN x86-64/builds/43)
Crosswalk Android GN x86 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Android GN x86/builds/43)
Crosswalk Linux GN [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Linux GN/builds/86)
Crosswalk Android-X86 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Android-X86/builds/4810)
Crosswalk Android x86-64 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Android x86-64/builds/1860)
Crosswalk Linux [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Crosswalk Linux/builds/4800)

@rakuco
Copy link
Contributor Author

rakuco commented Sep 22, 2016

@xzhan96 @lincsoon @heke123

@heke123
Copy link
Contributor

heke123 commented Sep 22, 2016

LGTM

@rakuco rakuco merged commit ac6bc79 into crosswalk-project:master Sep 22, 2016
@rakuco rakuco deleted the strip-lib-dependency-regression branch September 22, 2016 13:18
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