Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc974043 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "Fix references to libcrypto_utils_static." 

am: b97da5e0

Change-Id: Ia935df84e5ea36dfc6605b41872c36db69a114a0
parents a5734c2a b97da5e0

Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -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 \

applypatch/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -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)

tests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ LOCAL_STATIC_LIBRARIES := \ 
    libotafault \

    libbase \

    libverifier \

    libcrypto_utils_static \

    libcrypto_static \

    libcrypto_utils \

    libcrypto \

    libminui \

    libminzip \

    libcutils \

updater/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 \