Setup fbjni sub-project for maven (#119)
Summary: Set up our fbjni sub-project to be published to Maven Central. This removes a bunch of abiFilters that we no longer make use of, too. Closes https://github.com/facebook/Sonar/pull/119 Reviewed By: priteshrnandgaonkar Differential Revision: D8694537 Pulled By: passy fbshipit-source-id: de246fbda99c02856fbc7806b78df2114cb82acb
This commit is contained in:
committed by
Facebook Github Bot
parent
167792e7d8
commit
0515ddb76e
@@ -195,15 +195,15 @@ android {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||
|
||||
ndk {
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
stl 'c++_shared'
|
||||
abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_TOOLCHAIN=clang'
|
||||
arguments '-DANDROID_STL=c++_shared'
|
||||
arguments '-DANDROID_TOOLCHAIN=clang',
|
||||
'-DANDROID_STL=c++_shared'
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -236,10 +236,12 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':fbjni')
|
||||
implementation deps.soloader
|
||||
compileOnly deps.lithoAnnotations
|
||||
implementation 'org.glassfish:javax.annotation:10.0-b28'
|
||||
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
|
||||
|
||||
implementation project(':fbjni')
|
||||
|
||||
implementation deps.soloader
|
||||
implementation deps.guava
|
||||
implementation deps.jsr305
|
||||
implementation deps.supportAppCompat
|
||||
@@ -253,6 +255,7 @@ android {
|
||||
|
||||
project.afterEvaluate {
|
||||
preBuild.dependsOn prepareAllLibs
|
||||
}
|
||||
|
||||
apply from: rootProject.file('gradle/release.gradle')
|
||||
|
||||
@@ -260,4 +263,5 @@ task sourcesJar(type: Jar) {
|
||||
from android.sourceSets.main.java.srcDirs
|
||||
classifier = 'sources'
|
||||
}
|
||||
artifacts.add('archives', sourcesJar)}
|
||||
|
||||
artifacts.add('archives', sourcesJar)
|
||||
|
||||
@@ -46,7 +46,7 @@ dependencies {
|
||||
// SoLoader
|
||||
implementation deps.soloader
|
||||
|
||||
// For integration with Fresco
|
||||
// For integration with Fresco
|
||||
implementation deps.lithoFresco
|
||||
// For testing
|
||||
testImplementation deps.lithoTesting
|
||||
|
||||
@@ -8,10 +8,6 @@ android {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||
ndk {
|
||||
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_TOOLCHAIN=clang'
|
||||
|
||||
4
android/third-party/Folly/build.gradle
vendored
4
android/third-party/Folly/build.gradle
vendored
@@ -8,10 +8,6 @@ android {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||
ndk {
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared'
|
||||
|
||||
4
android/third-party/LibEvent/build.gradle
vendored
4
android/third-party/LibEvent/build.gradle
vendored
@@ -7,10 +7,6 @@ android {
|
||||
defaultConfig {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
ndk {
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_TOOLCHAIN=clang'
|
||||
|
||||
4
android/third-party/OpenSSL/build.gradle
vendored
4
android/third-party/OpenSSL/build.gradle
vendored
@@ -7,10 +7,6 @@ android {
|
||||
defaultConfig {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
ndk {
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
ndkBuild {
|
||||
arguments "NDK_APPLICATION_MK:=$projectDir/jni/Application.mk",
|
||||
|
||||
4
android/third-party/RSocket/build.gradle
vendored
4
android/third-party/RSocket/build.gradle
vendored
@@ -7,10 +7,6 @@ android {
|
||||
defaultConfig {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
ndk {
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_TOOLCHAIN=clang'
|
||||
|
||||
4
android/third-party/glog/build.gradle
vendored
4
android/third-party/glog/build.gradle
vendored
@@ -8,10 +8,6 @@ android {
|
||||
minSdkVersion rootProject.minSdkVersion
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||
ndk {
|
||||
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_TOOLCHAIN=clang'
|
||||
|
||||
Reference in New Issue
Block a user