commit dc974043460cb5eb7bafa06510d95e203f656af2
author Josh Gao <jmgao@google.com> Mon Aug 08 18:33:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 08 18:33:51 2016 +0000
tree d0f86c7c92d95f893be14577535a731853c2a2ff
parent a5734c2ad880ac81efbc805aef451c6908c4704b
parent b97da5e0f0ca49b92759ea57415e7064fc29c77d

Merge "Fix references to libcrypto_utils_static."
am: b97da5e0f0

Change-Id: Ia935df84e5ea36dfc6605b41872c36db69a114a0

Android.mk

diff --git a/Android.mk b/Android.mk
index dcc11c5..41eff4e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,7 @@
 LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -Werror
 LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
 LOCAL_MODULE := libfusesideload
-LOCAL_STATIC_LIBRARIES := libcutils libc libcrypto_static
+LOCAL_STATIC_LIBRARIES := libcutils libc libcrypto
 include $(BUILD_STATIC_LIBRARY)
 
 # libmounts (static library)
@@ -86,8 +86,8 @@
     libminui \
     libpng \
     libfs_mgr \
-    libcrypto_utils_static \
-    libcrypto_static \
+    libcrypto_utils \
+    libcrypto \
     libbase \
     libcutils \
     libutils \
@@ -145,7 +145,7 @@
     asn1_decoder.cpp \
     verifier.cpp \
     ui.cpp
-LOCAL_STATIC_LIBRARIES := libcrypto_utils_static libcrypto_static
+LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto
 include $(BUILD_STATIC_LIBRARY)
 
 include $(LOCAL_PATH)/minui/Android.mk \

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 48efe34..604787e 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -33,7 +33,7 @@
 LOCAL_STATIC_LIBRARIES += \
     libotafault \
     libbase \
-    libcrypto_static \
+    libcrypto \
     libbz \
     libz
 include $(BUILD_STATIC_LIBRARY)
@@ -48,7 +48,7 @@
     $(LOCAL_PATH)/include \
     bootable/recovery
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES += libcrypto_static libbz libz
+LOCAL_STATIC_LIBRARIES += libcrypto libbz libz
 include $(BUILD_STATIC_LIBRARY)
 
 # libimgpatch (host static library)
@@ -62,7 +62,7 @@
     $(LOCAL_PATH)/include \
     bootable/recovery
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES += libcrypto_static libbz libz
+LOCAL_STATIC_LIBRARIES += libcrypto libbz libz
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # applypatch (executable)
@@ -78,7 +78,7 @@
     libedify \
     libotafault \
     libminzip \
-    libcrypto_static \
+    libcrypto \
     libbz
 LOCAL_SHARED_LIBRARIES += libz libcutils libc
 include $(BUILD_EXECUTABLE)

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 279a6cb..971e5d0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -48,8 +48,8 @@
     libotafault \
     libbase \
     libverifier \
-    libcrypto_utils_static \
-    libcrypto_static \
+    libcrypto_utils \
+    libcrypto \
     libminui \
     libminzip \
     libcutils \

updater/Android.mk

diff --git a/updater/Android.mk b/updater/Android.mk
index 75af4bd..b4d427c 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -34,8 +34,8 @@
     libfec_rs \
     libext4_utils_static \
     libsquashfs_utils \
-    libcrypto_utils_static \
-    libcrypto_static \
+    libcrypto_utils \
+    libcrypto \
     libapplypatch \
     libbase \
     libotafault \