diff options
author | Tao Bao | 2017-04-10 18:55:57 -0500 |
---|---|---|
committer | Tao Bao | 2017-04-13 00:46:09 -0500 |
commit | 1d866050eba7614109a1edec42529d4d80b0998f (patch) | |
tree | 36905d2bd8d5121a9ecb6d87996bc32fa480c009 /Android.mk | |
parent | 1b28a27c33e3f60fce661ddf4f2f0c5abefb63bc (diff) | |
download | platform-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.mk | 24 |
1 files changed, 21 insertions, 3 deletions
@@ -14,6 +14,10 @@ | |||
14 | 14 | ||
15 | LOCAL_PATH := $(call my-dir) | 15 | LOCAL_PATH := $(call my-dir) |
16 | 16 | ||
17 | # Needed by build/make/core/Makefile. | ||
18 | RECOVERY_API_VERSION := 3 | ||
19 | RECOVERY_FSTAB_VERSION := 2 | ||
20 | |||
17 | # libfusesideload (static library) | 21 | # libfusesideload (static library) |
18 | # =============================== | 22 | # =============================== |
19 | include $(CLEAR_VARS) | 23 | include $(CLEAR_VARS) |
@@ -36,6 +40,22 @@ LOCAL_MODULE := libmounts | |||
36 | LOCAL_STATIC_LIBRARIES := libbase | 40 | LOCAL_STATIC_LIBRARIES := libbase |
37 | include $(BUILD_STATIC_LIBRARY) | 41 | include $(BUILD_STATIC_LIBRARY) |
38 | 42 | ||
43 | # librecovery (static library) | ||
44 | # =============================== | ||
45 | include $(CLEAR_VARS) | ||
46 | LOCAL_SRC_FILES := \ | ||
47 | install.cpp | ||
48 | LOCAL_CFLAGS := -Wno-unused-parameter -Werror | ||
49 | LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) | ||
50 | LOCAL_MODULE := librecovery | ||
51 | LOCAL_STATIC_LIBRARIES := \ | ||
52 | libminui \ | ||
53 | libcrypto_utils \ | ||
54 | libcrypto \ | ||
55 | libbase | ||
56 | |||
57 | include $(BUILD_STATIC_LIBRARY) | ||
58 | |||
39 | # recovery (static executable) | 59 | # recovery (static executable) |
40 | # =============================== | 60 | # =============================== |
41 | include $(CLEAR_VARS) | 61 | include $(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 | |||
65 | endif | 84 | endif |
66 | endif | 85 | endif |
67 | 86 | ||
68 | RECOVERY_API_VERSION := 3 | ||
69 | RECOVERY_FSTAB_VERSION := 2 | ||
70 | LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) | 87 | LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) |
71 | LOCAL_CFLAGS += -Wno-unused-parameter -Werror | 88 | LOCAL_CFLAGS += -Wno-unused-parameter -Werror |
72 | LOCAL_CLANG := true | 89 | LOCAL_CLANG := true |
@@ -76,6 +93,7 @@ LOCAL_C_INCLUDES += \ | |||
76 | system/core/adb \ | 93 | system/core/adb \ |
77 | 94 | ||
78 | LOCAL_STATIC_LIBRARIES := \ | 95 | LOCAL_STATIC_LIBRARIES := \ |
96 | librecovery \ | ||
79 | libbatterymonitor \ | 97 | libbatterymonitor \ |
80 | libbootloader_message \ | 98 | libbootloader_message \ |
81 | libext4_utils \ | 99 | libext4_utils \ |