commit 8d88f076f64ede1555d0536695477287ae065d13
author Josh Gao <jmgao@google.com> Mon Aug 08 18:39:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 08 18:39:25 2016 +0000
tree 3c29521323f185ca867653a428177e87ee7b0e14
parent e63781b83c6dd63f9f4310b0360a96e246ff8a7a
parent 4319bd92ad504457a5389cd4b1e2fa6553be4a78

Merge "Fix references to libcrypto_utils_static." am: 879a2c8fa0 am: 8b2ebbc4cf
am: 4319bd92ad

Change-Id: I674655ae677573f4981b4cdeff6ee8849ba8fef5

libfec/Android.mk

diff --git a/libfec/Android.mk b/libfec/Android.mk
index 7dcdb25..b92dd4e 100644
--- a/libfec/Android.mk
+++ b/libfec/Android.mk
@@ -17,8 +17,8 @@
     fec_process.cpp
 
 common_static_libraries := \
-    libcrypto_utils_static \
-    libcrypto_static \
+    libcrypto_utils \
+    libcrypto \
     libcutils \
     libbase
 

libfec/test/Android.mk

diff --git a/libfec/test/Android.mk b/libfec/test/Android.mk
index d78c6d2..fce07cf 100644
--- a/libfec/test/Android.mk
+++ b/libfec/test/Android.mk
@@ -11,8 +11,8 @@
 LOCAL_STATIC_LIBRARIES := \
     libfec_host \
     libfec_rs_host \
-    libcrypto_utils_static \
-    libcrypto_static \
+    libcrypto_utils \
+    libcrypto \
     libext4_utils_host \
     libsquashfs_utils_host \
     libbase

verity/fec/Android.mk

diff --git a/verity/fec/Android.mk b/verity/fec/Android.mk
index 0b742c1..33ef8b5 100644
--- a/verity/fec/Android.mk
+++ b/verity/fec/Android.mk
@@ -11,8 +11,8 @@
 LOCAL_STATIC_LIBRARIES := \
     libsparse_host \
     libz \
-    libcrypto_utils_static \
-    libcrypto_static \
+    libcrypto_utils \
+    libcrypto \
     libfec_host \
     libfec_rs_host \
     libext4_utils_host \
@@ -30,8 +30,8 @@
 LOCAL_SRC_FILES := main.cpp image.cpp
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := \
-    libcrypto_utils_static \
-    libcrypto_static \
+    libcrypto_utils \
+    libcrypto \
     libfec \
     libfec_rs \
     libbase \