Android basedir #11687

larsbergstrom · 2016-06-09T17:56:22Z

This fixes #11633, as when the new basedir stuff that uses xdg was added, it did not preserve the previous Android behavior, which used /sdcard/servo. Obviously, long-term we should be calling into the Android runtime to determine the per-run installation path and be both unpacking and loading resources from there, but this restores the previous behavior.

r? @mbrubeck

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #11633 (github issue number if applicable).

There are tests for these changes OR
These changes do not require tests because _____

This change is


        Update build.xml for new format from updated toolchains


        Restore Android to using /sdcard/servo for data, cache, and config paths

highfive · 2016-06-09T18:51:28Z

New code was committed to pull request.

larsbergstrom · 2016-06-09T18:52:16Z

The added libz update fixes #11627

mbrubeck · 2016-06-09T20:07:55Z

-S-awaiting-review +S-needs-code-changes

r=me with one small change:

Previously, larsbergstrom (Lars Bergstrom) wrote…

The added libz update fixes #11627

Reviewed 1 of 1 files at r1, 2 of 2 files at r2, 2 of 2 files at r3.
Review status: all files reviewed at latest revision, 1 unresolved discussion.

components/util/lib.rs, line 40 [r2] (raw file):

extern crate smallvec;
extern crate url;
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))]

The corresponding line in components/util/Cargo.toml can be updated too.

Comments from Reviewable


        Pick up libz update to fix android build

highfive · 2016-06-09T20:10:44Z

New code was committed to pull request.

larsbergstrom · 2016-06-09T20:11:17Z

@bors-servo r=mbrubeck

bors-servo · 2016-06-09T20:11:18Z

📌 Commit df9539c has been approved by mbrubeck

bors-servo · 2016-06-09T20:57:57Z

⌛ Testing commit df9539c with merge ebb1cb3...


        Auto merge of #11687 - larsbergstrom:android_basedir, r=mbrubeck

@mbrubeck

Android basedir  This fixes #11633, as when the new basedir stuff that uses xdg was added, it did not preserve the previous Android behavior, which used `/sdcard/servo`. Obviously, long-term we should be calling into the Android runtime to determine the per-run installation path and be both unpacking and loading resources from there, but this restores the previous behavior. r? @mbrubeck ---  - [ x] `./mach build -d` does not report any errors - [x ] `./mach test-tidy` does not report any errors - [x] These changes fix #11633 (github issue number if applicable).  - [x] There are tests for these changes OR - [ x] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11687)

bors-servo · 2016-06-09T21:45:27Z

💔 Test failed - linux-rel

highfive · 2016-06-09T21:45:29Z

  ▶ CRASH [expected OK] /html/semantics/embedded-content/the-iframe-element/change_parentage.html
  │ 
  │ Xlib:  extension &#34;XFree86-VidModeExtension&#34; missing on display &#34;:0&#34;.
  │ ERROR:constellation::constellation: Panic: ScriptThread: received an event message for a layout channel that is not associated with this script thread.This is a bug.
  │ ERROR:constellation::constellation: Backtrace:
  │ frame #0  - 0x00007f81a1b47d3d - backtrace::backtrace::trace::hccde8df28b4db2a2
  │ frame #1  - 0x00007f81a1b47cc5 - backtrace::capture::Backtrace::new::h42f95930bb8c5ee8
  │ frame #2  - 0x00007f81a0b9e739 - _&lt;F as alloc..boxed..FnBox&lt;A&gt;&gt;::call_box::h89adae1a802be550
  │ frame #3  - 0x00007f81a1b39578 - util::panicking::initiate_panic_hook::_$u7b$$u7b$closure$u7d$$u7d$::_$u7b$$u7b$closure$u7d$$u7d$::he2b22674ad1748f3
  │ frame #4  - 0x00007f81a1e0404c - std::panicking::rust_panic_with_hook::h983af77c1a2e581b
  │ frame #5  - 0x00007f81a1e1e451 - std::panicking::begin_panic::he426e15a3766089a
  │ frame #6  - 0x00007f81a1e058ba - std::panicking::begin_panic_fmt::hdddb415186c241e7
  │ frame #7  - 0x00007f81a1e1e3ee - rust_begin_unwind
  │ frame #8  - 0x00007f81a1e549ef - core::panicking::panic_fmt::hf4e16cb7f0d41a25
  │ frame #9  - 0x00007f81a1e5c0a4 - core::option::expect_failed::hdb92832549f56a85
  │ frame #10 - 0x00007f81a0bab771 - script::script_thread::ScriptThread::handle_msg_from_script::h47e979ae1e7fb676
  │ frame #11 - 0x00007f81a0bf570f - script::script_thread::ScriptThread::handle_msgs::_$u7b$$u7b$closure$u7d$$u7d$::hb50cf7fd97943b65
  │ frame #12 - 0x00007f81a0bdda59 - script::script_thread::ScriptThread::handle_msgs::h1e1abab71191c950
  │ frame #13 - 0x00007f81a0b9cdb7 - std::panicking::try::call::h78dcd5319adf08fa
  │ frame #14 - 0x00007f81a1e2864b - __rust_try
  │ frame #15 - 0x00007f81a1e285ee - __rust_maybe_catch_panic
  │ frame #16 - 0x00007f81a0b9e09d - _&lt;F as alloc..boxed..FnBox&lt;A&gt;&gt;::call_box::hce043844655ea6a9
  │ frame #17 - 0x00007f81a1e1c614 - std::sys::thread::Thread::new::thread_start::h9c883b6d445ece46
  │ frame #18 - 0x00007f819dc89181 - start_thread
  │ frame #19 - 0x00007f819d7a047c - __clone
  │ frame #20 - 0x0000000000000000 - &lt;unknown&gt;
  │ 
  └ ERROR:constellation::constellation: Pipeline failed in hard-fail mode.  Crashing!

