diff options
| author | Tomasz Wasilczyk <twasilczyk@google.com> | 2023-08-23 15:24:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-23 15:24:45 +0000 |
| commit | 9433200ff06e8c740d2574a09ca37641ec704de6 (patch) | |
| tree | e98c8164fb0af80defc8487ae3afc60db0f44903 | |
| parent | 9d52e941bae934a39f4b2dfbe33c196b9ca9b20a (diff) | |
| parent | 58a352c5d78f20e8d3ef07cf7465f31ccc7469be (diff) | |
| download | neven-9433200ff06e8c740d2574a09ca37641ec704de6.tar.gz | |
Merge "Migrate from android::String path functions to std::filesystem" into main am: 58a352c5d7
Original change: https://android-review.googlesource.com/c/platform/external/neven/+/2722493
Change-Id: I41e79b388483b04af656d9ff0fdfb4d3391a3f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | FaceDetector_jni.cpp | 7 |
2 files changed, 7 insertions, 3 deletions
@@ -145,6 +145,9 @@ cc_library_shared { "libcutils", ], + whole_static_libs: [ + "libc++fs", + ], required: [ "RFFspeed_501.bmd", diff --git a/FaceDetector_jni.cpp b/FaceDetector_jni.cpp index 650cbf0..1741195 100644 --- a/FaceDetector_jni.cpp +++ b/FaceDetector_jni.cpp @@ -15,6 +15,7 @@ */ #include <assert.h> +#include <filesystem> #include <stdlib.h> #include <stdio.h> #include <fcntl.h> @@ -119,9 +120,9 @@ initialize(JNIEnv *_env, jobject _this, { // load the configuration file const char* root = getenv("ANDROID_ROOT"); - String8 path(root); - path.appendPath("usr/share/bmd/RFFstd_501.bmd"); - // path.appendPath("usr/share/bmd/RFFspeed_501.bmd"); + std::filesystem::path path(root); + path /= "usr/share/bmd/RFFstd_501.bmd"; + // path /= "usr/share/bmd/RFFspeed_501.bmd"; const int MAX_FILE_SIZE = 65536; void* initData = malloc( MAX_FILE_SIZE ); /* enough to fit entire file */ |