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
97c6ff95
Commit
97c6ff95
authored
Sep 18, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix an issue in the build scripts
parent
971ef221
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
11 deletions
+25
-11
build-ndk.sh
build-ndk.sh
+18
-4
jni/system.cpp
jni/system.cpp
+5
-5
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+2
-2
No files found.
build-ndk.sh
View file @
97c6ff95
#!/bin/bash
#!/bin/bash
ndk-build clean
function
try
()
{
ndk-build
"
$@
"
||
exit
-1
}
# Build
try ndk-build clean
try ndk-build
# copy executables
rm
-rf
src/main/assets/armeabi-v7a
rm
-rf
src/main/assets/armeabi-v7a
rm
-rf
src/main/assets/x86
rm
-rf
src/main/assets/x86
mkdir
-p
src/main/assets/armeabi-v7a
mkdir
-p
src/main/assets/armeabi-v7a
mkdir
-p
src/main/assets/x86
mkdir
-p
src/main/assets/x86
for
app
in
pdnsd redsocks
for
app
in
pdnsd redsocks
do
do
mv
libs/armeabi-v7a/
$app
src/main/assets/armeabi-v7a/
try
mv
libs/armeabi-v7a/
$app
src/main/assets/armeabi-v7a/
mv
libs/x86/
$app
src/main/assets/x86/
try
mv
libs/x86/
$app
src/main/assets/x86/
done
done
# copy libraries
rm
-rf
src/main/jni/armeabi-v7a
rm
-rf
src/main/jni/x86
mkdir
-p
src/main/jni/armeabi-v7a
mkdir
-p
src/main/jni/x86
try
mv
libs/armeabi-v7a/
*
.so src/main/jni/armeabi-v7a/
try
mv
libs/x86/
*
.so src/main/jni/x86/
jni/system.cpp
View file @
97c6ff95
...
@@ -21,11 +21,11 @@ jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) {
...
@@ -21,11 +21,11 @@ jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) {
}
else
if
(
family
==
ANDROID_CPU_FAMILY_MIPS
)
{
}
else
if
(
family
==
ANDROID_CPU_FAMILY_MIPS
)
{
abi
=
"mips"
;
abi
=
"mips"
;
}
else
if
(
family
==
ANDROID_CPU_FAMILY_ARM
)
{
}
else
if
(
family
==
ANDROID_CPU_FAMILY_ARM
)
{
if
(
features
&
ANDROID_CPU_ARM_FEATURE_ARMv7
)
{
//
if (features & ANDROID_CPU_ARM_FEATURE_ARMv7) {
abi
=
"armeabi-v7a"
;
abi
=
"armeabi-v7a"
;
}
else
{
//
} else {
abi
=
"armeabi"
;
//
abi = "armeabi";
}
//
}
}
}
return
env
->
NewStringUTF
(
abi
);
return
env
->
NewStringUTF
(
abi
);
}
}
...
...
src/main/AndroidManifest.xml
View file @
97c6ff95
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.github.shadowsocks"
package=
"com.github.shadowsocks"
android:versionCode=
"7
1
"
android:versionCode=
"7
2
"
android:versionName=
"2.2.
3
"
>
android:versionName=
"2.2.
4
"
>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
...
...
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