aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-11-06 23:38:10 -0500
committerHumberto Borba <humberos@gmail.com>2015-11-15 11:52:46 -0200
commit1a4869650bc3d1bc6ac6cc6ccad0e59a33fba64e (patch)
tree5e92f058c5ea902c3aae051dc3eaab6bb2cdedf6
parent8be21a999a1b2221ba2900b09c695d17172d475d (diff)
boringssl-compat: Make bio_b64 opt-in
These methods are crashing Facebook's crypto routines, and they're not needed by the camera for JPEG encoding, so they can be safely removed on devices that have newer Adreno blobs, but leave the functionality in until all devices have new blobs. Change-Id: I3c9e9a3c748da0341dc40942766178f5560b76de
-rw-r--r--Android.mk16
1 files changed, 12 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index ee8896e..6127b89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,13 +16,21 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
- bio_b64.c \
+EVP_FILES := \
p_dec.c \
p_enc.c \
p_open.c \
- p_seal.c \
- rsa_pss.c
+ p_seal.c
+
+RSA_FILES := rsa_pss.c
+
+B64_FILES := bio_b64.c
+
+LOCAL_SRC_FILES := $(EVP_FILES) $(RSA_FILES)
+
+ifeq ($(TARGET_REQUIRES_B64_COMPAT),true)
+LOCAL_SRC_FILES += B64_FILES
+endif
LOCAL_SHARED_LIBRARIES := liblog libcrypto
LOCAL_MODULE := libboringssl-compat