diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-04-28 18:55:49 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-28 18:55:49 +0200 |
| commit | 1c1737b660bcff69c33f3e363ef96080f453900a (patch) | |
| tree | bb50d5a59260de3dfe5784a97868df216fa18436 /updater | |
| parent | Merge "recovery: Revoke (most of) short options." am: 3de3756081 (diff) | |
| parent | Merge "Merge libmounts into libotautil." (diff) | |
| download | android_bootable_recovery-1c1737b660bcff69c33f3e363ef96080f453900a.tar android_bootable_recovery-1c1737b660bcff69c33f3e363ef96080f453900a.tar.gz android_bootable_recovery-1c1737b660bcff69c33f3e363ef96080f453900a.tar.bz2 android_bootable_recovery-1c1737b660bcff69c33f3e363ef96080f453900a.tar.lz android_bootable_recovery-1c1737b660bcff69c33f3e363ef96080f453900a.tar.xz android_bootable_recovery-1c1737b660bcff69c33f3e363ef96080f453900a.tar.zst android_bootable_recovery-1c1737b660bcff69c33f3e363ef96080f453900a.zip | |
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/Android.mk | 11 | ||||
| -rw-r--r-- | updater/install.cpp | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/updater/Android.mk b/updater/Android.mk index 6f334ee18..476266400 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -24,14 +24,13 @@ tune2fs_static_libraries := \ updater_common_static_libraries := \ libapplypatch \ - libbspatch \ + libbootloader_message \ libedify \ - libziparchive \ + libotafault \ libotautil \ - libbootloader_message \ + libbspatch \ + libziparchive \ libutils \ - libmounts \ - libotafault \ libext4_utils \ libfec \ libfec_rs \ @@ -61,7 +60,6 @@ LOCAL_SRC_FILES := \ blockimg.cpp LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/include \ external/e2fsprogs/misc @@ -87,7 +85,6 @@ LOCAL_SRC_FILES := \ updater.cpp LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/include LOCAL_CFLAGS := \ diff --git a/updater/install.cpp b/updater/install.cpp index 9be7645f3..9f40fc524 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -57,10 +57,10 @@ #include <ziparchive/zip_archive.h> #include "edify/expr.h" -#include "mounts.h" #include "otafault/ota_io.h" #include "otautil/DirUtil.h" #include "otautil/error_code.h" +#include "otautil/mounts.h" #include "otautil/print_sha1.h" #include "updater/updater.h" |