diff options
| author | Hui Shu <hush@google.com> | 2014-08-05 14:34:48 -0700 |
|---|---|---|
| committer | Hui Shu <hush@google.com> | 2014-08-05 21:38:03 +0000 |
| commit | eb8ac25fe5cbaf33f71532c2920a1faaca8e130f (patch) | |
| tree | e509fe0f92a71930809dcb4e9f6a49cdeb8a96e4 | |
| parent | cf49a24e2f73e0104c0a9b6d67178ed5ba8d8b87 (diff) | |
| download | frameworks_base-eb8ac25fe5cbaf33f71532c2920a1faaca8e130f.zip frameworks_base-eb8ac25fe5cbaf33f71532c2920a1faaca8e130f.tar.gz frameworks_base-eb8ac25fe5cbaf33f71532c2920a1faaca8e130f.tar.bz2 | |
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
| -rw-r--r-- | tools/obbtool/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk index 99a5671..9ff56d6 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) |