mbrubeck · 2016-06-09T21:54:03Z

@bors-servo retry

#11693

bors-servo · 2016-06-09T22:27:19Z

⚡ Previous build results for android, arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows are reusable. Rebuilding only linux-rel...

aneeshusa · 2016-06-09T22:38:30Z

support/android/apk/build.xml

+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />


I believe @mitchhentges removed this file in #11278. If the Android automated tooling rewrote the build.xml file to link to it, then we should re-add the project.properties file. If you changed build.xml by hand, I think we can revert that change.

Yeah, the automated tooling will always put that file back in there. I thought I had argued against that change, but clearly I didn't. Oops!

bors-servo · 2016-06-09T23:14:27Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

larsbergstrom added 2 commits Jun 9, 2016

Update build.xml for new format from updated toolchains

988cdf9

Restore Android to using /sdcard/servo for data, cache, and config paths

Loading status checks…

a8ca2c8

highfive assigned mbrubeck Jun 9, 2016

highfive added the S-awaiting-review label Jun 9, 2016

mbrubeck added S-needs-code-changes and removed S-awaiting-review labels Jun 9, 2016

Pick up libz update to fix android build

Loading status checks…

df9539c

larsbergstrom force-pushed the larsbergstrom:android_basedir branch from ced5224 to df9539c Jun 9, 2016

highfive added S-awaiting-review and removed S-needs-code-changes labels Jun 9, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Jun 9, 2016

highfive removed the S-awaiting-merge label Jun 9, 2016

highfive added the S-tests-failed label Jun 9, 2016

aneeshusa reviewed Jun 9, 2016
View changes

bors-servo merged commit df9539c into servo:master Jun 9, 2016
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

aneeshusa mentioned this pull request Jun 27, 2016

Bring back support/android/apk/project.properties #11876

Open

rzambre mentioned this pull request Jul 4, 2016

Servo fails to cross-build for Android on OSX #11627

Closed

larsbergstrom deleted the larsbergstrom:android_basedir branch Sep 29, 2016

servo / servo

Android basedir #11687

Android basedir #11687

larsbergstrom commented Jun 9, 2016 •

edited by mbrubeck

highfive commented Jun 9, 2016

larsbergstrom commented Jun 9, 2016

mbrubeck commented Jun 9, 2016

highfive commented Jun 9, 2016

larsbergstrom commented Jun 9, 2016

bors-servo commented Jun 9, 2016

bors-servo commented Jun 9, 2016

bors-servo commented Jun 9, 2016

highfive commented Jun 9, 2016

mbrubeck commented Jun 9, 2016

bors-servo commented Jun 9, 2016

This comment has been minimized.

This comment has been minimized.

bors-servo commented Jun 9, 2016

servo / servo

Join GitHub today

Android basedir #11687

Android basedir #11687

Conversation

larsbergstrom commented Jun 9, 2016 • edited by mbrubeck

highfive commented Jun 9, 2016

larsbergstrom commented Jun 9, 2016

mbrubeck commented Jun 9, 2016

highfive commented Jun 9, 2016

larsbergstrom commented Jun 9, 2016

bors-servo commented Jun 9, 2016

bors-servo commented Jun 9, 2016

bors-servo commented Jun 9, 2016

highfive commented Jun 9, 2016

mbrubeck commented Jun 9, 2016

bors-servo commented Jun 9, 2016

This comment has been minimized.

aneeshusa Jun 9, 2016

This comment has been minimized.

larsbergstrom Jun 10, 2016

bors-servo commented Jun 9, 2016

larsbergstrom commented Jun 9, 2016 •

edited by mbrubeck