fix scripts

Author: DanielZlotin

measure/android/app/build.gradle

@@ -6,16 +6,15 @@ android {
     compileSdkVersion 27
     buildToolsVersion "27.0.3"
 
-    packagingOptions {
-
-    }
-
     defaultConfig {
         applicationId "com.javascriptcore.profiler"
         minSdkVersion 21
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
     }
     signingConfigs {
         release {

measure/scripts/measure.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const exec = require('shell-utils').exec;
 
-const TIMES = 4;
+const TIMES = 10;
 
 const PACKAGE_NAME = 'com.javascriptcore.profiler';
 const ACTIVITY_NAME = 'MainActivity';

package.json

@@ -29,4 +29,4 @@
     "webkitGTK": "2.19.2",
     "chromiumICUCommit": "b34251f8b762f8e2112a89c587855ca4297fed96"
   }
-}
+}

scripts/compile/all.sh

@@ -20,14 +20,14 @@ compile_arch() {
 }
 
 compile() {
-  # for arch in arm x86
-  # do
-  #   export JSC_ARCH=$arch
-  #   export ENABLE_COMPAT=1
-  #   compile_arch
-  # done
+  for arch in arm x86
+  do
+    export JSC_ARCH=$arch
+    export ENABLE_COMPAT=1
+    compile_arch
+  done
 
-  for arch in arm64 #x86_64
+  for arch in arm64 x86_64
   do
     export JSC_ARCH=$arch
     export ENABLE_COMPAT=0

scripts/compile/common.sh

@@ -137,6 +137,7 @@ COMMON_CFLAGS=" \
 -DPIC \
 -fPIC \
 -fvisibility=hidden \
+-DNDEBUG \
 $SWITCH_COMMON_CFLAGS_INTL \
 "
 

scripts/compile/jsc.sh

@@ -27,7 +27,7 @@ $JSC_LDFLAGS \
 $PLATFORM_LDFLAGS \
 "
 
-CC="$TOOLCHAIN_DIR/bin/aarch64-linux-android-gcc" $TARGETDIR/webkit/Tools/Scripts/build-webkit \
+$TARGETDIR/webkit/Tools/Scripts/build-webkit \
   --jsc-only \
   --release \
   --jit \
@@ -39,7 +39,7 @@ CC="$TOOLCHAIN_DIR/bin/aarch64-linux-android-gcc" $TARGETDIR/webkit/Tools/Script
   --cmakeargs="-DCMAKE_SYSTEM_NAME=Android \
   $SWITCH_BUILD_WEBKIT_CMAKE_ARGS_COMPAT \
   -DCMAKE_SYSTEM_VERSION=$ANDROID_API \
-  -DCMAKE_SYSTEM_PROCESSOR=aarch64 \
+  -DCMAKE_SYSTEM_PROCESSOR=$ARCH \
   -DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TOOLCHAIN_DIR \
   -DWEBKIT_LIBRARIES_INCLUDE_DIR=$TARGETDIR/icu/source/common \
   -DWEBKIT_LIBRARIES_LINK_DIR=$TARGETDIR/icu/${CROSS_COMPILE_PLATFORM}-${FLAVOR}/lib \

scripts/info.sh

@@ -2,12 +2,18 @@
 
 URL="https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-${npm_package_config_webkitGTK}"
 ROOTDIR=$PWD
-REVISION=$(svn info --show-item last-changed-revision "${URL}")
+
+export REVISION=$(svn info --show-item last-changed-revision "${URL}")
+
 INFO=$(svn info "${URL}")
-CONFIG=$(node -e "console.log(require('./package.json').config)")
+CONFIG=$(node -e "console.log(require('$ROOTDIR/package.json').config)")
 APPLE_VERSION=$(svn cat "${URL}/Source/WebCore/Configurations/Version.xcconfig" | grep 'MAJOR_VERSION\s=\|MINOR_VERSION\s=\|TINY_VERSION\s=\|MICRO_VERSION\s=\|NANO_VERSION\s=')
 
-SIZE=$(du -ah $ROOTDIR/build/compiled || true)
+if [ -d "$ROOTDIR/build/compiled" ]; then
+  SIZE=$(du -ah $ROOTDIR/build/compiled)
+else
+  SIZE="0"
+fi
 
 printf "\n\n\n\n\n\t\t\tRevision: \x1B[32m$REVISION\x1B[0m\n\n\n"
 printf "Config:\n$CONFIG\n\n"

scripts/start.sh

@@ -2,7 +2,7 @@
 
 ROOTDIR=$PWD
 TARGETDIR=$ROOTDIR/build/target
-REVISION=$(svn info --show-item last-changed-revision "https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-${npm_package_config_webkitGTK}")
+source $PWD/scripts/info.sh
 
 patchAndMakeICU() {
   printf "\n\n\t\t===================== patch and make icu into target/icu/host =====================\n\n"
@@ -61,10 +61,10 @@ createAAR() {
   cd $ROOTDIR
 }
 
-# export I18N=false
-# prep
-# compile
-# createAAR
+export I18N=false
+prep
+compile
+createAAR
 
 export I18N=true
 prep