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
d5dc3a83
Commit
d5dc3a83
authored
May 18, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change build toolchain for go to clang
Also adds helpful go-clean command.
parent
89ddc2f7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
mobile/build.sbt
mobile/build.sbt
+6
-0
mobile/src/overture/make.bash
mobile/src/overture/make.bash
+4
-4
mobile/src/overture/src/github.com/shadowsocks/overture
mobile/src/overture/src/github.com/shadowsocks/overture
+1
-1
No files found.
mobile/build.sbt
View file @
d5dc3a83
...
@@ -39,6 +39,12 @@ libraryDependencies ++=
...
@@ -39,6 +39,12 @@ libraryDependencies ++=
"net.glxn.qrgen"
%
"android"
%
"2.0"
::
"net.glxn.qrgen"
%
"android"
%
"2.0"
::
Nil
Nil
lazy
val
goClean
=
TaskKey
[
Unit
](
"go-clean"
,
"Clean go build dependencies"
)
goClean
:=
{
IO
.
delete
(
baseDirectory
(
base
=>
base
/
"src/overture/.deps"
).
value
)
IO
.
delete
(
baseDirectory
(
base
=>
base
/
"src/main/jni/overture"
).
value
)
}
lazy
val
goBuild
=
TaskKey
[
Unit
](
"go-build"
,
"Build go and overture"
)
lazy
val
goBuild
=
TaskKey
[
Unit
](
"go-build"
,
"Build go and overture"
)
goBuild
:=
{
goBuild
:=
{
Process
(
Seq
(
"mobile/src/overture/make.bash"
,
minSdkVersion
.
value
))
!
streams
.
value
.
log
match
{
Process
(
Seq
(
"mobile/src/overture/make.bash"
,
minSdkVersion
.
value
))
!
streams
.
value
.
log
match
{
...
...
mobile/src/overture/make.bash
View file @
d5dc3a83
...
@@ -4,7 +4,7 @@ function try () {
...
@@ -4,7 +4,7 @@ function try () {
"
$@
"
||
exit
-1
"
$@
"
||
exit
-1
}
}
[
-z
"
$ANDROID_NDK_HOME
"
]
&&
ANDROID_NDK_HOME
=
~/android-ndk-r12b
[
-z
"
$ANDROID_NDK_HOME
"
]
&&
ANDROID_NDK_HOME
=
$ANDROID_HOME
/ndk-bundle
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
MIN_API
=
$1
MIN_API
=
$1
...
@@ -15,13 +15,13 @@ ANDROID_ARM_TOOLCHAIN=$DEPS/android-toolchain-${MIN_API}-arm
...
@@ -15,13 +15,13 @@ ANDROID_ARM_TOOLCHAIN=$DEPS/android-toolchain-${MIN_API}-arm
ANDROID_ARM64_TOOLCHAIN
=
$DEPS
/android-toolchain-21-arm64
ANDROID_ARM64_TOOLCHAIN
=
$DEPS
/android-toolchain-21-arm64
ANDROID_X86_TOOLCHAIN
=
$DEPS
/android-toolchain-
${
MIN_API
}
-x86
ANDROID_X86_TOOLCHAIN
=
$DEPS
/android-toolchain-
${
MIN_API
}
-x86
ANDROID_ARM_CC
=
$ANDROID_ARM_TOOLCHAIN
/bin/arm-linux-androideabi-
gcc
ANDROID_ARM_CC
=
$ANDROID_ARM_TOOLCHAIN
/bin/arm-linux-androideabi-
clang
ANDROID_ARM_STRIP
=
$ANDROID_ARM_TOOLCHAIN
/bin/arm-linux-androideabi-strip
ANDROID_ARM_STRIP
=
$ANDROID_ARM_TOOLCHAIN
/bin/arm-linux-androideabi-strip
ANDROID_ARM64_CC
=
$ANDROID_ARM64_TOOLCHAIN
/bin/aarch64-linux-android-
gcc
ANDROID_ARM64_CC
=
$ANDROID_ARM64_TOOLCHAIN
/bin/aarch64-linux-android-
clang
ANDROID_ARM64_STRIP
=
$ANDROID_ARM64_TOOLCHAIN
/bin/aarch64-linux-android-strip
ANDROID_ARM64_STRIP
=
$ANDROID_ARM64_TOOLCHAIN
/bin/aarch64-linux-android-strip
ANDROID_X86_CC
=
$ANDROID_X86_TOOLCHAIN
/bin/i686-linux-android-
gcc
ANDROID_X86_CC
=
$ANDROID_X86_TOOLCHAIN
/bin/i686-linux-android-
clang
ANDROID_X86_STRIP
=
$ANDROID_X86_TOOLCHAIN
/bin/i686-linux-android-strip
ANDROID_X86_STRIP
=
$ANDROID_X86_TOOLCHAIN
/bin/i686-linux-android-strip
try
mkdir
-p
$DEPS
$TARGET
/armeabi-v7a
$TARGET
/x86
$TARGET
/arm64-v8a
try
mkdir
-p
$DEPS
$TARGET
/armeabi-v7a
$TARGET
/x86
$TARGET
/arm64-v8a
...
...
overture
@
943e9dcb
Subproject commit
6d51c15e284e8b6615918c229a30267fdfbeaf5f
Subproject commit
943e9dcb62c47e9016b39185c4d92592e05b6fbb
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