Remove NDK build from fbjni sub-project (#116)
Summary: We're already building this as dependency via CMake of sonar itself and bundle the resulting `.so` files in there. This project only contains the java files so we can ship them as separate JAR. Importantly, this avoids having to use `pickFirst` as we bundle multiple incompatible `.so` files in both AARs. Closes https://github.com/facebook/Sonar/pull/116 Reviewed By: priteshrnandgaonkar Differential Revision: D8691119 Pulled By: passy fbshipit-source-id: 82303d6c2b5d7e12dcd8f49300090ce8e4570e47
This commit is contained in:
committed by
Facebook Github Bot
parent
f8c79b55dc
commit
167792e7d8
@@ -24,13 +24,6 @@ android {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
pickFirst 'lib/armeabi-v7a/libsonarfb.so'
|
||||
pickFirst 'lib/x86/libsonarfb.so'
|
||||
pickFirst 'lib/x86_64/libsonarfb.so'
|
||||
pickFirst 'lib/arm64-v8a/libsonarfb.so'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,20 +15,6 @@ android {
|
||||
}
|
||||
}
|
||||
}
|
||||
ndk {
|
||||
abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_TOOLCHAIN=clang'
|
||||
}
|
||||
}
|
||||
}
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
path './CMakeLists.txt'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user