Merge "Snap for 10900817 from 58a352c5d78f20e8d3ef07cf7465f31ccc7469be to sdk-release" into sdk-releaseplatform-tools-34.0.5

3 files changed, 8 insertions, 28 deletions

diff --git a/Android.bp b/Android.bp
index 2241ede..1121f27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -145,42 +145,24 @@ cc_library_shared {
         "libcutils",
     ],
 
+    whole_static_libs: [
+        "libc++fs",
+    ],
 
     required: [
         "RFFspeed_501.bmd",
         "RFFstd_501.bmd",
     ],
-
-    //disable build in PDK
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-    },
 }
 
 prebuilt_usr_share {
     name: "RFFspeed_501.bmd",
-
-    //disable build in PDK
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-    },
     src: "Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd",
     sub_dir: "bmd",
 }
 
 prebuilt_usr_share {
     name: "RFFstd_501.bmd",
-
-    //disable build in PDK
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-    },
     src: "Embedded/common/data/APIEm/Modules/RFFstd_501.bmd",
     sub_dir: "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