From 56e94adfa71d3c5dece4b21da7f11be2cb9e52f1 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Wed, 5 Jun 2019 11:20:56 -0300
Subject: [PATCH] [CHORE] Use no-JIT JSC (#963)
---
android/app/build.gradle | 6 ++++++
android/build.gradle | 4 ++++
package.json | 2 +-
yarn.lock | 8 ++++----
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index d5cb5b2a4..9e9465975 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,6 +113,11 @@ android {
vectorDrawables.useSupportLibrary = true
}
+ packagingOptions {
+ pickFirst '**/libjsc.so'
+ pickFirst '**/libc++_shared.so'
+ }
+
signingConfigs {
release {
if (project.hasProperty('KEYSTORE')) {
@@ -166,6 +171,7 @@ android {
}
dependencies {
+ implementation "org.webkit:android-jsc:r241213"
implementation project(':react-native-firebase')
implementation project(':react-native-webview')
implementation project(':react-native-orientation-locker')
diff --git a/android/build.gradle b/android/build.gradle
index 574e19623..eb8c903a4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -36,6 +36,10 @@ allprojects {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
}
+ maven {
+ // Local Maven repo containing AARs with JSC library built for Android
+ url "$rootDir/../node_modules/jsc-android/dist"
+ }
}
}
diff --git a/package.json b/package.json
index c85241121..da0d41c6e 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"ejson": "^2.1.2",
"js-base64": "^2.5.1",
"js-sha256": "^0.9.0",
- "jsc-android": "241213.1.0",
+ "jsc-android": "^241213.2.0",
"lodash": "^4.17.11",
"markdown-it-flowdock": "^0.3.7",
"moment": "^2.24.0",
diff --git a/yarn.lock b/yarn.lock
index 4929a2f07..fb5bb0996 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8524,10 +8524,10 @@ jsbn@~0.1.0:
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-jsc-android@241213.1.0:
- version "241213.1.0"
- resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.1.0.tgz#8f940d7c7f6bebf14eda32bef42a76182e336452"
- integrity sha512-AH8NYyMNLNhcUEF97QbMxPNLNW+oiSBlvm1rsMNzgJ1d5TQzdh/AOJGsxeeESp3m9YIWGLCgUvGTVoVLs0p68A==
+jsc-android@^241213.2.0:
+ version "241213.2.0"
+ resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.2.0.tgz#a43b78e4dace997be533e7cb812d9714878b069f"
+ integrity sha512-nfddejB9jxFSG+Uewf+zwATFi8F2CZEEgoHLoOj13egiBDoC7zMoxK1c5/Ycf3AGmGuwCgjpn3LWe0f4tKYbjw==
jsdom@^11.5.1:
version "11.12.0"
--
GitLab