aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-04-10 18:55:57 -0500
committerTao Bao2017-04-13 00:46:09 -0500
commit1d866050eba7614109a1edec42529d4d80b0998f (patch)
tree36905d2bd8d5121a9ecb6d87996bc32fa480c009 /Android.mk
parent1b28a27c33e3f60fce661ddf4f2f0c5abefb63bc (diff)
downloadplatform-bootable-recovery-1d866050eba7614109a1edec42529d4d80b0998f.tar.gz
platform-bootable-recovery-1d866050eba7614109a1edec42529d4d80b0998f.tar.xz
platform-bootable-recovery-1d866050eba7614109a1edec42529d4d80b0998f.zip
Verify the package compatibility with libvintf.
verify_package_compatibility() is added to parse the compatibility entry (compatibility.zip) in a given OTA package. If entry is present, the information is sent to libvintf to check the compatibility. This CL doesn't actually call libvintf, since the API there is not available yet. Bug: 36597505 Test: Doesn't break the install with existing packages (i.e. w/o the compatibility entry). Test: recovery_component_test Change-Id: I3903ffa5f6ba33a5c0d761602ade6290c6752596 (cherry picked from commit 62e0bc7586077b3bde82759fb34b51b982cea20f)
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk24
1 files changed, 21 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index d7010139..1b83d75f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,10 @@
14 14
15LOCAL_PATH := $(call my-dir) 15LOCAL_PATH := $(call my-dir)
16 16
17# Needed by build/make/core/Makefile.
18RECOVERY_API_VERSION := 3
19RECOVERY_FSTAB_VERSION := 2
20
17# libfusesideload (static library) 21# libfusesideload (static library)
18# =============================== 22# ===============================
19include $(CLEAR_VARS) 23include $(CLEAR_VARS)
@@ -36,6 +40,22 @@ LOCAL_MODULE := libmounts
36LOCAL_STATIC_LIBRARIES := libbase 40LOCAL_STATIC_LIBRARIES := libbase
37include $(BUILD_STATIC_LIBRARY) 41include $(BUILD_STATIC_LIBRARY)
38 42
43# librecovery (static library)
44# ===============================
45include $(CLEAR_VARS)
46LOCAL_SRC_FILES := \
47 install.cpp
48LOCAL_CFLAGS := -Wno-unused-parameter -Werror
49LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
50LOCAL_MODULE := librecovery
51LOCAL_STATIC_LIBRARIES := \
52 libminui \
53 libcrypto_utils \
54 libcrypto \
55 libbase
56
57include $(BUILD_STATIC_LIBRARY)
58
39# recovery (static executable) 59# recovery (static executable)
40# =============================== 60# ===============================
41include $(CLEAR_VARS) 61include $(CLEAR_VARS)
@@ -45,7 +65,6 @@ LOCAL_SRC_FILES := \
45 asn1_decoder.cpp \ 65 asn1_decoder.cpp \
46 device.cpp \ 66 device.cpp \
47 fuse_sdcard_provider.cpp \ 67 fuse_sdcard_provider.cpp \
48 install.cpp \
49 recovery.cpp \ 68 recovery.cpp \
50 roots.cpp \ 69 roots.cpp \
51 rotate_logs.cpp \ 70 rotate_logs.cpp \
@@ -65,8 +84,6 @@ LOCAL_REQUIRED_MODULES := mkfs.f2fs
65endif 84endif
66endif 85endif
67 86
68RECOVERY_API_VERSION := 3
69RECOVERY_FSTAB_VERSION := 2
70LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) 87LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
71LOCAL_CFLAGS += -Wno-unused-parameter -Werror 88LOCAL_CFLAGS += -Wno-unused-parameter -Werror
72LOCAL_CLANG := true 89LOCAL_CLANG := true
@@ -76,6 +93,7 @@ LOCAL_C_INCLUDES += \
76 system/core/adb \ 93 system/core/adb \
77 94
78LOCAL_STATIC_LIBRARIES := \ 95LOCAL_STATIC_LIBRARIES := \
96 librecovery \
79 libbatterymonitor \ 97 libbatterymonitor \
80 libbootloader_message \ 98 libbootloader_message \
81 libext4_utils \ 99 libext4_utils \