From 4a2349c42d28ba0ff32f1bc4424a7632442b3b41 Mon Sep 17 00:00:00 2001 From: Sim Sun Date: Tue, 25 Feb 2020 21:46:18 -0800 Subject: [PATCH] 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 --- android/build.gradle | 1 + .../com/facebook/flipper/android/utils/FlipperUtils.java | 6 +++++- android/third-party/overrides/DoubleConversion/build.gradle | 1 + android/third-party/overrides/Folly/build.gradle | 1 + android/third-party/overrides/glog/build.gradle | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index fcdf50f7b..59905916b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -18,6 +18,7 @@ android { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true' + buildConfigField "boolean", "IS_ASAN_BUILD", 'false' ndk { abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' diff --git a/android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java b/android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java index 7cf2f0072..13643a13a 100644 --- a/android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java +++ b/android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java @@ -17,7 +17,11 @@ public final class FlipperUtils { private FlipperUtils() {} 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() { diff --git a/android/third-party/overrides/DoubleConversion/build.gradle b/android/third-party/overrides/DoubleConversion/build.gradle index f8b0f4999..06389eb64 100644 --- a/android/third-party/overrides/DoubleConversion/build.gradle +++ b/android/third-party/overrides/DoubleConversion/build.gradle @@ -15,6 +15,7 @@ android { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true' + buildConfigField "boolean", "IS_ASAN_BUILD", 'false' externalNativeBuild { cmake { arguments '-DANDROID_TOOLCHAIN=clang' diff --git a/android/third-party/overrides/Folly/build.gradle b/android/third-party/overrides/Folly/build.gradle index 44d98fe55..7fdd6991d 100644 --- a/android/third-party/overrides/Folly/build.gradle +++ b/android/third-party/overrides/Folly/build.gradle @@ -15,6 +15,7 @@ android { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true' + buildConfigField "boolean", "IS_ASAN_BUILD", 'false' externalNativeBuild { cmake { arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared' diff --git a/android/third-party/overrides/glog/build.gradle b/android/third-party/overrides/glog/build.gradle index f8b0f4999..06389eb64 100644 --- a/android/third-party/overrides/glog/build.gradle +++ b/android/third-party/overrides/glog/build.gradle @@ -15,6 +15,7 @@ android { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true' + buildConfigField "boolean", "IS_ASAN_BUILD", 'false' externalNativeBuild { cmake { arguments '-DANDROID_TOOLCHAIN=clang'