commit 781f9fc4af6002f5eb47b2bad852e1090d525298
author Szymon Starzycki <sstar@google.com> Wed Oct 02 17:21:41 2013 -0700
committer Szymon Starzycki <sstar@google.com> Wed Oct 02 18:24:58 2013 -0700
tree 7da996c8f21426acda2a0686254e73ddd4477203
parent 8c3263ea94ab7292ce8ba88d60c4672ec75b5e1a

Revert "Revert "Fastbootd: flashing certification""

CMS functionality is now available

This reverts commit 068b71dd9cd6cb03dfcdc0c9deced361780bc0d3.

Conflicts:
	fastbootd/Android.mk
	fastbootd/fastbootd.c
	fastbootd/utils.c
	fastbootd/utils.h

Change-Id: I1a27459b41d9297603deb124c65f237ff971e5b6

fastbootd/Android.mk

diff --git a/fastbootd/Android.mk b/fastbootd/Android.mk
index c051721..0f32dbf 100644
--- a/fastbootd/Android.mk
+++ b/fastbootd/Android.mk
@@ -33,6 +33,7 @@
     protocol.c \
     network_discovery.c \
     socket_client.c \
+    secure.c \
     transport.c \
     transport_socket.c \
     trigger.c \
@@ -41,7 +42,7 @@
 
 LOCAL_MODULE := fastbootd
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter
+LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -DFLASH_CERT
 LOCAL_LDFLAGS := -ldl
 
 LOCAL_SHARED_LIBRARIES := \