diff options
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/Android.mk | 111 | ||||
| -rw-r--r-- | updater/blockimg.cpp | 4 | ||||
| -rw-r--r-- | updater/include/updater/blockimg.h (renamed from updater/blockimg.h) | 0 | ||||
| -rw-r--r-- | updater/include/updater/install.h (renamed from updater/install.h) | 7 | ||||
| -rw-r--r-- | updater/include/updater/updater.h (renamed from updater/updater.h) | 0 | ||||
| -rw-r--r-- | updater/install.cpp | 103 | ||||
| -rw-r--r-- | updater/updater.cpp | 9 |
7 files changed, 120 insertions, 114 deletions
diff --git a/updater/Android.mk b/updater/Android.mk index d9fc72c8f..33e97385e 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -14,41 +14,6 @@ LOCAL_PATH := $(call my-dir) -# updater (static executable) -# =============================== -# Build a statically-linked binary to include in OTA packages. -include $(CLEAR_VARS) - -updater_src_files := \ - install.cpp \ - blockimg.cpp \ - updater.cpp - -LOCAL_CLANG := true -LOCAL_SRC_FILES := $(updater_src_files) - -LOCAL_STATIC_LIBRARIES += \ - $(TARGET_RECOVERY_UPDATER_LIBS) \ - $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) \ - libfec \ - libfec_rs \ - libext4_utils_static \ - libsquashfs_utils \ - libcrypto_utils \ - libcrypto \ - libapplypatch \ - libotafault \ - libedify \ - libminzip \ - libmounts \ - libz \ - libbz \ - libcutils \ - liblog \ - libselinux \ - libbase \ - liblog - tune2fs_static_libraries := \ libext2_com_err \ libext2_blkid \ @@ -57,17 +22,77 @@ tune2fs_static_libraries := \ libext2_e2p \ libext2fs -LOCAL_STATIC_LIBRARIES += \ +updater_common_static_libraries := \ + libapplypatch \ + libedify \ + libminzip \ + libmounts \ + libotafault \ + libext4_utils_static \ + libfec \ + libfec_rs \ + liblog \ + libselinux \ + libsparse_static \ + libsquashfs_utils \ + libbz \ + libz \ + libbase \ + libcrypto \ + libcrypto_utils \ + libcutils \ libtune2fs \ $(tune2fs_static_libraries) -LOCAL_CFLAGS += -Wno-unused-parameter -Werror -LOCAL_STATIC_LIBRARIES += \ - libsparse_static \ - libz +# libupdater (static library) +# =============================== +include $(CLEAR_VARS) + +LOCAL_MODULE := libupdater + +LOCAL_SRC_FILES := \ + install.cpp \ + blockimg.cpp + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/include \ + external/e2fsprogs/misc + +LOCAL_CFLAGS := \ + -Wno-unused-parameter \ + -Werror -LOCAL_C_INCLUDES += external/e2fsprogs/misc -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(LOCAL_PATH)/include + +LOCAL_STATIC_LIBRARIES := \ + $(updater_common_static_libraries) + +include $(BUILD_STATIC_LIBRARY) + +# updater (static executable) +# =============================== +include $(CLEAR_VARS) + +LOCAL_MODULE := updater + +LOCAL_SRC_FILES := \ + updater.cpp + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/include + +LOCAL_CFLAGS := \ + -Wno-unused-parameter \ + -Werror + +LOCAL_STATIC_LIBRARIES := \ + libupdater \ + $(TARGET_RECOVERY_UPDATER_LIBS) \ + $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) \ + $(updater_common_static_libraries) # Each library in TARGET_RECOVERY_UPDATER_LIBS should have a function # named "Register_<libname>()". Here we emit a little C function that @@ -108,8 +133,6 @@ LOCAL_C_INCLUDES += $(dir $(inc)) inc := inc_dep_file := -LOCAL_MODULE := updater - LOCAL_FORCE_STATIC_EXECUTABLE := true include $(BUILD_EXECUTABLE) diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index 0caa1acbd..433d98026 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -45,12 +45,12 @@ #include "applypatch/applypatch.h" #include "edify/expr.h" #include "error_code.h" -#include "install.h" +#include "updater/install.h" #include "openssl/sha.h" #include "minzip/Hash.h" #include "ota_io.h" #include "print_sha1.h" -#include "updater.h" +#include "updater/updater.h" #define BLOCKSIZE 4096 diff --git a/updater/blockimg.h b/updater/include/updater/blockimg.h index 2f4ad3c04..2f4ad3c04 100644 --- a/updater/blockimg.h +++ b/updater/include/updater/blockimg.h diff --git a/updater/install.h b/updater/include/updater/install.h index b3b8a4dd5..8d6ca4728 100644 --- a/updater/install.h +++ b/updater/include/updater/install.h @@ -17,11 +17,12 @@ #ifndef _UPDATER_INSTALL_H_ #define _UPDATER_INSTALL_H_ +struct State; + void RegisterInstallFunctions(); // uiPrintf function prints msg to screen as well as logs -void uiPrintf(State* _Nonnull state, const char* _Nonnull format, ...) __attribute__((__format__(printf, 2, 3))); - -static int make_parents(char* _Nonnull name); +void uiPrintf(State* _Nonnull state, const char* _Nonnull format, ...) + __attribute__((__format__(printf, 2, 3))); #endif diff --git a/updater/updater.h b/updater/include/updater/updater.h index d3a09b93d..d3a09b93d 100644 --- a/updater/updater.h +++ b/updater/include/updater/updater.h diff --git a/updater/install.cpp b/updater/install.cpp index 24e35cfb8..3546968d7 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -14,50 +14,51 @@ * limitations under the License. */ +#include "updater/install.h" + #include <ctype.h> #include <errno.h> +#include <fcntl.h> +#include <ftw.h> +#include <inttypes.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/capability.h> #include <sys/mount.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/wait.h> -#include <unistd.h> -#include <fcntl.h> -#include <time.h> -#include <ftw.h> -#include <sys/capability.h> #include <sys/xattr.h> -#include <linux/xattr.h> -#include <inttypes.h> +#include <time.h> +#include <unistd.h> #include <memory> +#include <string> #include <vector> #include <android-base/parseint.h> #include <android-base/properties.h> #include <android-base/strings.h> #include <android-base/stringprintf.h> +#include <cutils/android_reboot.h> #include <ext4_utils/make_ext4fs.h> #include <ext4_utils/wipe.h> +#include <openssl/sha.h> #include <selinux/label.h> #include <selinux/selinux.h> -#include "bootloader.h" #include "applypatch/applypatch.h" -#include "cutils/android_reboot.h" -#include "cutils/misc.h" +#include "bootloader.h" #include "edify/expr.h" #include "error_code.h" #include "minzip/DirUtil.h" #include "mounts.h" -#include "openssl/sha.h" #include "ota_io.h" -#include "updater.h" -#include "install.h" +#include "print_sha1.h" #include "tune2fs.h" +#include "updater/updater.h" // Send over the buffer to recovery though the command pipe. static void uiPrint(State* state, const std::string& buffer) { @@ -90,17 +91,25 @@ void uiPrintf(State* _Nonnull state, const char* _Nonnull format, ...) { uiPrint(state, error_msg); } -// Take a sha-1 digest and return it as a newly-allocated hex string. -char* PrintSha1(const uint8_t* digest) { - char* buffer = reinterpret_cast<char*>(malloc(SHA_DIGEST_LENGTH*2 + 1)); - const char* alphabet = "0123456789abcdef"; - size_t i; - for (i = 0; i < SHA_DIGEST_LENGTH; ++i) { - buffer[i*2] = alphabet[(digest[i] >> 4) & 0xf]; - buffer[i*2+1] = alphabet[digest[i] & 0xf]; - } - buffer[i*2] = '\0'; - return buffer; +// Create all parent directories of name, if necessary. +static int make_parents(char* name) { + char* p; + for (p = name + (strlen(name)-1); p > name; --p) { + if (*p != '/') continue; + *p = '\0'; + if (make_parents(name) < 0) return -1; + int result = mkdir(name, 0700); + if (result == 0) printf("created [%s]\n", name); + *p = '/'; + if (result == 0 || errno == EEXIST) { + // successfully created or already existed; we're done + return 0; + } else { + printf("failed to mkdir %s: %s\n", name, strerror(errno)); + return -1; + } + } + return 0; } // mount(fs_type, partition_type, location, mount_point) @@ -569,27 +578,6 @@ Value* PackageExtractFileFn(const char* name, State* state, } } -// Create all parent directories of name, if necessary. -static int make_parents(char* name) { - char* p; - for (p = name + (strlen(name)-1); p > name; --p) { - if (*p != '/') continue; - *p = '\0'; - if (make_parents(name) < 0) return -1; - int result = mkdir(name, 0700); - if (result == 0) printf("created [%s]\n", name); - *p = '/'; - if (result == 0 || errno == EEXIST) { - // successfully created or already existed; we're done - return 0; - } else { - printf("failed to mkdir %s: %s\n", name, strerror(errno)); - return -1; - } - } - return 0; -} - // symlink target src1 src2 ... // unlinks any previously existing src1, src2, etc before creating symlinks. Value* SymlinkFn(const char* name, State* state, int argc, Expr* argv[]) { @@ -1227,29 +1215,24 @@ Value* Sha1CheckFn(const char* name, State* state, int argc, Expr* argv[]) { SHA1(reinterpret_cast<uint8_t*>(args[0]->data), args[0]->size, digest); if (argc == 1) { - return StringValue(PrintSha1(digest)); + return StringValue(strdup(print_sha1(digest).c_str())); } - int i; - uint8_t arg_digest[SHA_DIGEST_LENGTH]; - for (i = 1; i < argc; ++i) { + for (int i = 1; i < argc; ++i) { + uint8_t arg_digest[SHA_DIGEST_LENGTH]; if (args[i]->type != VAL_STRING) { - printf("%s(): arg %d is not a string; skipping", - name, i); + printf("%s(): arg %d is not a string; skipping", name, i); } else if (ParseSha1(args[i]->data, arg_digest) != 0) { // Warn about bad args and skip them. - printf("%s(): error parsing \"%s\" as sha-1; skipping", - name, args[i]->data); + printf("%s(): error parsing \"%s\" as sha-1; skipping", name, args[i]->data); } else if (memcmp(digest, arg_digest, SHA_DIGEST_LENGTH) == 0) { - break; + // Found a match. + return args[i].release(); } } - if (i >= argc) { - // Didn't match any of the hex strings; return false. - return StringValue(strdup("")); - } - // Found a match. - return args[i].release(); + + // Didn't match any of the hex strings; return false. + return StringValue(strdup("")); } // Read a local file and return its contents (the Value* returned diff --git a/updater/updater.cpp b/updater/updater.cpp index 74a4048fb..c752ebbf3 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "updater.h" +#include "updater/updater.h" #include <stdio.h> #include <unistd.h> @@ -27,10 +27,10 @@ #include "config.h" #include "edify/expr.h" -#include "blockimg.h" -#include "install.h" -#include "minzip/Zip.h" #include "minzip/SysUtil.h" +#include "minzip/Zip.h" +#include "updater/blockimg.h" +#include "updater/install.h" // Generated by the makefile, this function defines the // RegisterDeviceExtensions() function, which calls all the @@ -111,7 +111,6 @@ int main(int argc, char** argv) { RegisterInstallFunctions(); RegisterBlockImageFunctions(); RegisterDeviceExtensions(); - FinishRegistration(); // Parse the script. |