commit ad0d879e52907f3d38c89e89e518dec2cb9033f9
author Narayan Kamath <narayan@google.com> Fri Jan 23 11:05:28 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 23 11:05:28 2015 +0000
tree c3f92d139eae0c0a2c07bb519f2aafc112040232
parent 7127d264d1489c5fae528ef1ca8d3b21d0eba519
parent c2d51280395749328b0bb7a283cbc6037606822e

Merge "Remove superfluous OpenSSL include paths." automerge: fe24754 automerge: d555cd5
automerge: c2d5128

* commit 'c2d51280395749328b0bb7a283cbc6037606822e':
  Remove superfluous OpenSSL include paths.

tools/obbtool/Android.mk

diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk
index 99a5671..1b1f63e 100644
--- a/tools/obbtool/Android.mk
+++ b/tools/obbtool/Android.mk
@@ -39,7 +39,6 @@
 LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags
 LOCAL_SRC_FILES := pbkdf2gen.cpp
 LOCAL_LDLIBS += -ldl
-LOCAL_C_INCLUDES := external/openssl/include $(LOCAL_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES := libcrypto_static
 
 include $(BUILD_HOST_EXECUTABLE)