Update fbjni submodule to new upstream and latest version

dreiss · facebook-github-bot · commit 42faf961c83d · 2019-10-31T11:48:25.000-07:00
Summary:
The central fbjni repository is now public, so point to it and
take the latest version, which includes support for host builds
and some condensed syntax.

Test Plan: CI

Differential Revision: D18217840

fbshipit-source-id: 454e3e081f7e3155704fed692506251c4018b2a1
diff --git a/.gitmodules b/.gitmodules
@@ -117,4 +117,4 @@
 [submodule "android/libs/fbjni"]
     ignore = dirty
     path = android/libs/fbjni
-    url = https://github.com/IvanKobzarev/fbjni.git
+    url = https://github.com/facebookincubator/fbjni.git
diff --git a/android/libs/fbjni b/android/libs/fbjni
@@ -1 +1 @@
-Subproject commit dc916917e1500527f83bc24b1767a123d6549ca0
+Subproject commit e109650ca03e3db54ab973c14d10f176b6436c48
diff --git a/android/libs/fbjni_local/build.gradle b/android/libs/fbjni_local/build.gradle
@@ -11,7 +11,7 @@ android {
 
         sourceSets {
             main {
-                manifest.srcFile '../fbjni/ApplicationManifest.xml'
+                manifest.srcFile '../fbjni/java/com/facebook/jni/AndroidManifest.xml'
                 java {
                     srcDir '../fbjni/java'
                 }
@@ -35,6 +35,7 @@ android {
 
 dependencies {
     compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
+    implementation 'com.facebook.soloader:nativeloader:0.8.0'
 }
 
 apply from: rootProject.file('gradle/release.gradle')
diff --git a/android/pytorch_android/host/build.gradle b/android/pytorch_android/host/build.gradle
@@ -28,6 +28,6 @@ sourceSets {
 dependencies {
     compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
     implementation 'com.facebook.soloader:nativeloader:0.8.0'
-    implementation 'com.facebook.fbjni:fbjni:0.0.3-SNAPSHOT'
+    implementation 'com.facebook.fbjni:fbjni-java-only:0.0.3'
     testImplementation 'junit:junit:4.12'
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ android {`
`11`	`11`
`12`	`12`	`sourceSets {`
`13`	`13`	`main {`
`14`		`- manifest.srcFile '../fbjni/ApplicationManifest.xml'`
	`14`	`+ manifest.srcFile '../fbjni/java/com/facebook/jni/AndroidManifest.xml'`
`15`	`15`	`java {`
`16`	`16`	`srcDir '../fbjni/java'`
`17`	`17`	`}`
`@@ -35,6 +35,7 @@ android {`
`35`	`35`
`36`	`36`	`dependencies {`
`37`	`37`	`compileOnly 'com.google.code.findbugs:jsr305:3.0.1'`
	`38`	`+ implementation 'com.facebook.soloader:nativeloader:0.8.0'`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`apply from: rootProject.file('gradle/release.gradle')`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ sourceSets {`
`28`	`28`	`dependencies {`
`29`	`29`	`compileOnly 'com.google.code.findbugs:jsr305:3.0.1'`
`30`	`30`	`implementation 'com.facebook.soloader:nativeloader:0.8.0'`
`31`		`- implementation 'com.facebook.fbjni:fbjni:0.0.3-SNAPSHOT'`
	`31`	`+ implementation 'com.facebook.fbjni:fbjni-java-only:0.0.3'`
`32`	`32`	`testImplementation 'junit:junit:4.12'`
`33`	`33`	`}`