[Chromium] Fix apk generation for the Android platform
Created attachment 157987 [details] Patch
Comment on attachment 157987 [details] Patch The Chromium-side commit is in: https://src.chromium.org/viewvc/chrome?view=rev&revision=151257 This is safe to land even without a WebKit Chromium roll. Regardless, we're really close to ToT, so when the Chromium Waterfall rolls green on that patch, we can roll it to WebKit and the Android builders should become green again.
Comment on attachment 157987 [details] Patch Clearing flags on attachment: 157987 Committed r125422: <http://trac.webkit.org/changeset/125422>
All reviewed patches have been landed. Closing bug.
There's still a path problem: WK builds are still broken, as are the CR builds now - http://build.chromium.org/p/chromium.webkit/builders/Android%20Builder?numbuilds=50 Error on WK builders: /mnt/data/b/WebKit-BuildSlave/chromium-linux-android/build/out/Release/webkit_unit_tests_apk/native_test_apk.xml:21: Cannot find /mnt/data/b/WebKit-BuildSlave/chromium-linux-android/build/out/WebKit/chromium/build/android/ant/common.xml imported from /mnt/data/b/WebKit-BuildSlave/chromium-linux-android/build/out/Release/webkit_unit_tests_apk/native_test_apk.xml Error on CR builders: /mnt/data/b/build/slave/Android_Builder/build/src/out/Release/TestWebKitAPI_apk/native_test_apk.xml:21: Cannot find /mnt/data/b/build/slave/Android_Builder/build/android/ant/common.xml imported from /mnt/data/b/build/slave/Android_Builder/build/src/out/Release/TestWebKitAPI_apk/native_test_apk.xml
Re-opened since this is blocked by 93902
I'm reverting this for now, to hopefully get the canary bot green again and be able to roll WK.
http://trac.webkit.org/changeset/125454
Created attachment 158288 [details] Patch
Sorry about that, Florin! The updated patch also takes the different paths Chromium uses into account. To emphasize, the made modifications are to Android-specific sections of the gyp files. The larger problem causing all of this will be addressed on the Chromium side, eventually getting rid of this condition block as a whole.
Created attachment 158289 [details] Patch for landing Since Dimitri rubberstamped a version similar to this, and it is, after all, an Android-specific build fix, I'm going to go ahead and land this unreviewed.
Committed r125538: <http://trac.webkit.org/changeset/125538>
Committed r125542: <http://trac.webkit.org/changeset/125542>