summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2016-08-08 20:36:16 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-08-08 20:36:16 +0200
commite6a4195bf7738ea215e74714c49040efef8fa0d6 (patch)
treee65333fe2c95343333168513ffa663fdb7a6ec50
parentMerge "Recovery mode UI flicker" am: 629bde8c6c (diff)
parentMerge "Fix references to libcrypto_utils_static." (diff)
downloadandroid_bootable_recovery-e6a4195bf7738ea215e74714c49040efef8fa0d6.tar
android_bootable_recovery-e6a4195bf7738ea215e74714c49040efef8fa0d6.tar.gz
android_bootable_recovery-e6a4195bf7738ea215e74714c49040efef8fa0d6.tar.bz2
android_bootable_recovery-e6a4195bf7738ea215e74714c49040efef8fa0d6.tar.lz
android_bootable_recovery-e6a4195bf7738ea215e74714c49040efef8fa0d6.tar.xz
android_bootable_recovery-e6a4195bf7738ea215e74714c49040efef8fa0d6.tar.zst
android_bootable_recovery-e6a4195bf7738ea215e74714c49040efef8fa0d6.zip
-rw-r--r--Android.mk8
-rw-r--r--applypatch/Android.mk8
-rw-r--r--tests/Android.mk4
-rw-r--r--updater/Android.mk4
4 files changed, 12 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index dcc11c596..41eff4ee6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,7 @@ LOCAL_CLANG := true
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 @@ LOCAL_STATIC_LIBRARIES := \
libminui \
libpng \
libfs_mgr \
- libcrypto_utils_static \
- libcrypto_static \
+ libcrypto_utils \
+ libcrypto \
libbase \
libcutils \
libutils \
@@ -145,7 +145,7 @@ LOCAL_SRC_FILES := \
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 \
diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 48efe340e..604787e78 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -33,7 +33,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES += \
libotafault \
libbase \
- libcrypto_static \
+ libcrypto \
libbz \
libz
include $(BUILD_STATIC_LIBRARY)
@@ -48,7 +48,7 @@ LOCAL_C_INCLUDES += \
$(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_C_INCLUDES += \
$(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 @@ LOCAL_STATIC_LIBRARIES += \
libedify \
libotafault \
libminzip \
- libcrypto_static \
+ libcrypto \
libbz
LOCAL_SHARED_LIBRARIES += libz libcutils libc
include $(BUILD_EXECUTABLE)
diff --git a/tests/Android.mk b/tests/Android.mk
index 279a6cb49..971e5d0f0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -48,8 +48,8 @@ LOCAL_STATIC_LIBRARIES := \
libotafault \
libbase \
libverifier \
- libcrypto_utils_static \
- libcrypto_static \
+ libcrypto_utils \
+ libcrypto \
libminui \
libminzip \
libcutils \
diff --git a/updater/Android.mk b/updater/Android.mk
index 75af4bdd0..b4d427c5d 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -34,8 +34,8 @@ LOCAL_STATIC_LIBRARIES += \
libfec_rs \
libext4_utils_static \
libsquashfs_utils \
- libcrypto_utils_static \
- libcrypto_static \
+ libcrypto_utils \
+ libcrypto \
libapplypatch \
libbase \
libotafault \