commit 11a29880f318f13159590870307edc671016a792
author Gavin Corkery <gavincorkery@google.com> Thu Mar 14 07:22:40 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 14 07:22:40 2019 -0700
tree ec5e002522e80cf194683a0dec306401fbaddee6
parent 1705924845c0ba5a25628b319c4130c4b9a32283
parent aac8abab9d145e50420d397fc8cebc0ea978c715

Merge "Rename data/pkg_staging to data/app-staging"
am: aac8abab9d

Change-Id: I606af9209c8c24edda1e619bb0d495ee103395d5

libfscrypt/fscrypt_init_extensions.cpp

diff --git a/libfscrypt/fscrypt_init_extensions.cpp b/libfscrypt/fscrypt_init_extensions.cpp
index 2291c14..9781267 100644
--- a/libfscrypt/fscrypt_init_extensions.cpp
+++ b/libfscrypt/fscrypt_init_extensions.cpp
@@ -87,7 +87,7 @@
         "vendor_ce", "vendor_de",
         "media",
         "data", "user", "user_de",
-        "apex", "preloads", "pkg_staging",
+        "apex", "preloads", "app-staging",
         "gsi",
     };
     std::string prefix = "/data/";