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

am 8224edb9: Merge "Update makefile for clang host build."

Browse Source 
* commit '8224edb94f6421a2d910362c56940dcf991847e6':
  Update makefile for clang host build.
This commit is contained in:
Tim Murray
2014-07-24 21:04:20 +00:00
committed by Android Git Automerger
parent 88fbb5f48f 8224edb94f
commit 638a2b2dac
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 := \ LOCAL_SRC_FILES := \
Main.cpp Main.cpp
LOCAL_CFLAGS := -Wall -Werror LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags
#LOCAL_C_INCLUDES += #LOCAL_C_INCLUDES +=
@@ -36,7 +36,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := pbkdf2gen LOCAL_MODULE := pbkdf2gen
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -Wall -Werror LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags
LOCAL_SRC_FILES := pbkdf2gen.cpp LOCAL_SRC_FILES := pbkdf2gen.cpp
LOCAL_LDLIBS += -ldl LOCAL_LDLIBS += -ldl
LOCAL_C_INCLUDES := external/openssl/include $(LOCAL_C_INCLUDES) LOCAL_C_INCLUDES := external/openssl/include $(LOCAL_C_INCLUDES)