Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make android object detection rectangles correct #75

Merged
merged 2 commits into from
May 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ jobs:
- name: Setup
uses: ./.github/actions/setup

- name: Get submodule
run: git submodule update --init --recursive

- name: Cache turborepo for Android
uses: actions/cache@v3
with:
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "libyuv"]
path = libyuv
url = https://android.googlesource.com/platform/external/libyuv/
34 changes: 2 additions & 32 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ android {

buildFeatures {
prefab true
}
}

ndkVersion getExtOrDefault("ndkVersion")
compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
Expand All @@ -69,19 +69,6 @@ android {
minSdkVersion getExtOrIntegerDefault("minSdkVersion")
targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")

externalNativeBuild {
cmake {
cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
abiFilters (*reactNativeArchitectures())
arguments "-DANDROID_STL=c++_shared"
}
}
}

externalNativeBuild {
cmake {
path "CMakeLists.txt"
}
}

buildTypes {
Expand All @@ -99,24 +86,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

// packagingOptions {
// excludes = [
// "**/libc++_shared.so",
// "**/libfbjni.so",
// "**/libjsi.so",
// "**/libfolly_json.so",
// "**/libfolly_runtime.so",
// "**/libglog.so",
// "**/libhermes.so",
// "**/libhermes-executor-debug.so",
// "**/libhermes_executor.so",
// "**/libreactnativejni.so",
// "**/libturbomodulejsijni.so",
// "**/libreact_nativemodule_core.so",
// "**/libjscexecutor.so"
// ]
// }

}

repositories {
Expand All @@ -134,5 +103,6 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation project(':react-native-vision-camera')
implementation 'com.google.mediapipe:tasks-vision:0.10.2'
implementation 'androidx.camera:camera-core:1.3.3'
}

33 changes: 0 additions & 33 deletions android/src/main/cpp/JImage.cpp

This file was deleted.

27 changes: 0 additions & 27 deletions android/src/main/cpp/JImage.h

This file was deleted.

34 changes: 0 additions & 34 deletions android/src/main/cpp/JImagePlane.cpp

This file was deleted.

27 changes: 0 additions & 27 deletions android/src/main/cpp/JImagePlane.h

This file was deleted.

Loading
Loading