Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE: Revert "Update makefile for clang host build."

Browse Source 
This CL is somehow merged to lmp-dev and breaking Mac builds.

This reverts commit 132ed0f2b4.

Change-Id: I5a3472c0e2924db5c605340d7abdd407b956dcc2
This commit is contained in:
Hui Shu
2014-08-05 14:34:48 -07:00
parent cf49a24e2f
commit eb8ac25fe5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/obbtool/Android.mk
View File

@@ -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)