commit 253c18d2fbab6c16886af8bdfd528df3ebf82b93
author Elliott Hughes <enh@google.com> Wed Mar 18 22:47:09 2015 -0700
committer Elliott Hughes <enh@google.com> Wed Mar 18 22:47:54 2015 -0700
tree d303f905e1298ff86186b3641595a69c61fe9da5
parent ee2e362f8be4cbf68bb38fa1916a1f395677c593

Prepare for switching to libziparchive.

Bug: 19765860
Change-Id: I58249d28fbc4975428d0dcac5107d1994c35676c

fastboot/Android.mk

diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index aa5b14a..9cb002f 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -19,10 +19,11 @@
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../mkbootimg \
   $(LOCAL_PATH)/../../extras/ext4_utils \
   $(LOCAL_PATH)/../../extras/f2fs_utils
-LOCAL_SRC_FILES := protocol.c engine.c bootimg.c fastboot.c util.c fs.c
+LOCAL_SRC_FILES := protocol.c engine.c bootimg_utils.cpp fastboot.cpp util.c fs.c
 LOCAL_MODULE := fastboot
 LOCAL_MODULE_TAGS := debug
-LOCAL_CFLAGS += -std=gnu99 -Werror
+LOCAL_CONLYFLAGS += -std=gnu99
+LOCAL_CFLAGS += -Wall -Werror
 
 ifeq ($(HOST_OS),linux)
   LOCAL_SRC_FILES += usb_linux.c util_linux.c