commit 45d107afd43e517d2822599e5b019f4b8a3cc27d
author Vic Yang <victoryang@google.com> Wed Aug 07 10:47:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 07 10:47:39 2019 -0700
tree 6b438f72cea6ee4f260b04d21af332837a3ed4b9
parent 2200e3ecb5a12432bc3e7207ea598700efdccfe5
parent 9406cb2b7330947bf5f5104b5e860e37f4687b3b

Merge "fs_mgr: Make kDefaultAndroidDtDir constexpr"
am: ef06b4fc7a

Change-Id: I553ca2e8a81b6b48a156c7a3a4843925b6804ac1

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 9a0f4fe..bc197cd 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -46,7 +46,7 @@
 namespace fs_mgr {
 namespace {
 
-const std::string kDefaultAndroidDtDir("/proc/device-tree/firmware/android");
+constexpr char kDefaultAndroidDtDir[] = "/proc/device-tree/firmware/android";
 
 struct FlagList {
     const char *name;