Snap for 10843824 from c3badc2fca98b6cadb320cae48e5d0ef6b50f21b to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I584f5568e83377a5f54267d7848734f3bf42f262

3 files changed, 8 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 0291f97..1121f27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 ab765fc..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,13 +120,13 @@ 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 */
-    int filedesc = open(path.string(), O_RDONLY);
+    int filedesc = open(path.c_str(), O_RDONLY);
     int initDataSize = read(filedesc, initData, MAX_FILE_SIZE);
     close(filedesc);
 
diff --git a/OWNERS b/OWNERS
deleted file mode 100644
index bc0ae15..0000000
--- a/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-# This project is about 9 year old.
-# Please update this list if you find better candidates.
-rtenneti@google.com