commit d46e9cdbcdc1f24b9e7d9fb4ab79702b1970c685
author George Chang <georgekgchang@google.com> Thu Mar 18 12:04:21 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 18 12:04:21 2021 +0000
tree abf8fb0ee892dd5e6e3606e7795f3ac135aecc65
parent a4999dd1873eb5320952e13c9b874650a6405c47
parent c4fa9cc87312e2bda99d3c360b13721b8ed0fafb

Merge "Restore eDtaMode after NCI SetConfig"

utils/Android.bp

diff --git a/utils/Android.bp b/utils/Android.bp
index e792a46..d8a5e9d 100644
--- a/utils/Android.bp
+++ b/utils/Android.bp
@@ -59,6 +59,7 @@
     static_libs: [
         "libnfcutils",
         "libgmock",
+        "libc++fs"
     ],
     shared_libs: [
         "libbase",

utils/test/config_test.cc

diff --git a/utils/test/config_test.cc b/utils/test/config_test.cc
index b2fde71..62e324c 100644
--- a/utils/test/config_test.cc
+++ b/utils/test/config_test.cc
@@ -16,9 +16,12 @@
 #include <gtest/gtest.h>
 
 #include <config.h>
+#include <filesystem>
 
 namespace {
-const char SIMPLE_CONFIG_FILE[] = "/data/local/tmp/test_config.conf";
+const std::filesystem::path kConfigFile =
+    std::filesystem::temp_directory_path() / "test_config.conf";
+const char* SIMPLE_CONFIG_FILE = kConfigFile.c_str();
 const char SIMPLE_CONFIG[] =
     "# Simple config file test\n\
 STRING_VALUE=\"Hello World!\"\n\
@@ -60,6 +63,9 @@
     fwrite(SIMPLE_CONFIG, 1, sizeof(SIMPLE_CONFIG), fp);
     fclose(fp);
   }
+  void TearDown() override {
+    std::filesystem::remove(kConfigFile);
+  }
 };
 
 TEST(ConfigTestFromString, test_simple_config) {