From 3de7da950d39e7684e13d9cf039815fa7e40802f Mon Sep 17 00:00:00 2001
From: Yi-Yo Chiang <yochiang@google.com>
Date: Thu, 11 Aug 2022 16:50:43 +0800
Subject: [PATCH] Fix build breakage on -user build

Bug: 242145724
Test: Build any -user product
Change-Id: Id34f14a834919f1e381d0365d50847cb52cedf8d
---
 fs_mgr/fs_mgr_overlayfs.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 0b1eb399e..354d02a45 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -81,6 +81,9 @@ bool fs_mgr_overlayfs_filesystem_available(const std::string& filesystem) {
     return filesystems.find("\t" + filesystem + "\n") != std::string::npos;
 }
 
+const auto kLowerdirOption = "lowerdir="s;
+const auto kUpperdirOption = "upperdir="s;
+
 }  // namespace
 
 #if ALLOW_ADBD_DISABLE_VERITY == 0  // If we are a user build, provide stubs
@@ -328,9 +331,6 @@ std::string fs_mgr_get_overlayfs_candidate(const std::string& mount_point) {
     return "";
 }
 
-const auto kLowerdirOption = "lowerdir="s;
-const auto kUpperdirOption = "upperdir="s;
-
 static inline bool KernelSupportsUserXattrs() {
     struct utsname uts;
     uname(&uts);