Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
f7200d69
Commit
f7200d69
authored
Jun 19, 2019
by
fhuya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deprecate armv6 support for Android
parent
02ed4b39
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
24 deletions
+5
-24
build.gradle
misc/ide/jetbrains/build.gradle
+1
-1
SCsub
modules/opus/SCsub
+1
-1
SCsub
modules/webm/libvpx/SCsub
+0
-2
SCsub
platform/android/SCsub
+1
-3
detect.py
platform/android/detect.py
+2
-14
export.cpp
platform/android/export/export.cpp
+0
-3
No files found.
misc/ide/jetbrains/build.gradle
View file @
f7200d69
...
@@ -23,7 +23,7 @@ dependencies {
...
@@ -23,7 +23,7 @@ dependencies {
def
pathToRootDir
=
"../../../"
def
pathToRootDir
=
"../../../"
// Note: Only keep the abis you support to speed up the gradle 'assemble' task.
// Note: Only keep the abis you support to speed up the gradle 'assemble' task.
def
supportedAbis
=
[
"armv
6"
,
"armv
7"
,
"arm64v8"
,
"x86"
,
"x86_64"
]
def
supportedAbis
=
[
"armv7"
,
"arm64v8"
,
"x86"
,
"x86_64"
]
android
{
android
{
...
...
modules/opus/SCsub
View file @
f7200d69
...
@@ -221,7 +221,7 @@ if env['builtin_opus']:
...
@@ -221,7 +221,7 @@ if env['builtin_opus']:
env_opus
.
Prepend
(
CPPPATH
=
[
thirdparty_dir
+
"/"
+
dir
for
dir
in
thirdparty_include_paths
])
env_opus
.
Prepend
(
CPPPATH
=
[
thirdparty_dir
+
"/"
+
dir
for
dir
in
thirdparty_include_paths
])
if
env
[
"platform"
]
==
"android"
:
if
env
[
"platform"
]
==
"android"
:
if
(
"android_arch"
in
env
and
env
[
"android_arch"
]
in
[
"armv6"
,
"armv7"
]
):
if
(
"android_arch"
in
env
and
env
[
"android_arch"
]
==
"armv7"
):
env_opus
.
Append
(
CPPFLAGS
=
[
"-DOPUS_ARM_OPT"
])
env_opus
.
Append
(
CPPFLAGS
=
[
"-DOPUS_ARM_OPT"
])
elif
(
"android_arch"
in
env
and
env
[
"android_arch"
]
==
"arm64v8"
):
elif
(
"android_arch"
in
env
and
env
[
"android_arch"
]
==
"arm64v8"
):
env_opus
.
Append
(
CPPFLAGS
=
[
"-DOPUS_ARM64_OPT"
])
env_opus
.
Append
(
CPPFLAGS
=
[
"-DOPUS_ARM64_OPT"
])
...
...
modules/webm/libvpx/SCsub
View file @
f7200d69
...
@@ -384,8 +384,6 @@ elif webm_cpu_arm:
...
@@ -384,8 +384,6 @@ elif webm_cpu_arm:
env_libvpx
.
add_source_files
(
env
.
modules_sources
,
[
libvpx_dir
+
"third_party/android/cpu-features.c"
])
env_libvpx
.
add_source_files
(
env
.
modules_sources
,
[
libvpx_dir
+
"third_party/android/cpu-features.c"
])
env_libvpx_neon
=
env_libvpx
.
Clone
()
env_libvpx_neon
=
env_libvpx
.
Clone
()
if
env
[
"platform"
]
==
'android'
and
env
[
"android_arch"
]
==
'armv6'
:
env_libvpx_neon
.
Append
(
CCFLAGS
=
[
'-mfpu=neon'
])
env_libvpx_neon
.
add_source_files
(
env
.
modules_sources
,
libvpx_sources_arm_neon
)
env_libvpx_neon
.
add_source_files
(
env
.
modules_sources
,
libvpx_sources_arm_neon
)
if
env
[
"platform"
]
==
'uwp'
:
if
env
[
"platform"
]
==
'uwp'
:
...
...
platform/android/SCsub
View file @
f7200d69
...
@@ -37,9 +37,7 @@ android_objects.append(env_thirdparty.SharedObject('#thirdparty/misc/ifaddrs-and
...
@@ -37,9 +37,7 @@ android_objects.append(env_thirdparty.SharedObject('#thirdparty/misc/ifaddrs-and
lib
=
env_android
.
add_shared_library
(
"#bin/libgodot"
,
[
android_objects
],
SHLIBSUFFIX
=
env
[
"SHLIBSUFFIX"
])
lib
=
env_android
.
add_shared_library
(
"#bin/libgodot"
,
[
android_objects
],
SHLIBSUFFIX
=
env
[
"SHLIBSUFFIX"
])
lib_arch_dir
=
''
lib_arch_dir
=
''
if
env
[
'android_arch'
]
==
'armv6'
:
if
env
[
'android_arch'
]
==
'armv7'
:
lib_arch_dir
=
'armeabi'
elif
env
[
'android_arch'
]
==
'armv7'
:
lib_arch_dir
=
'armeabi-v7a'
lib_arch_dir
=
'armeabi-v7a'
elif
env
[
'android_arch'
]
==
'arm64v8'
:
elif
env
[
'android_arch'
]
==
'arm64v8'
:
lib_arch_dir
=
'arm64-v8a'
lib_arch_dir
=
'arm64-v8a'
...
...
platform/android/detect.py
View file @
f7200d69
...
@@ -26,7 +26,7 @@ def get_opts():
...
@@ -26,7 +26,7 @@ def get_opts():
return
[
return
[
(
'ANDROID_NDK_ROOT'
,
'Path to the Android NDK'
,
os
.
environ
.
get
(
"ANDROID_NDK_ROOT"
,
0
)),
(
'ANDROID_NDK_ROOT'
,
'Path to the Android NDK'
,
os
.
environ
.
get
(
"ANDROID_NDK_ROOT"
,
0
)),
(
'ndk_platform'
,
'Target platform (android-<api>, e.g. "android-18")'
,
"android-18"
),
(
'ndk_platform'
,
'Target platform (android-<api>, e.g. "android-18")'
,
"android-18"
),
EnumVariable
(
'android_arch'
,
'Target architecture'
,
"armv7"
,
(
'armv7'
,
'arm
v6'
,
'arm
64v8'
,
'x86'
,
'x86_64'
)),
EnumVariable
(
'android_arch'
,
'Target architecture'
,
"armv7"
,
(
'armv7'
,
'arm64v8'
,
'x86'
,
'x86_64'
)),
BoolVariable
(
'android_neon'
,
'Enable NEON support (armv7 only)'
,
True
),
BoolVariable
(
'android_neon'
,
'Enable NEON support (armv7 only)'
,
True
),
BoolVariable
(
'android_stl'
,
'Enable Android STL support (for modules)'
,
True
)
BoolVariable
(
'android_stl'
,
'Enable Android STL support (for modules)'
,
True
)
]
]
...
@@ -93,7 +93,7 @@ def configure(env):
...
@@ -93,7 +93,7 @@ def configure(env):
## Architecture
## Architecture
if
env
[
'android_arch'
]
not
in
[
'armv7'
,
'arm
v6'
,
'arm
64v8'
,
'x86'
,
'x86_64'
]:
if
env
[
'android_arch'
]
not
in
[
'armv7'
,
'arm64v8'
,
'x86'
,
'x86_64'
]:
env
[
'android_arch'
]
=
'armv7'
env
[
'android_arch'
]
=
'armv7'
neon_text
=
""
neon_text
=
""
...
@@ -119,13 +119,6 @@ def configure(env):
...
@@ -119,13 +119,6 @@ def configure(env):
abi_subpath
=
"x86_64-linux-android"
abi_subpath
=
"x86_64-linux-android"
arch_subpath
=
"x86_64"
arch_subpath
=
"x86_64"
env
[
"x86_libtheora_opt_gcc"
]
=
True
env
[
"x86_libtheora_opt_gcc"
]
=
True
elif
env
[
'android_arch'
]
==
'armv6'
:
env
[
'ARCH'
]
=
'arch-arm'
env
.
extra_suffix
=
".armv6"
+
env
.
extra_suffix
target_subpath
=
"arm-linux-androideabi-4.9"
abi_subpath
=
"arm-linux-androideabi"
arch_subpath
=
"armeabi"
can_vectorize
=
False
elif
env
[
"android_arch"
]
==
"armv7"
:
elif
env
[
"android_arch"
]
==
"armv7"
:
env
[
'ARCH'
]
=
'arch-arm'
env
[
'ARCH'
]
=
'arch-arm'
target_subpath
=
"arm-linux-androideabi-4.9"
target_subpath
=
"arm-linux-androideabi-4.9"
...
@@ -249,11 +242,6 @@ def configure(env):
...
@@ -249,11 +242,6 @@ def configure(env):
elif
env
[
'android_arch'
]
==
'x86_64'
:
elif
env
[
'android_arch'
]
==
'x86_64'
:
target_opts
=
[
'-target'
,
'x86_64-none-linux-android'
]
target_opts
=
[
'-target'
,
'x86_64-none-linux-android'
]
elif
env
[
"android_arch"
]
==
"armv6"
:
target_opts
=
[
'-target'
,
'armv6-none-linux-androideabi'
]
env
.
Append
(
CCFLAGS
=
'-march=armv6 -mfpu=vfp -mfloat-abi=softfp'
.
split
())
env
.
Append
(
CPPFLAGS
=
[
'-D__ARM_ARCH_6__'
])
elif
env
[
"android_arch"
]
==
"armv7"
:
elif
env
[
"android_arch"
]
==
"armv7"
:
target_opts
=
[
'-target'
,
'armv7-none-linux-androideabi'
]
target_opts
=
[
'-target'
,
'armv7-none-linux-androideabi'
]
env
.
Append
(
CCFLAGS
=
'-march=armv7-a -mfloat-abi=softfp'
.
split
())
env
.
Append
(
CCFLAGS
=
'-march=armv7-a -mfloat-abi=softfp'
.
split
())
...
...
platform/android/export/export.cpp
View file @
f7200d69
...
@@ -553,9 +553,6 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
...
@@ -553,9 +553,6 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
static
Vector
<
String
>
get_abis
()
{
static
Vector
<
String
>
get_abis
()
{
Vector
<
String
>
abis
;
Vector
<
String
>
abis
;
// We can still build armv6 in theory, but it doesn't make much
// sense for games, so disabling for now.
//abis.push_back("armeabi");
abis
.
push_back
(
"armeabi-v7a"
);
abis
.
push_back
(
"armeabi-v7a"
);
abis
.
push_back
(
"arm64-v8a"
);
abis
.
push_back
(
"arm64-v8a"
);
abis
.
push_back
(
"x86"
);
abis
.
push_back
(
"x86"
);
...
...
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