diff options
| author | Tao Bao | 2017-10-02 18:28:06 -0500 |
|---|---|---|
| committer | Tao Bao | 2017-10-04 10:55:24 -0500 |
| commit | 623fe7e701d5d0fb17082d1ced14498af1b44e5b (patch) | |
| tree | 633bee4e09a586c4e9e8a35cecdbc2e7c801e711 /applypatch | |
| parent | 281d4eefb18292224b249ef1900073983ca9d7fc (diff) | |
| download | platform-bootable-recovery-623fe7e701d5d0fb17082d1ced14498af1b44e5b.tar.gz platform-bootable-recovery-623fe7e701d5d0fb17082d1ced14498af1b44e5b.tar.xz platform-bootable-recovery-623fe7e701d5d0fb17082d1ced14498af1b44e5b.zip | |
Move error_code.h into otautil.
This way it stops requiring relative path ".." in LOCAL_C_INCLUDES
(uncrypt and edify). Soong doesn't accept non-local ".." in
"local_include_dirs".
Test: mmma bootable/recovery
Change-Id: Ia4649789cef2aaeb2785483660e9ea5a8b389c62
Diffstat (limited to 'applypatch')
| -rw-r--r-- | applypatch/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk index f5dda2bc..f02957e7 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk | |||
| @@ -30,6 +30,7 @@ LOCAL_C_INCLUDES := \ | |||
| 30 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | 30 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include |
| 31 | LOCAL_STATIC_LIBRARIES := \ | 31 | LOCAL_STATIC_LIBRARIES := \ |
| 32 | libotafault \ | 32 | libotafault \ |
| 33 | libotautil \ | ||
| 33 | libbase \ | 34 | libbase \ |
| 34 | libcrypto \ | 35 | libcrypto \ |
| 35 | libbspatch \ | 36 | libbspatch \ |
| @@ -53,6 +54,7 @@ LOCAL_C_INCLUDES := \ | |||
| 53 | bootable/recovery | 54 | bootable/recovery |
| 54 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | 55 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include |
| 55 | LOCAL_STATIC_LIBRARIES := \ | 56 | LOCAL_STATIC_LIBRARIES := \ |
| 57 | libotautil \ | ||
| 56 | libcrypto \ | 58 | libcrypto \ |
| 57 | libbspatch \ | 59 | libbspatch \ |
| 58 | libbase \ | 60 | libbase \ |
| @@ -77,6 +79,7 @@ LOCAL_C_INCLUDES := \ | |||
| 77 | bootable/recovery | 79 | bootable/recovery |
| 78 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | 80 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include |
| 79 | LOCAL_STATIC_LIBRARIES := \ | 81 | LOCAL_STATIC_LIBRARIES := \ |
| 82 | libotautil \ | ||
| 80 | libcrypto \ | 83 | libcrypto \ |
| 81 | libbspatch \ | 84 | libbspatch \ |
| 82 | libbase \ | 85 | libbase \ |
| @@ -99,6 +102,7 @@ LOCAL_STATIC_LIBRARIES := \ | |||
| 99 | libapplypatch \ | 102 | libapplypatch \ |
| 100 | libbase \ | 103 | libbase \ |
| 101 | libedify \ | 104 | libedify \ |
| 105 | libotautil \ | ||
| 102 | libcrypto | 106 | libcrypto |
| 103 | LOCAL_CFLAGS := -Wall -Werror | 107 | LOCAL_CFLAGS := -Wall -Werror |
| 104 | include $(BUILD_STATIC_LIBRARY) | 108 | include $(BUILD_STATIC_LIBRARY) |
| @@ -114,6 +118,7 @@ LOCAL_STATIC_LIBRARIES := \ | |||
| 114 | libapplypatch \ | 118 | libapplypatch \ |
| 115 | libedify \ | 119 | libedify \ |
| 116 | libotafault \ | 120 | libotafault \ |
| 121 | libotautil \ | ||
| 117 | libbspatch \ | 122 | libbspatch \ |
| 118 | libbase \ | 123 | libbase \ |
| 119 | libziparchive \ | 124 | libziparchive \ |