jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Pritesh Nandgaonkar
2018-06-19 15:31:33 +01:00
parent 7405cd268a
commit 88a6cff373
45 changed files with 14 additions and 6368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/build.gradle
View File

@@ -89,17 +89,17 @@ task prepareBoost(dependsOn: [downloadBoost], type: Copy) {
}
task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
src 'https://github.com/facebook/folly/archive/v2018.05.21.00.tar.gz'
src 'https://github.com/facebook/folly/archive/v2018.06.18.00.tar.gz'
onlyIfNewer true
overwrite false
dest new File(downloadsDir, 'folly-2018.05.21.00.tar.gz');
dest new File(downloadsDir, 'folly-2018.06.18.00.tar.gz');
}
task prepareFolly(dependsOn: [downloadFolly], type: Copy) {
from tarTree(downloadFolly.dest)
from './third-party/folly/'
include 'folly-2018.05.21.00/folly/**/*', 'build.gradle', 'CMakeLists.txt', 'ApplicationManifest.xml'
eachFile {fname -> fname.path = (fname.path - "folly-2018.05.21.00/")}
include 'folly-2018.06.18.00/folly/**/*', 'build.gradle', 'CMakeLists.txt', 'ApplicationManifest.xml'
eachFile {fname -> fname.path = (fname.path - "folly-2018.06.18.00/")}
includeEmptyDirs = false
into "$thirdPartyNdkDir/folly"
}
@@ -242,8 +242,8 @@ android {
implementation deps.supportAppCompat
implementation deps.stetho
implementation deps.okhttp3
implementation 'com.facebook.litho:litho-core:0.15.0'
implementation 'com.facebook.litho:litho-widget:0.15.0'
implementation deps.lithoCore
implementation deps.lithoWidget
implementation 'org.mozilla:rhino:1.7.10'
}
}

2
android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java
View File

@@ -35,7 +35,7 @@ public class SonarSampleApplication extends Application {
SoLoader.init(this, false);
try {
//SoLoader.loadLibrary("sonarfb");
System.loadLibrary("sonarcpp");
SoLoader.loadLibrary("sonarfb");
} catch (Exception e) {
throw new RuntimeException(e);
}