From eb8ac25fe5cbaf33f71532c2920a1faaca8e130f Mon Sep 17 00:00:00 2001 From: Hui Shu Date: Tue, 5 Aug 2014 14:34:48 -0700 Subject: [PATCH] DO NOT MERGE: Revert "Update makefile for clang host build." This CL is somehow merged to lmp-dev and breaking Mac builds. This reverts commit 132ed0f2b45acf982bbd06616f14164b612661d1. Change-Id: I5a3472c0e2924db5c605340d7abdd407b956dcc2 --- tools/obbtool/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk index 99a56710371a9..9ff56d634c21d 100644 --- a/tools/obbtool/Android.mk +++ b/tools/obbtool/Android.mk @@ -13,7 +13,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ Main.cpp -LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags +LOCAL_CFLAGS := -Wall -Werror #LOCAL_C_INCLUDES += @@ -36,7 +36,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := pbkdf2gen LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags +LOCAL_CFLAGS := -Wall -Werror LOCAL_SRC_FILES := pbkdf2gen.cpp LOCAL_LDLIBS += -ldl LOCAL_C_INCLUDES := external/openssl/include $(LOCAL_C_INCLUDES)