summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-02-09 22:08:13 +0000
committerDan Albert <danalbert@google.com>2015-02-09 22:08:13 +0000
commitd052a4937c99aac57aa1db1779c96a01bff6d9b9 (patch)
tree34bab61dc4ce323b123ad4614dbc07e86ea2f9ef /Android.mk
parent54d4b126073e603f6be876fb1bca3420150d180e (diff)
downloadexternal_boringssl-d052a4937c99aac57aa1db1779c96a01bff6d9b9.tar.gz
external_boringssl-d052a4937c99aac57aa1db1779c96a01bff6d9b9.tar.bz2
external_boringssl-d052a4937c99aac57aa1db1779c96a01bff6d9b9.zip
Revert "Disable boringssl build."
The manifest change was reverted, so this isn't needed anymore. This reverts commit 54d4b126073e603f6be876fb1bca3420150d180e. Change-Id: I4d43b2362262d3a22d5b68d9a210ac6d1d150387
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index ce4ff1c..81b6ce1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,10 +4,6 @@
LOCAL_PATH := $(call my-dir)
-# All these modules are also defined in external/openssl, which is breaking the
-# build.
-ifeq (disable-build,)
-
## libcrypto
# Target static library
@@ -104,5 +100,3 @@ LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLE
LOCAL_SHARED_LIBRARIES += libcrypto-host
include $(LOCAL_PATH)/ssl-sources.mk
include $(BUILD_HOST_SHARED_LIBRARY)
-
-endif