From 03c39e692abc1e2797d61e12bb6a2e6791032177 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 19 Jan 2019 13:47:33 -0500
Subject: [PATCH] Switch to libc++

---
 native/jni/Application.mk |  2 +-
 native/jni/include/new    | 34 ----------------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 native/jni/include/new

diff --git a/native/jni/Application.mk b/native/jni/Application.mk
index 30c0a5149..8a75e4a5b 100644
--- a/native/jni/Application.mk
+++ b/native/jni/Application.mk
@@ -2,7 +2,7 @@ APP_ABI := armeabi-v7a x86
 APP_CFLAGS := -Oz -std=gnu11 \
 -DMAGISK_VERSION="${MAGISK_VERSION}" -DMAGISK_VER_CODE=${MAGISK_VER_CODE}
 APP_CPPFLAGS := -std=c++14
-APP_STL := none
+APP_STL := c++_static
 APP_PLATFORM := android-16
 
 ifdef MAGISK_DEBUG
diff --git a/native/jni/include/new b/native/jni/include/new
deleted file mode 100644
index 401e0671b..000000000
--- a/native/jni/include/new
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __NEW__
-#define __NEW__
-
-#include <stddef.h>
-#include <stdlib.h>
-
-extern "C++" {
-
-namespace std {
-	using ::ptrdiff_t;
-	using ::size_t;
-	struct nothrow_t {};
-    extern const nothrow_t nothrow;
-}  // namespace std
-
-void* operator new(std::size_t);
-void* operator new[](std::size_t);
-void  operator delete(void*);
-void  operator delete[](void*);
-void* operator new(std::size_t, const std::nothrow_t&);
-void* operator new[](std::size_t, const std::nothrow_t&);
-void  operator delete(void*, const std::nothrow_t&);
-void  operator delete[](void*, const std::nothrow_t&);
-
-inline void* operator new(std::size_t, void* p) { return p; }
-inline void* operator new[](std::size_t, void* p) { return p; }
-
-// these next two are not really required, since exceptions are off
-inline void  operator delete(void*, void*) { }
-inline void  operator delete[](void*, void*) { }
-
-}  // extern C++
-
-#endif // __NEW__