Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-08 23:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move Android and ML build artefacts to their own subdirectory

Browse source 
Works around #20380.
This commit is contained in:
Anthony Ramine 2018-11-27 13:26:38 +01:00
parent 524bd722ef
commit 496a62860e
10 changed files with 51 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
support/android/apk/build.gradle
View file

@ -14,7 +14,7 @@ allprojects {
repositories {
jcenter()
flatDir {
dirs rootDir.absolutePath + "/../../../target/android_aar"
dirs rootDir.absolutePath + "/../../../target/android/aar"
}
google()
}
@ -23,7 +23,7 @@ allprojects {
// Utility methods
String getTargetDir(boolean debug, String arch) {
def basePath = project.rootDir.getParentFile().getParentFile().getParentFile().absolutePath
return basePath + '/target/' + getSubTargetDir(debug, arch)
return basePath + '/target/android/' + getSubTargetDir(debug, arch)
}
String getSubTargetDir(boolean debug, String arch) {

2
support/android/apk/servoapp/build.gradle
View file

@ -7,7 +7,7 @@ android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
buildDir = rootDir.absolutePath + "/../../../target/gradle/servoapp"
buildDir = rootDir.absolutePath + "/../../../target/android/gradle/servoapp"
defaultConfig {
applicationId "org.mozilla.servo"

2
support/android/apk/servoview/build.gradle
View file

@ -8,7 +8,7 @@ android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
buildDir = rootDir.absolutePath + "/../../../target/gradle/servoview"
buildDir = rootDir.absolutePath + "/../../../target/android/gradle/servoview"
defaultConfig {
minSdkVersion 18

2
support/magicleap/README.md
View file

@ -16,7 +16,7 @@ Build the mlservo library:
```
MAGICLEAP_SDK=*directory* ./mach build -d --magicleap
```
This builds a static library `target/aarch64-linux-android/debug/libmlservo.a`.
This builds a static library `target/magicleap/aarch64-linux-android/debug/libmlservo.a`.
## Building the Servo2D application

4
support/magicleap/Servo2D/Servo2D.mabu
View file

@ -9,10 +9,10 @@ SRCS = \
code/src/Servo2D.cpp
LIBPATHS.debug = \
../../../target/aarch64-linux-android/debug
../../../target/magicleap/aarch64-linux-android/debug
LIBPATHS.release = \
../../../target/aarch64-linux-android/release
../../../target/magicleap/aarch64-linux-android/release
STLIBS = \
mlservo