Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
23f8f350
Commit
23f8f350
authored
Dec 25, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop using system STL since it is no longer supported
parent
8d210b5e
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
2 deletions
+48
-2
Application.mk
native/jni/Application.mk
+1
-1
new
native/jni/include/new
+34
-0
Android.mk
native/jni/systemproperties/Android.mk
+1
-1
Android.mk
native/jni/utils/Android.mk
+1
-0
new.cpp
native/jni/utils/new.cpp
+11
-0
No files found.
native/jni/Application.mk
View file @
23f8f350
...
...
@@ -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 :=
system
APP_STL :=
none
APP_PLATFORM := android-16
ifdef MAGISK_DEBUG
...
...
native/jni/include/new
0 → 100644
View file @
23f8f350
#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__
native/jni/systemproperties/Android.mk
View file @
23f8f350
...
...
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE:= libsystemproperties
LOCAL_C_INCLUDES := $(LIBSYSTEMPROPERTIES)
LOCAL_C_INCLUDES :=
jni/include
$(LIBSYSTEMPROPERTIES)
LOCAL_SRC_FILES := \
context_node.cpp \
contexts_serialized.cpp \
...
...
native/jni/utils/Android.mk
View file @
23f8f350
...
...
@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE:= libutils
LOCAL_C_INCLUDES := jni/include $(LIBUTILS)
LOCAL_SRC_FILES := \
new.cpp \
file.cpp \
misc.cpp \
selinux.cpp \
...
...
native/jni/utils/new.cpp
0 → 100644
View file @
23f8f350
#include <new>
#include <stdlib.h>
void
*
operator
new
(
std
::
size_t
s
)
{
return
malloc
(
s
);
}
void
*
operator
new
[](
std
::
size_t
s
)
{
return
malloc
(
s
);
}
void
operator
delete
(
void
*
p
)
{
free
(
p
);
}
void
operator
delete
[](
void
*
p
)
{
free
(
p
);
}
void
*
operator
new
(
std
::
size_t
s
,
const
std
::
nothrow_t
&
)
{
return
malloc
(
s
);
}
void
*
operator
new
[](
std
::
size_t
s
,
const
std
::
nothrow_t
&
)
{
return
malloc
(
s
);
}
void
operator
delete
(
void
*
p
,
const
std
::
nothrow_t
&
)
{
free
(
p
);
}
void
operator
delete
[](
void
*
p
,
const
std
::
nothrow_t
&
)
{
free
(
p
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment