commit 3119685217c9f49ef24595088f070fa876eccdd0
author Darren Krahn <dkrahn@google.com> Mon Oct 19 20:24:56 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 20 15:23:48 2015 +0000
tree 02398d2cd072294caa043842521688f6be4bcf57
parent c662a247b77b7252424e3ab5e1d56917a092d259

Revert "weaved: Temporarily disable keystore_encryptor"

This reverts commit 6765efdf49f824c98d13afefe920bdee237e1c0f.

Change-Id: I4d35889f71d2a8dcd91155f2374f89c1a7d42bd1

Android.mk

diff --git a/Android.mk b/Android.mk
index 1c154c3..f207dbe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,11 +88,11 @@
 	buffet/dbus_bindings/com.android.Weave.Command.dbus-xml \
 	buffet/dbus_bindings/com.android.Weave.Manager.dbus-xml \
 
-#ifdef BRILLO
-#LOCAL_SRC_FILES += buffet/keystore_encryptor.cc
-#else
+ifdef BRILLO
+LOCAL_SRC_FILES += buffet/keystore_encryptor.cc
+else
 LOCAL_SRC_FILES += buffet/fake_encryptor.cc
-#endif
+endif
 
 include $(BUILD_STATIC_LIBRARY)