From 94885d41f1c1d4b90d8c53af49316d6309b5f00c Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Mon, 10 Oct 2022 21:40:08 -0700 Subject: [PATCH] Remove Generated NDK Artifacts Summary: These files are generated by Android Gradle Plugin doing the CMake build. Remove the generated files and add to the .gitignore (this looks to also be used by hg). Reviewed By: javache Differential Revision: D40169828 fbshipit-source-id: e0b7d907474aab5fcdb1a2ab33d46fdee6feed45 --- .gitignore | 2 ++ java/.cxx/abi_configuration_3x6d4s5q.json | 14 ----------- java/.cxx/abi_configuration_3x6d4s5q_key.json | 23 ------------------- java/.cxx/ndk_locator_record_264jk1e2.json | 11 --------- .../.cxx/ndk_locator_record_264jk1e2_key.json | 9 -------- lib/fb/.cxx/abi_configuration_3x6d4s5q.json | 14 ----------- .../.cxx/abi_configuration_3x6d4s5q_key.json | 23 ------------------- lib/fb/.cxx/ndk_locator_record_2w3j676q.json | 11 --------- .../.cxx/ndk_locator_record_2w3j676q_key.json | 8 ------- testutil/.cxx/abi_configuration_3x6d4s5q.json | 14 ----------- .../.cxx/abi_configuration_3x6d4s5q_key.json | 23 ------------------- .../.cxx/ndk_locator_record_2w3j676q.json | 11 --------- .../.cxx/ndk_locator_record_2w3j676q_key.json | 8 ------- yogacore/.cxx/abi_configuration_4s14e3o2.json | 14 ----------- .../.cxx/abi_configuration_4s14e3o2_key.json | 18 --------------- .../.cxx/ndk_locator_record_2w3j676q.json | 11 --------- .../.cxx/ndk_locator_record_2w3j676q_key.json | 8 ------- 17 files changed, 2 insertions(+), 220 deletions(-) delete mode 100644 java/.cxx/abi_configuration_3x6d4s5q.json delete mode 100644 java/.cxx/abi_configuration_3x6d4s5q_key.json delete mode 100644 java/.cxx/ndk_locator_record_264jk1e2.json delete mode 100644 java/.cxx/ndk_locator_record_264jk1e2_key.json delete mode 100644 lib/fb/.cxx/abi_configuration_3x6d4s5q.json delete mode 100644 lib/fb/.cxx/abi_configuration_3x6d4s5q_key.json delete mode 100644 lib/fb/.cxx/ndk_locator_record_2w3j676q.json delete mode 100644 lib/fb/.cxx/ndk_locator_record_2w3j676q_key.json delete mode 100644 testutil/.cxx/abi_configuration_3x6d4s5q.json delete mode 100644 testutil/.cxx/abi_configuration_3x6d4s5q_key.json delete mode 100644 testutil/.cxx/ndk_locator_record_2w3j676q.json delete mode 100644 testutil/.cxx/ndk_locator_record_2w3j676q_key.json delete mode 100644 yogacore/.cxx/abi_configuration_4s14e3o2.json delete mode 100644 yogacore/.cxx/abi_configuration_4s14e3o2_key.json delete mode 100644 yogacore/.cxx/ndk_locator_record_2w3j676q.json delete mode 100644 yogacore/.cxx/ndk_locator_record_2w3j676q_key.json diff --git a/.gitignore b/.gitignore index 35d9788a..c4bc30bd 100644 --- a/.gitignore +++ b/.gitignore @@ -63,5 +63,7 @@ Carthage/Build # Gradle .gradle + # NDK/CMake +.cxx .externalNativeBuild diff --git a/java/.cxx/abi_configuration_3x6d4s5q.json b/java/.cxx/abi_configuration_3x6d4s5q.json deleted file mode 100644 index e542dae1..00000000 --- a/java/.cxx/abi_configuration_3x6d4s5q.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "allAbis": [ - "armeabi-v7a", - "arm64-v8a", - "x86", - "x86_64" - ], - "validAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ] -} \ No newline at end of file diff --git a/java/.cxx/abi_configuration_3x6d4s5q_key.json b/java/.cxx/abi_configuration_3x6d4s5q_key.json deleted file mode 100644 index 4758fae2..00000000 --- a/java/.cxx/abi_configuration_3x6d4s5q_key.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ndkHandlerSupportedAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "ndkHandlerDefaultAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "externalNativeBuildAbiFilters": [], - "ndkConfigAbiFilters": [ - "armeabi-v7a", - "x86_64", - "x86", - "arm64-v8a" - ], - "splitsFilterAbis": [], - "ideBuildOnlyTargetAbi": true -} \ No newline at end of file diff --git a/java/.cxx/ndk_locator_record_264jk1e2.json b/java/.cxx/ndk_locator_record_264jk1e2.json deleted file mode 100644 index 1eb5cb14..00000000 --- a/java/.cxx/ndk_locator_record_264jk1e2.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ndk": "/opt/android_sdk/ndk/21.3.6528147", - "revision": { - "mMajor": 21, - "mMinor": 3, - "mMicro": 6528147, - "mPreview": 0, - "mPrecision": "MICRO", - "mPreviewSeparator": " " - } -} \ No newline at end of file diff --git a/java/.cxx/ndk_locator_record_264jk1e2_key.json b/java/.cxx/ndk_locator_record_264jk1e2_key.json deleted file mode 100644 index 74c7c2bc..00000000 --- a/java/.cxx/ndk_locator_record_264jk1e2_key.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ndkVersionFromDsl": "21.3.6528147", - "sdkFolder": "/opt/android_sdk", - "sideBySideNdkFolderNames": [ - "21.4.7075529", - "21.3.6528147", - "21.1.6352462" - ] -} \ No newline at end of file diff --git a/lib/fb/.cxx/abi_configuration_3x6d4s5q.json b/lib/fb/.cxx/abi_configuration_3x6d4s5q.json deleted file mode 100644 index e542dae1..00000000 --- a/lib/fb/.cxx/abi_configuration_3x6d4s5q.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "allAbis": [ - "armeabi-v7a", - "arm64-v8a", - "x86", - "x86_64" - ], - "validAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ] -} \ No newline at end of file diff --git a/lib/fb/.cxx/abi_configuration_3x6d4s5q_key.json b/lib/fb/.cxx/abi_configuration_3x6d4s5q_key.json deleted file mode 100644 index 4758fae2..00000000 --- a/lib/fb/.cxx/abi_configuration_3x6d4s5q_key.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ndkHandlerSupportedAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "ndkHandlerDefaultAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "externalNativeBuildAbiFilters": [], - "ndkConfigAbiFilters": [ - "armeabi-v7a", - "x86_64", - "x86", - "arm64-v8a" - ], - "splitsFilterAbis": [], - "ideBuildOnlyTargetAbi": true -} \ No newline at end of file diff --git a/lib/fb/.cxx/ndk_locator_record_2w3j676q.json b/lib/fb/.cxx/ndk_locator_record_2w3j676q.json deleted file mode 100644 index 7b1fb6ca..00000000 --- a/lib/fb/.cxx/ndk_locator_record_2w3j676q.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ndk": "/opt/android_sdk/ndk/21.4.7075529", - "revision": { - "mMajor": 21, - "mMinor": 4, - "mMicro": 7075529, - "mPreview": 0, - "mPrecision": "MICRO", - "mPreviewSeparator": " " - } -} \ No newline at end of file diff --git a/lib/fb/.cxx/ndk_locator_record_2w3j676q_key.json b/lib/fb/.cxx/ndk_locator_record_2w3j676q_key.json deleted file mode 100644 index 83c64818..00000000 --- a/lib/fb/.cxx/ndk_locator_record_2w3j676q_key.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sdkFolder": "/opt/android_sdk", - "sideBySideNdkFolderNames": [ - "21.4.7075529", - "21.3.6528147", - "21.1.6352462" - ] -} \ No newline at end of file diff --git a/testutil/.cxx/abi_configuration_3x6d4s5q.json b/testutil/.cxx/abi_configuration_3x6d4s5q.json deleted file mode 100644 index e542dae1..00000000 --- a/testutil/.cxx/abi_configuration_3x6d4s5q.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "allAbis": [ - "armeabi-v7a", - "arm64-v8a", - "x86", - "x86_64" - ], - "validAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ] -} \ No newline at end of file diff --git a/testutil/.cxx/abi_configuration_3x6d4s5q_key.json b/testutil/.cxx/abi_configuration_3x6d4s5q_key.json deleted file mode 100644 index 4758fae2..00000000 --- a/testutil/.cxx/abi_configuration_3x6d4s5q_key.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ndkHandlerSupportedAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "ndkHandlerDefaultAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "externalNativeBuildAbiFilters": [], - "ndkConfigAbiFilters": [ - "armeabi-v7a", - "x86_64", - "x86", - "arm64-v8a" - ], - "splitsFilterAbis": [], - "ideBuildOnlyTargetAbi": true -} \ No newline at end of file diff --git a/testutil/.cxx/ndk_locator_record_2w3j676q.json b/testutil/.cxx/ndk_locator_record_2w3j676q.json deleted file mode 100644 index 7b1fb6ca..00000000 --- a/testutil/.cxx/ndk_locator_record_2w3j676q.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ndk": "/opt/android_sdk/ndk/21.4.7075529", - "revision": { - "mMajor": 21, - "mMinor": 4, - "mMicro": 7075529, - "mPreview": 0, - "mPrecision": "MICRO", - "mPreviewSeparator": " " - } -} \ No newline at end of file diff --git a/testutil/.cxx/ndk_locator_record_2w3j676q_key.json b/testutil/.cxx/ndk_locator_record_2w3j676q_key.json deleted file mode 100644 index 83c64818..00000000 --- a/testutil/.cxx/ndk_locator_record_2w3j676q_key.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sdkFolder": "/opt/android_sdk", - "sideBySideNdkFolderNames": [ - "21.4.7075529", - "21.3.6528147", - "21.1.6352462" - ] -} \ No newline at end of file diff --git a/yogacore/.cxx/abi_configuration_4s14e3o2.json b/yogacore/.cxx/abi_configuration_4s14e3o2.json deleted file mode 100644 index e542dae1..00000000 --- a/yogacore/.cxx/abi_configuration_4s14e3o2.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "allAbis": [ - "armeabi-v7a", - "arm64-v8a", - "x86", - "x86_64" - ], - "validAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ] -} \ No newline at end of file diff --git a/yogacore/.cxx/abi_configuration_4s14e3o2_key.json b/yogacore/.cxx/abi_configuration_4s14e3o2_key.json deleted file mode 100644 index 2b2c0ca1..00000000 --- a/yogacore/.cxx/abi_configuration_4s14e3o2_key.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ndkHandlerSupportedAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "ndkHandlerDefaultAbis": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "externalNativeBuildAbiFilters": [], - "ndkConfigAbiFilters": [], - "splitsFilterAbis": [], - "ideBuildOnlyTargetAbi": true -} \ No newline at end of file diff --git a/yogacore/.cxx/ndk_locator_record_2w3j676q.json b/yogacore/.cxx/ndk_locator_record_2w3j676q.json deleted file mode 100644 index 7b1fb6ca..00000000 --- a/yogacore/.cxx/ndk_locator_record_2w3j676q.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ndk": "/opt/android_sdk/ndk/21.4.7075529", - "revision": { - "mMajor": 21, - "mMinor": 4, - "mMicro": 7075529, - "mPreview": 0, - "mPrecision": "MICRO", - "mPreviewSeparator": " " - } -} \ No newline at end of file diff --git a/yogacore/.cxx/ndk_locator_record_2w3j676q_key.json b/yogacore/.cxx/ndk_locator_record_2w3j676q_key.json deleted file mode 100644 index 83c64818..00000000 --- a/yogacore/.cxx/ndk_locator_record_2w3j676q_key.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sdkFolder": "/opt/android_sdk", - "sideBySideNdkFolderNames": [ - "21.4.7075529", - "21.3.6528147", - "21.1.6352462" - ] -} \ No newline at end of file