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

Upgrade NDK to v15c.

Browse source
This commit is contained in:
Josh Matthews 2018-09-21 10:55:23 -04:00
parent 0a5aab6cc2
commit 7a95cbcf91
8 changed files with 73 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
support/android/apk/jni/Application.mk
View file

@ -1,5 +1,5 @@
NDK_TOOLCHAIN_VERSION := clang
APP_MODULES := c++_shared servojni gstreamer
APP_PLATFORM := android-18
APP_PLATFORM := android-21
APP_STL:= c++_shared
APP_ABI:= armeabi-v7a x86

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

@ -11,7 +11,7 @@ android {
defaultConfig {
applicationId "org.mozilla.servo"
minSdkVersion 18
minSdkVersion 21
targetSdkVersion 27
versionCode 1
versionName "1.0.0"
@ -29,10 +29,8 @@ android {
main {
}
googlevr {
minSdkVersion 21
}
oculusvr {
minSdkVersion 21
}
}

4
support/android/openssl.sh
View file

@ -169,7 +169,7 @@ fi
# For the Android SYSROOT. Can be used on the command line with --sysroot
# https://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
export ANDROID_SYSROOT="$ANDROID_NDK_ROOT/platforms/$_ANDROID_API/$_ANDROID_ARCH"
export ANDROID_SYSROOT="$ANDROID_NDK_ROOT/sysroot"
export SYSROOT="$ANDROID_SYSROOT"
export NDK_SYSROOT="$ANDROID_SYSROOT"
@ -193,7 +193,6 @@ export ARCH=$_OPENSSL_ARCH
# For the Android toolchain
# https://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
export ANDROID_SYSROOT="$ANDROID_NDK_ROOT/platforms/$_ANDROID_API/$_ANDROID_ARCH"
export SYSROOT="$ANDROID_SYSROOT"
#export CROSS_SYSROOT="$ANDROID_SYSROOT"
export NDK_SYSROOT="$ANDROID_SYSROOT"
@ -216,6 +215,7 @@ xCFLAGS="-DSHARED_EXTENSION=.so -DOPENSSL_PIC -DDSO_DLFCN -DHAVE_DLFCN_H \
-fPIC -fomit-frame-pointer \
-Wall -Wno-error=macro-redefined \
-O3 \
-I$ANDROID_SYSROOT/usr/include/$_ANDROID_TARGET \
-I$ANDROID_DEV/include \
-B$ANDROID_DEV/lib -B$ANDROID_NDK_ROOT/platforms/$_ANDROID_API/$_ANDROID_ARCH/usr/lib \
-L$ANDROID_NDK_ROOT/platforms/$_ANDROID_API/$_ANDROID_ARCH/usr/lib -L$ANDROID_NDK_ROOT/toolchains/$_ANDROID_GCC-4.9/prebuilt/$host/lib/gcc/$_ANDROID_TARGET/4.9.x/ \

12
support/android/toolchain.cmake
View file

@ -1,6 +1,6 @@
set(CMAKE_SYSTEM_NAME Android)
set(CMAKE_ANDROID_NDK $ENV{ANDROID_NDK})
set(CMAKE_ANDROID_API $ENV{NDK_ANDROID_VERSION})
set(CMAKE_ANDROID_ARCH_ABI $ENV{CMAKE_ANDROID_ARCH_ABI})
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(ANDROID_ABI $ENV{ANDROID_ABI})
set(ANDROID_TOOLCHAIN_NAME $ENV{ANDROID_TOOLCHAIN_NAME})
set(ANDROID_PLATFORM $ENV{ANDROID_PLATFORM})
include($ENV{NDK_CMAKE_TOOLCHAIN_FILE})