Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 32c0658

Browse files
livecodeianlivecodeian
committed
Merge branch 'develop-9.0' of https://github.com/livecode/livecode into feature-android-armv7
2 parents 63f32b6 + e61c89a commit 32c0658

7 files changed

Lines changed: 23 additions & 14 deletions

File tree

‎config.py‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
BUILDBOT_PLATFORM_TRIPLES = (
2626
'x86-linux-debian8',
2727
'x86_64-linux-debian8',
28-
'armv6-android-api26',
29-
'armv7-android-api26',
30-
'arm64-android-api26',
31-
'x86-android-api26',
32-
'x86_64-android-api26',
28+
'armv6-android-sdk26_ndk16r15',
29+
'armv7-android-sdk26_ndk16r15',
30+
'arm64-android-sdk26_ndk16r15',
31+
'x86-android-sdk26_ndk16r15',
32+
'x86_64-android-sdk26_ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
3434
'universal-ios-iphoneos11.4',
3535
'universal-ios-iphoneos11.2',
@@ -146,7 +146,8 @@ def exec_gyp(args):
146146
def process_env_options(opts):
147147
vars = ('OS', 'PLATFORM', 'GENERATOR_OUTPUT', 'FORMATS', 'DEPTH',
148148
'WIN_MSVS_VERSION', 'XCODE_TARGET_SDK', 'XCODE_HOST_SDK',
149-
'TARGET_ARCH', 'PERL', 'ANDROID_NDK_VERSION', 'ANDROID_PLATFORM',
149+
'TARGET_ARCH', 'PERL', 'ANDROID_NDK_VERSION',
150+
'ANDROID_NDK_PLATFORM_VERSION', 'ANDROID_PLATFORM',
150151
'ANDROID_SDK', 'ANDROID_NDK', 'ANDROID_BUILD_TOOLS', 'LTO',
151152
'ANDROID_TOOLCHAIN', 'ANDROID_API_VERSION',
152153
'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY', 'OBJDUMP',
@@ -607,6 +608,9 @@ def validate_android_tools(opts):
607608
error('Android NDK not found; set $ANDROID_NDK')
608609
opts['ANDROID_NDK'] = ndk
609610

611+
if opts['ANDROID_NDK_PLATFORM_VERSION'] is None:
612+
opts['ANDROID_NDK_PLATFORM_VERSION'] = '16'
613+
610614
if opts['ANDROID_API_VERSION'] is None:
611615
opts['ANDROID_API_VERSION'] = '26'
612616

@@ -747,6 +751,7 @@ def configure_android(opts):
747751

748752
export_opts(opts, ('ANDROID_BUILD_TOOLS', 'ANDROID_NDK',
749753
'ANDROID_PLATFORM', 'ANDROID_SDK',
754+
'ANDROID_NDK_VERSION', 'ANDROID_NDK_PLATFORM_VERSION',
750755
'ANDROID_API_VERSION',
751756
'JAVA_SDK', 'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY',
752757
'OBJDUMP', 'STRIP'))

‎config/android.gypi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
'java_sdk_path%': '<!(echo ${JAVA_SDK})',
99
'android_sdk_path%': '<!(echo ${ANDROID_SDK})',
1010
'android_ndk_path%': '<!(echo ${ANDROID_NDK})',
11-
'android_api_version%': '<!(echo ${ANDROID_API_VERSION})',
11+
'android_api_version%': '<!(echo ${ANDROID_API_VERSION})',
12+
'android_ndk_platform_version%': '<!(echo ${ANDROID_NDK_PLATFORM_VERSION})',
13+
'android_ndk_version%': '<!(echo ${ANDROID_NDK_VERSION})',
1214
'android_platform%': '<!(echo ${ANDROID_PLATFORM})',
1315
'android_build_tools%': '<!(echo ${ANDROID_BUILD_TOOLS})',
1416
},
@@ -30,7 +32,7 @@
3032
'strip': '<!(echo ${STRIP:-strip})',
3133

3234
'android_ndk_path%': '<(android_ndk_path)',
33-
'android_api_version%': '<(android_api_version)',
35+
'android_subplatform%': 'sdk<(android_api_version)_ndk<(android_ndk_platform_version)<(android_ndk_version)',
3436
},
3537

3638
'target_defaults':

‎docs/development/build-android.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Create a standalone toolchain (this simplifies setting up the build environment)
4242

4343
````bash
4444
android-ndk-r15/build/tools/make_standalone_toolchain.py \
45-
--arch arm --api 26 \
45+
--arch arm --api 16 --deprecated-headers \
4646
--install-dir ${HOME}/android/toolchain/standalone
4747
````
4848

@@ -81,6 +81,7 @@ AR="${BINDIR}/${TRIPLE}-ar"
8181

8282
# Android platform information
8383
ANDROID_NDK_VERSION=r15
84+
ANDROID_NDK_PLATFORM_VERSION=16
8485
ANDROID_API_VERSION=26
8586
ANDROID_PLATFORM=android-${ANDROID_API_VERSION}
8687
ANDROID_NDK=${TOOLCHAIN}/android-ndk-${ANDROID_NDK_VERSION}
@@ -90,7 +91,8 @@ ANDROID_LIB_PATH=${TOOLCHAIN}/standalone/${TRIPLE}/lib
9091

9192
export JAVA_SDK
9293
export CC CXX LINK AR
93-
export ANDROID_PLATFORM ANDROID_NDK ANDROID_SDK ANDROID_BUILD_TOOLS
94+
export ANDROID_PLATFORM ANDROID_NDK ANDROID_NDK_PLATFORM_VERSION
95+
export ANDROID_SDK ANDROID_BUILD_TOOLS
9496
export ANDROID_LIB_PATH ANDROID_API_VERSION
9597
````
9698

‎engine/rsrc/android-manifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
${INSTALL_LOCATION}>
77
${PUSH_PERMISSIONS}
88
${USES_PERMISSION}${USES_FEATURE}
9-
<uses-sdk android:minSdkVersion="${MIN_SDK_VERSION}" android:targetSdkVersion="${MIN_SDK_VERSION}"/>
9+
<uses-sdk android:minSdkVersion="${MIN_SDK_VERSION}" android:targetSdkVersion="26"/>
1010
<supports-screens
1111
android:largeScreens="true"
1212
android:normalScreens="true"

‎prebuilt/fetch-libraries.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LIBS_emscripten=( ICU )
1717

1818
SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator11.4 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS11.4)
1919
SUBPLATFORMS_win32=(v140_static_debug v140_static_release)
20-
SUBPLATFORMS_android=(api26)
20+
SUBPLATFORMS_android=(sdk26_ndk16r15)
2121

2222
# Fetch settings
2323
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)

‎prebuilt/libicu.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
{
185185
'library_dirs':
186186
[
187-
'lib/android/<(target_arch)/api<(android_api_version)',
187+
'lib/android/<(target_arch)/<(android_subplatform)',
188188
],
189189

190190
'libraries':

‎prebuilt/libopenssl.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
{
126126
'library_dirs':
127127
[
128-
'lib/android/<(target_arch)/api<(android_api_version)',
128+
'lib/android/<(target_arch)/<(android_subplatform)',
129129
],
130130

131131
'libraries':

0 commit comments

Comments
 (0)