From 1fb9c1158ecb1df4499ccfef98fa71568a35fb90 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 22 Dec 2012 17:47:59 +0100
Subject: Add google-breakpad support to ics-openvpn

---
 jni/Android.mk     | 4 ++++
 jni/Application.mk | 1 +
 2 files changed, 5 insertions(+)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index 3514b920..283be302 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -5,6 +5,10 @@ include lzo/Android.mk
 
 include openssl/Android.mk
 
+ifneq ($(TARGET_ARCH),mips)
+include google-breakpad/android/google_breakpad/Android.mk
+endif
+
 include openvpn/Android.mk
 
 
diff --git a/jni/Application.mk b/jni/Application.mk
index 38ce95f3..5670b6e3 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,6 +1,7 @@
 APP_ABI := all
 NDK_TOOLCHAIN_VERSION=4.4.3
 #APP_PLATFORM := android-14
+APP_STL:=stlport_static
 
 #APP_OPTIM := release
 
-- 
cgit v1.2.3


From 586b8bd003be24b32b121b320dafe142e74d2752 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 22 Dec 2012 22:57:54 +0100
Subject: commit files forgot in last commit, add push fix

---
 jni/icsandroid.cpp | 30 ++++++++++++++++++++++++++++++
 jni/icsandroid.h   |  9 +++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 jni/icsandroid.cpp
 create mode 100644 jni/icsandroid.h

(limited to 'jni')

diff --git a/jni/icsandroid.cpp b/jni/icsandroid.cpp
new file mode 100644
index 00000000..cd63c6fd
--- /dev/null
+++ b/jni/icsandroid.cpp
@@ -0,0 +1,30 @@
+
+#include "icsandroid.h"
+#include "client/linux/handler/exception_handler.h"
+
+namespace {
+
+bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
+                  void* context,
+                  bool succeeded) {
+  printf("Dump path: %s\n", descriptor.path());
+fflush(stdout);
+  return succeeded;
+}
+
+void Crash() {
+  volatile int* a = reinterpret_cast<volatile int*>(NULL);
+  *a = 1;
+}
+
+}  // namespace
+
+static google_breakpad::MinidumpDescriptor* desc;
+static google_breakpad::ExceptionHandler* eh;
+void setup_breakpad(void)
+{
+printf("Initializing Google Breakpad!\n");
+desc = new google_breakpad::MinidumpDescriptor("/data/data/de.blinkt.openvpn/cache");
+eh = new google_breakpad::ExceptionHandler(*desc, NULL, DumpCallback, NULL, true,-1);
+}
+
diff --git a/jni/icsandroid.h b/jni/icsandroid.h
new file mode 100644
index 00000000..cd11da40
--- /dev/null
+++ b/jni/icsandroid.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    void setup_breakpad(void);
+
+#ifdef __cplusplus
+}
+#endif
-- 
cgit v1.2.3


From e713296d10e2f3feb059c3d267c96404bc477d04 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 24 Dec 2012 14:25:11 +0100
Subject: delte old files

---
 jni/icsandroid.cpp | 30 ------------------------------
 jni/icsandroid.h   |  9 ---------
 2 files changed, 39 deletions(-)
 delete mode 100644 jni/icsandroid.cpp
 delete mode 100644 jni/icsandroid.h

(limited to 'jni')

diff --git a/jni/icsandroid.cpp b/jni/icsandroid.cpp
deleted file mode 100644
index cd63c6fd..00000000
--- a/jni/icsandroid.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#include "icsandroid.h"
-#include "client/linux/handler/exception_handler.h"
-
-namespace {
-
-bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
-                  void* context,
-                  bool succeeded) {
-  printf("Dump path: %s\n", descriptor.path());
-fflush(stdout);
-  return succeeded;
-}
-
-void Crash() {
-  volatile int* a = reinterpret_cast<volatile int*>(NULL);
-  *a = 1;
-}
-
-}  // namespace
-
-static google_breakpad::MinidumpDescriptor* desc;
-static google_breakpad::ExceptionHandler* eh;
-void setup_breakpad(void)
-{
-printf("Initializing Google Breakpad!\n");
-desc = new google_breakpad::MinidumpDescriptor("/data/data/de.blinkt.openvpn/cache");
-eh = new google_breakpad::ExceptionHandler(*desc, NULL, DumpCallback, NULL, true,-1);
-}
-
diff --git a/jni/icsandroid.h b/jni/icsandroid.h
deleted file mode 100644
index cd11da40..00000000
--- a/jni/icsandroid.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    void setup_breakpad(void);
-
-#ifdef __cplusplus
-}
-#endif
-- 
cgit v1.2.3