summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-04-15 14:11:07 -0700
committerPaul Lawrence <paullawrence@google.com>2015-05-29 14:15:43 -0700
commit2ecc64285a67bad1f942581f5bd9f361d689d37c (patch)
tree167513debd8d70c911358ae56fd9391cf0323b58
parentdb1d49c70eec489cf3d60a4ec70a8e7c0f3f2b76 (diff)
downloadextras-2ecc64285a67bad1f942581f5bd9f361d689d37c.tar.gz
DO NOT MERGE Enable properties in ext4enc
(cherry-picked from commit 829e6413348e1d1569b32a604484b4ace3083776) Enables OwnerInfo and pattern suppression Change-Id: I4a7d71c9a750d5ed996ab1937bd5a81da480a2b3
-rw-r--r--ext4_utils/unencrypted_properties.cpp1
-rw-r--r--ext4_utils/unencrypted_properties.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/ext4_utils/unencrypted_properties.cpp b/ext4_utils/unencrypted_properties.cpp
index 5086c64b..d873e91f 100644
--- a/ext4_utils/unencrypted_properties.cpp
+++ b/ext4_utils/unencrypted_properties.cpp
@@ -6,6 +6,7 @@
namespace properties {
const char* key = "key";
const char* ref = "ref";
+ const char* props = "props";
const char* is_default = "is_default";
}
diff --git a/ext4_utils/unencrypted_properties.h b/ext4_utils/unencrypted_properties.h
index d0f6da1a..b2d1295f 100644
--- a/ext4_utils/unencrypted_properties.h
+++ b/ext4_utils/unencrypted_properties.h
@@ -5,6 +5,7 @@
namespace properties {
extern const char* key;
extern const char* ref;
+ extern const char* props;
extern const char* is_default;
}