PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0

Browse Source 
am: dc97404346

Change-Id: Ica1f4616c87c81e24b7e4b2dfa0778557dae4a6a
This commit is contained in:
Josh Gao
2016-08-08 18:36:16 +00:00
committed by android-build-merger
parent 1e324fa459 dc97404346
commit e6a4195bf7
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+4 -4
View File
@@ -22,7 +22,7 @@ LOCAL_CLANG := true
LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -Werror LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -Werror
LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
LOCAL_MODULE := libfusesideload LOCAL_MODULE := libfusesideload
LOCAL_STATIC_LIBRARIES := libcutils libc libcrypto_static LOCAL_STATIC_LIBRARIES := libcutils libc libcrypto
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# libmounts (static library) # libmounts (static library)
@@ -86,8 +86,8 @@ LOCAL_STATIC_LIBRARIES := \
libminui \ libminui \
libpng \ libpng \
libfs_mgr \ libfs_mgr \
libcrypto_utils_static \ libcrypto_utils \
libcrypto_static \ libcrypto \
libbase \ libbase \
libcutils \ libcutils \
libutils \ libutils \
@@ -145,7 +145,7 @@ LOCAL_SRC_FILES := \
asn1_decoder.cpp \ asn1_decoder.cpp \
verifier.cpp \ verifier.cpp \
ui.cpp ui.cpp
LOCAL_STATIC_LIBRARIES := libcrypto_utils_static libcrypto_static LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(LOCAL_PATH)/minui/Android.mk \ include $(LOCAL_PATH)/minui/Android.mk \
applypatch/Android.mk
+4 -4
View File
@@ -33,7 +33,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES += \ LOCAL_STATIC_LIBRARIES += \
libotafault \ libotafault \
libbase \ libbase \
libcrypto_static \ libcrypto \
libbz \ libbz \
libz libz
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@@ -48,7 +48,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \ $(LOCAL_PATH)/include \
bootable/recovery bootable/recovery
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 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) include $(BUILD_STATIC_LIBRARY)
# libimgpatch (host static library) # libimgpatch (host static library)
@@ -62,7 +62,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \ $(LOCAL_PATH)/include \
bootable/recovery bootable/recovery
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 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) include $(BUILD_HOST_STATIC_LIBRARY)
# applypatch (executable) # applypatch (executable)
@@ -78,7 +78,7 @@ LOCAL_STATIC_LIBRARIES += \
libedify \ libedify \
libotafault \ libotafault \
libminzip \ libminzip \
libcrypto_static \ libcrypto \
libbz libbz
LOCAL_SHARED_LIBRARIES += libz libcutils libc LOCAL_SHARED_LIBRARIES += libz libcutils libc
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
tests/Android.mk
+2 -2
View File
@@ -48,8 +48,8 @@ LOCAL_STATIC_LIBRARIES := \
libotafault \ libotafault \
libbase \ libbase \
libverifier \ libverifier \
libcrypto_utils_static \ libcrypto_utils \
libcrypto_static \ libcrypto \
libminui \ libminui \
libminzip \ libminzip \
libcutils \ libcutils \
updater/Android.mk
+2 -2
View File
@@ -34,8 +34,8 @@ LOCAL_STATIC_LIBRARIES += \
libfec_rs \ libfec_rs \
libext4_utils_static \ libext4_utils_static \
libsquashfs_utils \ libsquashfs_utils \
libcrypto_utils_static \ libcrypto_utils \
libcrypto_static \ libcrypto \
libapplypatch \ libapplypatch \
libbase \ libbase \
libotafault \ libotafault \