jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(asan): remove asan checker

Browse Source 
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:
Sim Sun
2020-02-25 21:46:18 -08:00
committed by Facebook Github Bot
parent 4c82d3f4d3
commit 4a2349c42d
5 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/build.gradle
View File

@@ -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'

6
android/src/main/java/com/facebook/flipper/android/utils/FlipperUtils.java
View File

@@ -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() {

1
android/third-party/overrides/DoubleConversion/build.gradle vendored
View File

@@ -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'

1
android/third-party/overrides/Folly/build.gradle vendored
View File

@@ -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'

1
android/third-party/overrides/glog/build.gradle vendored
View File

@@ -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'