refactor(asan): remove asan checker
Summary: Remove asan checker, we can use `BuildConfig.IS_ASAN_BUILD` to check whether it's a asan build to instead of invoking a JNI api. Differential Revision: D20088093 fbshipit-source-id: f26d367430a983fbe7b630919a4131fdf2e2d510
This commit is contained in:
committed by
Facebook Github Bot
parent
4c82d3f4d3
commit
4a2349c42d
@@ -18,6 +18,7 @@ android {
|
|||||||
minSdkVersion rootProject.minSdkVersion
|
minSdkVersion rootProject.minSdkVersion
|
||||||
targetSdkVersion rootProject.targetSdkVersion
|
targetSdkVersion rootProject.targetSdkVersion
|
||||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||||
|
buildConfigField "boolean", "IS_ASAN_BUILD", 'false'
|
||||||
|
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
|
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
|
||||||
|
|||||||
@@ -17,7 +17,11 @@ public final class FlipperUtils {
|
|||||||
private FlipperUtils() {}
|
private FlipperUtils() {}
|
||||||
|
|
||||||
public static boolean shouldEnableFlipper(final Context context) {
|
public static boolean shouldEnableFlipper(final Context context) {
|
||||||
return BuildConfig.IS_INTERNAL_BUILD && !isEndToEndTest() && isMainProcess(context);
|
return BuildConfig.IS_INTERNAL_BUILD
|
||||||
|
&& !isEndToEndTest()
|
||||||
|
&& isMainProcess(context)
|
||||||
|
// Flipper has issue with ASAN build. They cannot be concurrently enabled.
|
||||||
|
&& !BuildConfig.IS_ASAN_BUILD;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isEndToEndTest() {
|
private static boolean isEndToEndTest() {
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ android {
|
|||||||
minSdkVersion rootProject.minSdkVersion
|
minSdkVersion rootProject.minSdkVersion
|
||||||
targetSdkVersion rootProject.targetSdkVersion
|
targetSdkVersion rootProject.targetSdkVersion
|
||||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||||
|
buildConfigField "boolean", "IS_ASAN_BUILD", 'false'
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
arguments '-DANDROID_TOOLCHAIN=clang'
|
arguments '-DANDROID_TOOLCHAIN=clang'
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ android {
|
|||||||
minSdkVersion rootProject.minSdkVersion
|
minSdkVersion rootProject.minSdkVersion
|
||||||
targetSdkVersion rootProject.targetSdkVersion
|
targetSdkVersion rootProject.targetSdkVersion
|
||||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||||
|
buildConfigField "boolean", "IS_ASAN_BUILD", 'false'
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared'
|
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared'
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ android {
|
|||||||
minSdkVersion rootProject.minSdkVersion
|
minSdkVersion rootProject.minSdkVersion
|
||||||
targetSdkVersion rootProject.targetSdkVersion
|
targetSdkVersion rootProject.targetSdkVersion
|
||||||
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
|
||||||
|
buildConfigField "boolean", "IS_ASAN_BUILD", 'false'
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
arguments '-DANDROID_TOOLCHAIN=clang'
|
arguments '-DANDROID_TOOLCHAIN=clang'
|
||||||
|
|||||||
Reference in New Issue
Block a user