diff options
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | applypatch/applypatch.cpp | 2 | ||||
-rw-r--r-- | otafault/Android.bp | 60 | ||||
-rw-r--r-- | otafault/Android.mk | 52 | ||||
-rw-r--r-- | otafault/config.cpp | 4 | ||||
-rw-r--r-- | otafault/include/otafault/config.h (renamed from otafault/config.h) | 0 | ||||
-rw-r--r-- | otafault/include/otafault/ota_io.h (renamed from otafault/ota_io.h) | 0 | ||||
-rw-r--r-- | otafault/ota_io.cpp | 4 | ||||
-rw-r--r-- | otafault/test.cpp | 2 | ||||
-rw-r--r-- | updater/blockimg.cpp | 2 | ||||
-rw-r--r-- | updater/install.cpp | 2 | ||||
-rw-r--r-- | updater/updater.cpp | 2 |
13 files changed, 70 insertions, 62 deletions
diff --git a/Android.bp b/Android.bp index 49438ad9e..99ca3a45c 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,5 @@ subdirs = [ "bootloader_message", + "otafault", "otautil", ] diff --git a/Android.mk b/Android.mk index 801141249..c55771fbe 100644 --- a/Android.mk +++ b/Android.mk @@ -263,7 +263,6 @@ include \ $(LOCAL_PATH)/edify/Android.mk \ $(LOCAL_PATH)/minadbd/Android.mk \ $(LOCAL_PATH)/minui/Android.mk \ - $(LOCAL_PATH)/otafault/Android.mk \ $(LOCAL_PATH)/tests/Android.mk \ $(LOCAL_PATH)/tools/Android.mk \ $(LOCAL_PATH)/uncrypt/Android.mk \ diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index 51bf3932a..729d2a910 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -39,7 +39,7 @@ #include <openssl/sha.h> #include "edify/expr.h" -#include "ota_io.h" +#include "otafault/ota_io.h" #include "print_sha1.h" static int LoadPartitionContents(const std::string& filename, FileContents* file); diff --git a/otafault/Android.bp b/otafault/Android.bp new file mode 100644 index 000000000..91a5d9a54 --- /dev/null +++ b/otafault/Android.bp @@ -0,0 +1,60 @@ +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +cc_library_static { + name: "libotafault", + + srcs: [ + "config.cpp", + "ota_io.cpp", + ], + + static_libs: [ + "libbase", + "liblog", + "libziparchive", + ], + + export_include_dirs: [ + "include", + ], + + cflags: [ + "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS", + "-Wall", + "-Werror", + "-Wthread-safety", + "-Wthread-safety-negative", + ], +} + +cc_test { + name: "otafault_test", + + srcs: ["test.cpp"], + + cflags: [ + "-Wall", + "-Werror", + ], + + static_executable: true, + + static_libs: [ + "libotafault", + "libziparchive", + "libbase", + "liblog", + ], +} diff --git a/otafault/Android.mk b/otafault/Android.mk deleted file mode 100644 index 3e14f77f3..000000000 --- a/otafault/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific languae governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -otafault_static_libs := \ - libziparchive \ - libbase \ - liblog - -LOCAL_CFLAGS := \ - -Wall \ - -Werror \ - -Wthread-safety \ - -Wthread-safety-negative \ - -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS - -LOCAL_SRC_FILES := config.cpp ota_io.cpp -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE := libotafault -LOCAL_C_INCLUDES := bootable/recovery -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) - -include $(BUILD_STATIC_LIBRARY) - -# otafault_test (static executable) -# =============================== -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := config.cpp ota_io.cpp test.cpp -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := otafault_test -LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) -LOCAL_CFLAGS := -Wall -Werror -LOCAL_C_INCLUDES := bootable/recovery -LOCAL_FORCE_STATIC_EXECUTABLE := true - -include $(BUILD_EXECUTABLE) diff --git a/otafault/config.cpp b/otafault/config.cpp index c11f77452..3993948ff 100644 --- a/otafault/config.cpp +++ b/otafault/config.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "config.h" +#include "otafault/config.h" #include <map> #include <string> @@ -22,7 +22,7 @@ #include <android-base/stringprintf.h> #include <ziparchive/zip_archive.h> -#include "ota_io.h" +#include "otafault/ota_io.h" #define OTAIO_MAX_FNAME_SIZE 128 diff --git a/otafault/config.h b/otafault/include/otafault/config.h index cc4bfd2ad..cc4bfd2ad 100644 --- a/otafault/config.h +++ b/otafault/include/otafault/config.h diff --git a/otafault/ota_io.h b/otafault/include/otafault/ota_io.h index 45e481a62..45e481a62 100644 --- a/otafault/ota_io.h +++ b/otafault/include/otafault/ota_io.h diff --git a/otafault/ota_io.cpp b/otafault/ota_io.cpp index a82a7ee59..1308973a5 100644 --- a/otafault/ota_io.cpp +++ b/otafault/ota_io.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ota_io.h" +#include "otafault/ota_io.h" #include <errno.h> #include <fcntl.h> @@ -29,7 +29,7 @@ #include <android-base/thread_annotations.h> -#include "config.h" +#include "otafault/config.h" static std::mutex filename_mutex; static std::map<intptr_t, const char*> filename_cache GUARDED_BY(filename_mutex); diff --git a/otafault/test.cpp b/otafault/test.cpp index 60c40e099..63e2445af 100644 --- a/otafault/test.cpp +++ b/otafault/test.cpp @@ -20,7 +20,7 @@ #include <sys/types.h> #include <unistd.h> -#include "ota_io.h" +#include "otafault/ota_io.h" int main(int /* argc */, char** /* argv */) { int fd = open("testdata/test.file", O_RDWR); diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index fe21dd0eb..696cddf41 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -51,7 +51,7 @@ #include "edify/expr.h" #include "error_code.h" -#include "ota_io.h" +#include "otafault/ota_io.h" #include "print_sha1.h" #include "rangeset.h" #include "updater/install.h" diff --git a/updater/install.cpp b/updater/install.cpp index 8e54c2e75..fc085d5aa 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -59,7 +59,7 @@ #include "edify/expr.h" #include "error_code.h" #include "mounts.h" -#include "ota_io.h" +#include "otafault/ota_io.h" #include "otautil/DirUtil.h" #include "print_sha1.h" #include "tune2fs.h" diff --git a/updater/updater.cpp b/updater/updater.cpp index 1d8fa8e92..e10174f71 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -30,8 +30,8 @@ #include <selinux/selinux.h> #include <ziparchive/zip_archive.h> -#include "config.h" #include "edify/expr.h" +#include "otafault/config.h" #include "otautil/DirUtil.h" #include "otautil/SysUtil.h" #include "updater/blockimg.h" |