trying things

Author: DanielZlotin

measure/android/app/build.gradle

@@ -6,15 +6,16 @@ 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 = 10;
+const TIMES = 4;
 
 const PACKAGE_NAME = 'com.javascriptcore.profiler';
 const ACTIVITY_NAME = 'MainActivity';

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,7 +137,6 @@ COMMON_CFLAGS=" \
 -DPIC \
 -fPIC \
 -fvisibility=hidden \
--DNDEBUG \
 $SWITCH_COMMON_CFLAGS_INTL \
 "
 

scripts/compile/jsc.sh

@@ -27,7 +27,7 @@ $JSC_LDFLAGS \
 $PLATFORM_LDFLAGS \
 "
 
-$TARGETDIR/webkit/Tools/Scripts/build-webkit \
+CC="$TOOLCHAIN_DIR/bin/aarch64-linux-android-gcc" $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   --jsc-only \
   --release \
   --jit \
@@ -39,7 +39,7 @@ $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   --cmakeargs="-DCMAKE_SYSTEM_NAME=Android \
   $SWITCH_BUILD_WEBKIT_CMAKE_ARGS_COMPAT \
   -DCMAKE_SYSTEM_VERSION=$ANDROID_API \
-  -DCMAKE_SYSTEM_PROCESSOR=$ARCH \
+  -DCMAKE_SYSTEM_PROCESSOR=aarch64 \
   -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/start.sh

@@ -61,10 +61,10 @@ createAAR() {
   cd $ROOTDIR
 }
 
-export I18N=false
-prep
-compile
-createAAR
+# export I18N=false
+# prep
+# compile
+# createAAR
 
 export I18N=true
 prep