diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index c1dd696af..6855cfba0 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -162,7 +162,7 @@ task prepareJSC(dependsOn: dependenciesPath ? [] : [downloadJSCHeaders]) << { copy { from zipTree(configurations.compile.fileCollection { dep -> dep.name == 'android-jsc' }.singleFile) from dependenciesPath ? "$dependenciesPath/jsc-headers" : {downloadJSCHeaders.dest} - from 'src/main/jni/third-party/jsc/Android.mk' + from 'src/main/jni/third-party/jsc' include 'jni/**/*.so', '*.h', 'Android.mk' filesMatching('*.h', { fname -> fname.path = "JavaScriptCore/${fname.path}"}) into "$thirdPartyNdkDir/jsc"; @@ -289,7 +289,7 @@ android { sourceSets.main { jni.srcDirs = [] - jniLibs.srcDir "$buildDir/react-ndk/exported" + jniLibs.srcDirs = ["$buildDir/react-ndk/exported", 'src/main/jni/third-party/jsc/jni'] res.srcDirs = ['src/main/res/devsupport', 'src/main/res/shell', 'src/main/res/views/modal', 'src/main/res/views/uimanager'] java { srcDirs = ['src/main/java', 'src/main/libraries/soloader/java', 'src/main/jni/first-party/fb/jni/java'] diff --git a/ReactAndroid/src/main/jniLibs/arm64-v8a/libjsc.so b/ReactAndroid/src/main/jni/third-party/jsc/jni/arm64-v8a/libjsc.so similarity index 100% rename from ReactAndroid/src/main/jniLibs/arm64-v8a/libjsc.so rename to ReactAndroid/src/main/jni/third-party/jsc/jni/arm64-v8a/libjsc.so diff --git a/ReactAndroid/src/main/jniLibs/x86_64/libjsc.so b/ReactAndroid/src/main/jni/third-party/jsc/jni/x86_64/libjsc.so similarity index 100% rename from ReactAndroid/src/main/jniLibs/x86_64/libjsc.so rename to ReactAndroid/src/main/jni/third-party/jsc/jni/x86_64/libjsc.so