commit 5b1cc27cee1ee1c86e7e6da8ee383ccd1ea3c785
author Inseob Kim <inseob@google.com> Mon Dec 10 07:06:25 2018 +0000
committer Inseob Kim <inseob@google.com> Tue Dec 11 00:23:07 2018 +0000
tree 8f0fa1d8cbfa08081c438362a24315fecd144422
parent 2473b08b07ccd58978d4b0271dc22a770b9b8605

Revert "Revert "Schematize vold system properties""

This reverts commit 2473b08b07ccd58978d4b0271dc22a770b9b8605.

Reason for revert: Fixed build breakage
sysprop_cpp and sysprop_java directly have been linking against
libprotobuf-cpp-full and do not set proto.type field, which could
cause ASAN error due to linking against both libproto version of full
and lite.

Change-Id: I96eb47444d7b6f6b5fef092efc1514fcdd6f33b6
Merged-In: I8e04f643197b6c8a60cc38c6979e41c5de3469f5

Android.bp

diff --git a/Android.bp b/Android.bp
index 170e22e..6a22693 100644
--- a/Android.bp
+++ b/Android.bp
@@ -619,6 +619,8 @@
         "core/java/com/android/server/DropboxLogTags.logtags",
         "core/java/org/chromium/arc/EventLogTags.logtags",
 
+        ":platform-properties",
+
         ":framework-statslog-gen",
     ],