Merge branch 'master' into oldJSC

README.md

@@ -120,6 +120,21 @@ To use this variant instead replace the third installation step with:
 
 See **[Measurements](/measure)** page that contains synthetic perf test results for the most notable versions of JSC we have tried.
 
+## Troubleshooting
+
+Compile errors of the sort:
+```shell
+More than one file was found with OS independent path 'lib/armeabi-v7a/libgnustl_shared.so'
+```
+
+Add the following to your `app/build.gradle`, under `android`:
+
+```groovy
+packagingOptions {
+    pickFirst '**/libgnustl_shared.so'
+}
+```
+
 ## Resources
 - [WebkitGTK Sources](https://svn.webkit.org/repository/webkit/releases/WebKitGTK/)
 - [ICU Sources](https://android.googlesource.com/platform/external/icu/)

scripts/compile/common.sh

@@ -125,6 +125,8 @@ COMMON_LDFLAGS=" \
 -Wl,--icf=safe \
 -Wl,-z,noexecstack \
 -Wl,--gc-sections \
+-Wl,--exclude-libs,libgcc.a \
+-Wl,--exclude-libs,libunwind.a \
 "
 
 COMMON_CFLAGS=" \

scripts/start.sh

@@ -19,7 +19,16 @@ patchAndMakeICU() {
   rm -rf $TARGETDIR/icu/host
   mkdir -p $TARGETDIR/icu/host
   cd $TARGETDIR/icu/host
-  $TARGETDIR/icu/source/runConfigureICU Linux --prefix=$PWD/prebuilts CFLAGS="-Os" CXXFLAGS="--std=c++11" --disable-tests --disable-samples
+
+  $TARGETDIR/icu/source/runConfigureICU Linux \
+  --prefix=$PWD/prebuilts \
+  CFLAGS="-Os" \
+  CXXFLAGS="--std=c++11" \
+  --disable-tests \
+  --disable-samples \
+  --disable-layout \
+  --disable-layoutex
+
   make -j5
   cd $ROOTDIR