diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-21 03:37:26 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-21 09:42:47 +0530 |
| commit | 2711d00666e1de29855a7422163d9130120b439c (patch) | |
| tree | 287e0a5b09d8c05a838d83cb41cb9ae378469f7b | |
| parent | 04a4d5c421208b211dec17aab34848b4a93b96e1 (diff) | |
| download | servo-2711d00666e1de29855a7422163d9130120b439c.tar.gz servo-2711d00666e1de29855a7422163d9130120b439c.zip | |
Remove dependency on backup-flame dir
We should be using the one in the product target dir instead.
This makes the B2G deps distributable again
| -rw-r--r-- | ports/gonk/README.md | 8 | ||||
| -rwxr-xr-x | ports/gonk/fake-ld.sh | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ports/gonk/README.md b/ports/gonk/README.md index 51e158e1170..58060cf7294 100644 --- a/ports/gonk/README.md +++ b/ports/gonk/README.md @@ -8,6 +8,9 @@ and toolchain. Note: this will take a long time and will take around 20GB of space +Disable the screen timeout on the device, and connect to wifi. Also connect it to your computer +with remote debugging enabled. + ``` git clone https://github.com/mozilla-b2g/B2G ./config.sh flame-kk @@ -21,13 +24,10 @@ If behind a firewall, put the following in your gitconfig: [url "https://git.mozilla.org/external/caf"] insteadOf = git://codeaurora.org ``` - -Disable the screen timeout on the device, and connect to wifi - Then run ``` -./build.sh libssl libsuspend libz libGLESv2 toolbox +./build.sh libssl libsuspend libz libGLESv2 toolbox libhardware ``` ## Build B2S diff --git a/ports/gonk/fake-ld.sh b/ports/gonk/fake-ld.sh index 11f893d7263..e17307ccfd8 100755 --- a/ports/gonk/fake-ld.sh +++ b/ports/gonk/fake-ld.sh @@ -1,2 +1,2 @@ #!/bin/bash -arm-linux-androideabi-g++ $@ $LDFLAGS -lGLESv2 -lsupc++ -L $GONKDIR/backup-flame/system/lib/ -L$GONKDIR/prebuilts/ndk/9/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/ +arm-linux-androideabi-g++ $@ $LDFLAGS -lGLESv2 -lsupc++ -L$GONKDIR/prebuilts/ndk/9/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/ diff --git a/python/servo/command_base.py b/python/servo/command_base.py index c77e190986b..b3a4b6d2feb 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -174,7 +174,7 @@ class CommandBase(object): env["LDFLAGS"] = ("-mandroid -L%(gonkdir)s/out/target/product/%(gonkproduct)s/obj/lib " "-Wl,-rpath-link=%(gonkdir)s/out/target/product/%(gonkproduct)s/obj/lib " "--sysroot=%(gonkdir)s/out/target/product/%(gonkproduct)s/obj/") % {"gonkdir": env["GONKDIR"], "gonkproduct": env["GONK_PRODUCT"] } - + # Not strictly necessary for a vanilla build, but might be when tweaking the openssl build env["OPENSSL_PATH"] = "%(gonkdir)s/out/target/product/%(gonkproduct)s/obj/lib" % {"gonkdir": env["GONKDIR"], "gonkproduct": env["GONK_PRODUCT"] } |