Merge "fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)"
diff --git a/debuggerd/crasher.c b/debuggerd/crasher.c
index 4721da9..e11d9af 100644
--- a/debuggerd/crasher.c
+++ b/debuggerd/crasher.c
@@ -110,12 +110,19 @@
free((void*) buf); // GCC is smart enough to warn about this, but we're doing it deliberately.
}
+static void sigsegv_non_null() {
+ int* a = (int *)(&do_action);
+ *a = 42;
+}
+
static int do_action(const char* arg)
{
fprintf(stderr,"crasher: init pid=%d tid=%d\n", getpid(), gettid());
if (!strncmp(arg, "thread-", strlen("thread-"))) {
return do_action_on_thread(arg + strlen("thread-"));
+ } else if (!strcmp(arg, "SIGSEGV-non-null")) {
+ sigsegv_non_null();
} else if (!strcmp(arg, "smash-stack")) {
return smash_stack(42);
} else if (!strcmp(arg, "stack-overflow")) {
@@ -166,7 +173,8 @@
fprintf(stderr, " LOG_ALWAYS_FATAL call LOG_ALWAYS_FATAL\n");
fprintf(stderr, " LOG_ALWAYS_FATAL_IF call LOG_ALWAYS_FATAL\n");
fprintf(stderr, " SIGPIPE cause a SIGPIPE\n");
- fprintf(stderr, " SIGSEGV cause a SIGSEGV (synonym: crash)\n");
+ fprintf(stderr, " SIGSEGV cause a SIGSEGV at address 0x0 (synonym: crash)\n");
+ fprintf(stderr, " SIGSEGV-non-null cause a SIGSEGV at a non-zero address\n");
fprintf(stderr, " SIGTRAP cause a SIGTRAP\n");
fprintf(stderr, "prefix any of the above with 'thread-' to not run\n");
fprintf(stderr, "on the process' main thread.\n");
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index aa6522b..d79f9e2 100755
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -343,14 +343,10 @@
}
}
-static void dump_map(log_t* log, const backtrace_map_t* map, const char* what) {
- if (map != NULL) {
- _LOG(log, logtype::MAPS, " %" PRIPTR "-%" PRIPTR " %c%c%c %s\n", map->start, map->end,
+static void dump_map(log_t* log, const backtrace_map_t* map) {
+ _LOG(log, logtype::MAPS, " %" PRIPTR "-%" PRIPTR " %c%c%c %s\n", map->start, map->end,
(map->flags & PROT_READ) ? 'r' : '-', (map->flags & PROT_WRITE) ? 'w' : '-',
(map->flags & PROT_EXEC) ? 'x' : '-', map->name.c_str());
- } else {
- _LOG(log, logtype::MAPS, " (no %s)\n", what);
- }
}
static void dump_nearby_maps(BacktraceMap* map, log_t* log, pid_t tid) {
@@ -370,31 +366,11 @@
return;
}
- _LOG(log, logtype::MAPS, "\nmemory map around fault addr %" PRIPTR ":\n",
- reinterpret_cast<uintptr_t>(si.si_addr));
+ _LOG(log, logtype::MAPS, "\nmemory map:\n");
- // Search for a match, or for a hole where the match would be. The list
- // is backward from the file content, so it starts at high addresses.
- const backtrace_map_t* cur_map = NULL;
- const backtrace_map_t* next_map = NULL;
- const backtrace_map_t* prev_map = NULL;
for (BacktraceMap::const_iterator it = map->begin(); it != map->end(); ++it) {
- if (addr >= it->start && addr < it->end) {
- cur_map = &*it;
- if (it != map->begin()) {
- prev_map = &*(it-1);
- }
- if (++it != map->end()) {
- next_map = &*it;
- }
- break;
- }
+ dump_map(log, &*it);
}
-
- // Show the map address in ascending order (like /proc/pid/maps).
- dump_map(log, prev_map, "map below");
- dump_map(log, cur_map, "map for address");
- dump_map(log, next_map, "map above");
}
static void dump_thread(
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 8fc1f0b..44b9651 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -51,24 +51,28 @@
LOCAL_C_INCLUDES += development/host/windows/usb/api
endif
-# The following libf2fs_* are from system/extras/f2fs_utils,
-# and do not use code in external/f2fs-tools.
LOCAL_STATIC_LIBRARIES := \
$(EXTRA_STATIC_LIBS) \
libzipfile \
libunz \
libext4_utils_host \
- libf2fs_utils_host \
- libf2fs_dlutils_host \
libsparse_host \
libz
-# libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn")
-LOCAL_LDLIBS := -ldl
-LOCAL_SHARED_LIBRARIES := libf2fs_fmt_host_dyn
+
ifneq ($(HOST_OS),windows)
LOCAL_STATIC_LIBRARIES += libselinux
endif # HOST_OS != windows
+ifneq ($(HOST_OS),windows)
+# libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn")
+LOCAL_CFLAGS += -DUSE_F2FS
+LOCAL_LDLIBS += -ldl
+LOCAL_SHARED_LIBRARIES := libf2fs_fmt_host_dyn
+# The following libf2fs_* are from system/extras/f2fs_utils,
+# and do not use code in external/f2fs-tools.
+LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_dlutils_host
+endif
+
include $(BUILD_HOST_EXECUTABLE)
diff --git a/fastboot/fs.c b/fastboot/fs.c
index 11e391b..8a15e6f 100644
--- a/fastboot/fs.c
+++ b/fastboot/fs.c
@@ -29,11 +29,12 @@
return 0;
}
-int generate_f2fs_image(int fd, long long partSize)
+#ifdef USE_F2FS
+static int generate_f2fs_image(int fd, long long partSize)
{
- make_f2fs_sparse_fd(fd, partSize, NULL, NULL);
- return 0;
+ return make_f2fs_sparse_fd(fd, partSize, NULL, NULL);
}
+#endif
static const struct fs_generator {
@@ -42,7 +43,9 @@
} generators[] = {
{ "ext4", generate_ext4_image},
+#ifdef USE_F2FS
{ "f2fs", generate_f2fs_image},
+#endif
};
const struct fs_generator* fs_get_generator(const char *fs_type)