Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
9de6c744
Commit
9de6c744
authored
Feb 23, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add both armeabi and armeabi-v7a
parent
1818209e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
6 deletions
+15
-6
.gitignore
.gitignore
+2
-1
build-ndk.sh
build-ndk.sh
+4
-2
src/main/jni/Application.mk
src/main/jni/Application.mk
+1
-1
src/main/jni/system.cpp
src/main/jni/system.cpp
+6
-1
src/main/scala/com/github/shadowsocks/utils/Utils.scala
src/main/scala/com/github/shadowsocks/utils/Utils.scala
+2
-1
No files found.
.gitignore
View file @
9de6c744
...
...
@@ -25,5 +25,6 @@ out/
#NDK
src/main/libs
src/main/assets/arm
src/main/assets/armeabi
src/main/assets/armeabi-v7a
src/main/assets/x86
build-ndk.sh
View file @
9de6c744
...
...
@@ -2,10 +2,12 @@
cd
src/main
ndk-build clean
ndk-build
mkdir
-p
assets/arm
mkdir
-p
assets/armeabi
mkdir
-p
assets/armeabi-v7a
mkdir
-p
assets/x86
for
app
in
iptables pdnsd redsocks shadowsocks tun2socks
do
mv
libs/armeabi-v7a/
$app
assets/arm/
mv
libs/armeabi/
$app
assets/armeabi/
mv
libs/armeabi-v7a/
$app
assets/armeabi-v7a/
mv
libs/x86/
$app
assets/x86/
done
src/main/jni/Application.mk
View file @
9de6c744
APP_ABI
:=
armeabi-v7a x86
APP_ABI
:=
armeabi
armeabi
-v7a x86
APP_PLATFORM
:=
android-9
APP_STL
:=
stlport_static
NDK_TOOLCHAIN_VERSION
:=
4.8
src/main/jni/system.cpp
View file @
9de6c744
...
...
@@ -13,6 +13,7 @@
jstring
Java_com_github_shadowsocks_system_getabi
(
JNIEnv
*
env
,
jobject
thiz
)
{
AndroidCpuFamily
family
=
android_getCpuFamily
();
uint64_t
features
=
android_getCpuFeatures
();
const
char
*
abi
;
if
(
family
==
ANDROID_CPU_FAMILY_X86
)
{
...
...
@@ -20,7 +21,11 @@ jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) {
}
else
if
(
family
==
ANDROID_CPU_FAMILY_MIPS
)
{
abi
=
"mips"
;
}
else
if
(
family
==
ANDROID_CPU_FAMILY_ARM
)
{
abi
=
"arm"
;
if
(
features
&
ANDROID_CPU_ARM_FEATURE_ARMv7
)
{
abi
=
"armeabi-v7a"
;
}
else
{
abi
=
"armeabi"
;
}
}
return
env
->
NewStringUTF
(
abi
);
}
...
...
src/main/scala/com/github/shadowsocks/utils/Utils.scala
View file @
9de6c744
...
...
@@ -64,7 +64,8 @@ object Utils {
val
TAG
:
String
=
"Shadowsocks"
val
ABI_PROP
:
String
=
"ro.product.cpu.abi"
val
ABI2_PROP
:
String
=
"ro.product.cpu.abi2"
val
ARM_ABI
:
String
=
"arm"
val
ARM_ABI
:
String
=
"armeabi"
val
ARMV7_ABI
:
String
=
"armeabi-v7a"
val
X86_ABI
:
String
=
"x86"
val
MIPS_ABI
:
String
=
"mips"
val
DEFAULT_SHELL
:
String
=
"/system/bin/sh"
...
...
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