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

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

Browse Source 
* commit '70026f30226ade5a6063ae36894e3c735a0ba7b1':
  DO NOT MERGE: Revert "Update makefile for clang host build."
This commit is contained in:
Hui Shu
2014-08-05 22:00:37 +00:00
committed by Android Git Automerger
parent 5f251ce377 eb8ac25fe5
commit b166353e29
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)