diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-23 10:50:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 10:50:41 +0000 |
| commit | d555cd550d634192e96e3b834f91aa9559a259db (patch) | |
| tree | 73fcddf58879b07392835b5ab8ba0fbe8cdc810c | |
| parent | de56e38e9e8f7f4a54633b66e2952cea776d6ab5 (diff) | |
| parent | fe24754fd69e75829c748b56e5806f1603835db9 (diff) | |
| download | frameworks_base-d555cd550d634192e96e3b834f91aa9559a259db.zip frameworks_base-d555cd550d634192e96e3b834f91aa9559a259db.tar.gz frameworks_base-d555cd550d634192e96e3b834f91aa9559a259db.tar.bz2 | |
Merge "Remove superfluous OpenSSL include paths."
automerge: fe24754
* commit 'fe24754fd69e75829c748b56e5806f1603835db9':
Remove superfluous OpenSSL include paths.
| -rw-r--r-- | tools/obbtool/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk index 9ff56d6..78d7253 100644 --- a/tools/obbtool/Android.mk +++ b/tools/obbtool/Android.mk @@ -39,7 +39,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := -Wall -Werror 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) |