Skip to content

Commit

Permalink
Remove pickFirst arguments (#27964)
Browse files Browse the repository at this point in the history
Summary:
This is no longer necessary with the new Flipper release.
Pull Request resolved: #27964

Test Plan:
This was a built-time problem so the CI jobs would catch this.

## Changelog

[Android] [Removed] - pickFirst options for RNTester and template

Differential Revision: D19815829

Pulled By: passy

fbshipit-source-id: d8f66e64e7e922b8ea18ad6eeec3a1c8e6bc77fa
  • Loading branch information
passy authored and facebook-github-bot committed Feb 10, 2020
1 parent 887ba8f commit 4bb0b4f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
7 changes: 0 additions & 7 deletions RNTester/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,6 @@ def useIntlJsc = false
android {
compileSdkVersion 29

packagingOptions {
pickFirst '**/armeabi-v7a/libc++_shared.so'
pickFirst '**/x86/libc++_shared.so'
pickFirst '**/x86_64/libc++_shared.so'
pickFirst '**/arm64-v8a/libc++_shared.so'
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down
7 changes: 0 additions & 7 deletions template/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,6 @@ android {
}
}

packagingOptions {
pickFirst "lib/armeabi-v7a/libc++_shared.so"
pickFirst "lib/arm64-v8a/libc++_shared.so"
pickFirst "lib/x86/libc++_shared.so"
pickFirst "lib/x86_64/libc++_shared.so"
}

// applicationVariants are e.g. debug, release
applicationVariants.all { variant ->
variant.outputs.each { output ->
Expand Down

0 comments on commit 4bb0b4f

Please sign in to comment.