Skip to content

Commit

Permalink
Merge pull request #10306 from Expensify/Rory-FixGradleBuild
Browse files Browse the repository at this point in the history
  • Loading branch information
roryabraham authored Aug 8, 2022
2 parents 5597cfa + 129e8bd commit c9017fd
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -154,33 +154,6 @@ android {
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001018806
versionName "1.1.88-6"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
// We configure the NDK build only if you decide to opt-in for the New Architecture.
externalNativeBuild {
ndkBuild {
arguments "APP_PLATFORM=android-21",
"APP_STL=c++_shared",
"NDK_TOOLCHAIN_VERSION=clang",
"GENERATED_SRC_DIR=$buildDir/generated/source",
"PROJECT_BUILD_DIR=$buildDir",
"REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
"REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
"NODE_MODULES_DIR=$rootDir/../node_modules"
cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
cppFlags "-std=c++17"
// Make sure this target name is the same you specify inside the
// src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
targets "rndiffapp_appmodules"
}
}
if (!enableSeparateBuildPerCPUArchitecture) {
ndk {
abiFilters (*reactNativeArchitectures())
}
}
}
}
splits {
abi {
Expand Down

0 comments on commit c9017fd

Please sign in to comment.