diff options
| author | Tao Bao <tbao@google.com> | 2017-09-29 21:40:42 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 21:40:42 +0200 |
| commit | 540c16307a1d271cf64adca68082af93bc9374cb (patch) | |
| tree | 10ba47ca709a9ee8028d1a4a4c1d1a0497fdf6d5 /otafault | |
| parent | Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 (diff) | |
| parent | Merge "otafault: Move headers under otafault/." (diff) | |
| download | android_bootable_recovery-540c16307a1d271cf64adca68082af93bc9374cb.tar android_bootable_recovery-540c16307a1d271cf64adca68082af93bc9374cb.tar.gz android_bootable_recovery-540c16307a1d271cf64adca68082af93bc9374cb.tar.bz2 android_bootable_recovery-540c16307a1d271cf64adca68082af93bc9374cb.tar.lz android_bootable_recovery-540c16307a1d271cf64adca68082af93bc9374cb.tar.xz android_bootable_recovery-540c16307a1d271cf64adca68082af93bc9374cb.tar.zst android_bootable_recovery-540c16307a1d271cf64adca68082af93bc9374cb.zip | |
Diffstat (limited to 'otafault')
| -rw-r--r-- | otafault/Android.mk | 11 | ||||
| -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 |
6 files changed, 11 insertions, 10 deletions
diff --git a/otafault/Android.mk b/otafault/Android.mk index 3e14f77f3..5ec8a192a 100644 --- a/otafault/Android.mk +++ b/otafault/Android.mk @@ -31,8 +31,8 @@ LOCAL_CFLAGS := \ 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_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) include $(BUILD_STATIC_LIBRARY) @@ -41,12 +41,13 @@ include $(BUILD_STATIC_LIBRARY) # =============================== include $(CLEAR_VARS) -LOCAL_SRC_FILES := config.cpp ota_io.cpp test.cpp +LOCAL_SRC_FILES := test.cpp LOCAL_MODULE_TAGS := tests LOCAL_MODULE := otafault_test -LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) +LOCAL_STATIC_LIBRARIES := \ + libotafault \ + $(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); |