commit 7b3add1cdd69f0b4f85507f7eb66df02a30201df
author Kenny Root <kroot@google.com> Tue Sep 29 17:30:44 2015 -0700
committer Kenny Root <kroot@google.com> Tue Sep 29 17:43:49 2015 -0700
tree 5dca6e36ed765e7e01d5ec825369a3993aea43ba
parent 2e939432331875f0f3dc6e9ccde4022bd25a4d84

Prepare the GmsCore target for BoringSSL

Change-Id: I2908fc4f7146a6c70309b41a5290434f3efdc9ba

Android.mk

diff --git a/Android.mk b/Android.mk
index 4223eef..d3e88bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -182,7 +182,11 @@
 # Static unbundled Conscrypt crypto JNI library
 include $(CLEAR_VARS)
 LOCAL_CFLAGS += $(core_cflags)
-LOCAL_CPPFLAGS += $(core_cppflags) -DJNI_JARJAR_PREFIX="com/google/android/gms/" -DCONSCRYPT_UNBUNDLED -DSTATIC_LIB
+LOCAL_CPPFLAGS += $(core_cppflags) \
+        -DJNI_JARJAR_PREFIX="com/google/android/gms/" \
+        -DCONSCRYPT_UNBUNDLED \
+        -DSTATIC_LIB \
+        -DNO_KEYSTORE_ENGINE
 LOCAL_SRC_FILES := \
         src/main/native/org_conscrypt_NativeCrypto.cpp \
         src/compat/native/JNIHelp.cpp