Commit graph

282 commits

Author SHA1 Message Date
Pedro J. Estébanez
5a26459c06 Update/fix Android build
Fix wrong path for 32-bit Windows, which fixes #7084
Exclude 32-bit Windows from multi-threaded linking because it's not supported by the NDK
Remove 32-bit Linux as there is no NDK variant for it
2016-11-13 23:54:06 +01:00
Rémi Verschelde
84822c3dbf Merge pull request #7079 from RandomShaper/quicker-android-export
Make Android export quicker (especially on Windows)
2016-11-11 10:52:10 +01:00
Pedro J. Estébanez
56721e5d9d Make Android export quicker (especially on Windows) 2016-11-08 20:56:17 +01:00
volzhs
8d454ed9a7 Fix Directory.dir_exist/get_current_dir for 'res://' on Android
Fix #7014
2016-11-09 01:50:00 +09:00
Rémi Verschelde
cc95d4448c scons: Reorder options for clarity
Also prefix all thirdparty-related toggles with `builtin`.
2016-11-03 07:45:08 +01:00
Pedro J. Estébanez
b18ff942be Improve Android build (Clang + tidyness) 2016-11-02 10:54:51 +01:00
Rémi Verschelde
f34151ff0f style: Various other PEP8 fixes in Python files
Done with `autopep8 --select=E7`, fixes:

- E701 - Put colon-separated compound statement on separate lines.
- E702 - Put semicolon-separated compound statement on separate lines.
- E703 - Put semicolon-separated compound statement on separate lines.
- E711 - Fix comparison with None.
- E712 - Fix (trivial case of) comparison with boolean.
- E713 - Fix (trivial case of) non-membership check.
- E721 - Fix various deprecated code (via lib2to3).
2016-11-01 00:35:16 +01:00
Rémi Verschelde
817dd7ccbb style: Fix PEP8 blank lines issues in Python files
Done with `autopep8 --select=E3,W3`, fixes:

- E301 - Add missing blank line.
- E302 - Add missing 2 blank lines.
- E303 - Remove extra blank lines.
- E304 - Remove blank line following function decorator.
- E309 - Add missing blank line.
- W391 - Remove trailing blank lines.
2016-11-01 00:35:16 +01:00
Rémi Verschelde
d4c17700aa style: Fix PEP8 whitespace issues in Python files
Done with `autopep8 --select=E2,W2`, fixes:

- E201 - Remove extraneous whitespace.
- E202 - Remove extraneous whitespace.
- E203 - Remove extraneous whitespace.
- E211 - Remove extraneous whitespace.
- E221 - Fix extraneous whitespace around keywords.
- E222 - Fix extraneous whitespace around keywords.
- E223 - Fix extraneous whitespace around keywords.
- E224 - Remove extraneous whitespace around operator.
- E225 - Fix missing whitespace around operator.
- E226 - Fix missing whitespace around operator.
- E227 - Fix missing whitespace around operator.
- E228 - Fix missing whitespace around operator.
- E231 - Add missing whitespace.
- E231 - Fix various deprecated code (via lib2to3).
- E241 - Fix extraneous whitespace around keywords.
- E242 - Remove extraneous whitespace around operator.
- E251 - Remove whitespace around parameter '=' sign.
- E261 - Fix spacing after comment hash.
- E262 - Fix spacing after comment hash.
- E265 - Format block comments.
- E271 - Fix extraneous whitespace around keywords.
- E272 - Fix extraneous whitespace around keywords.
- E273 - Fix extraneous whitespace around keywords.
- E274 - Fix extraneous whitespace around keywords.
- W291 - Remove trailing whitespace.
- W293 - Remove trailing whitespace.
2016-11-01 00:35:16 +01:00
Rémi Verschelde
97c8508f5e style: Start applying PEP8 to Python files, indentation issues
Done with `autopep8 --select=E1`, fixes:

- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.
2016-11-01 00:33:51 +01:00
Randy Tan Shaoxian
638a31d972 Fixed tiny error in detect.py causing compilation for Android to fail.
(cherry picked from commit c9d7f77c6f)
2016-10-22 13:04:13 +02:00
Rémi Verschelde
e96c49f849 Merge pull request #6850 from akien-mga/pr-scsub-shebang
SCsub: Add python shebang as a hint for syntax highlighting
2016-10-17 20:13:18 +02:00
Rémi Verschelde
fc8ccd5b8c SCsub: Add python shebang as a hint for syntax highlighting
Also switch existing shebangs to "better" /usr/bin/env python.
2016-10-17 20:10:46 +02:00
Rémi Verschelde
bdce7eefa0 Merge pull request #6846 from volzhs/android-dir-exists
Fix crash when using Directory.dir_exists(path) on Android
2016-10-17 10:10:25 +02:00
Rémi Verschelde
0eccf42884 Merge pull request #6723 from bvbfan/patch-1
Correct OS architecture detection
2016-10-17 09:48:26 +02:00
Błażej Szczygieł
4ffa8f224d Theora: Don't compile unnecessary files, rename "x86_opt_*" 2016-10-16 22:31:27 +02:00
volzhs
4a57821349 Fix crash when using Directory.dir_exists(path) on Android 2016-10-17 01:29:31 +09:00
Rémi Verschelde
cbf52606f4 zlib: Split thirdparty files, simplify scons option 2016-10-15 12:20:47 +02:00
Rémi Verschelde
d9a291f641 ogg/vorbis/opus: Make them modules and unbundle thirdparty libs
Took the opportunity to undo the Godot changed made to the
opus source. The opus module should eventually be built in its
own environment to avoid polluting others with too many include
dirs and defines.

TODO: Fix the platform/ stuff for opus.
2016-10-15 11:50:40 +02:00
Rémi Verschelde
f63bf12193 Drop nedmalloc which is apparently not used anymore 2016-10-14 18:21:23 +02:00
Anthony Fieroni
f87e32696d Correct OS architecture detection
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
2016-10-11 20:58:24 +03:00
Pedro J. Estébanez
7f51bb7b1c Fix compile flags not getting to the Android build 2016-10-04 16:55:29 +02:00
syskrank
af4b0db1e4 removed confusing "if(true)" statement with empty "else" block 2016-09-26 12:30:59 +03:00
Pedro J. Estébanez
2c9d98bb48 Fix manifest generation bug in Android export 2016-09-21 12:46:40 +02:00
Juan Linietsky
1f7fde299d Revert "Change Android float ABI to hard" 2016-09-10 12:31:01 -03:00
Juan Linietsky
fc61eb37ce Merge pull request #5920 from 29jm/fix-warnings
Fix some more warnings
2016-09-10 12:21:02 -03:00
Juan Linietsky
0a9c08f87c Merge pull request #6438 from RandomShaper/android-hard-float-abi
Change Android float ABI to hard
2016-09-10 11:40:44 -03:00
Pedro J. Estébanez
68cd19a6c2 Change Android float ABI to hard 2016-09-09 13:31:35 +02:00
Pedro J. Estébanez
e9065632c6 Fix (potentially) Android libs packaging issue (#5645) 2016-09-07 02:41:16 +02:00
Johan Manuel
a4674bda47 Fix some comparisons between signed and unsigned integers 2016-08-13 13:21:35 +02:00
Johan Manuel
046f94d3ac Remove some unused variables 2016-08-13 13:21:35 +02:00
Skyfrit
4f6a21b0df Android: Rename values-zh to values-zh-rCN (#6063) 2016-08-08 11:51:30 +02:00
Skyfrit
664b5b5137 Android: Add support for Traditional Chinese (HK) (#6061) 2016-08-08 11:49:51 +02:00
Skyfrit
8ab4acd17f Android: Add support for Traditional Chinese (TW) (#6061) 2016-08-08 11:49:35 +02:00
Juan Linietsky
9213400cd5 Merge pull request #5415 from volzhs/improve-android-payment
Improve android payment
2016-07-24 12:18:13 -03:00
Mario Schlack
beaa56bff2 Minor code formatting in platform/android 2016-07-21 12:07:01 +02:00
Rémi Verschelde
b1cca17053 Merge pull request #5835 from volzhs/issue-5831
Fix compile error if use android_stl=yes
2016-07-21 10:37:18 +02:00
volzhs
01e39ecec8 Fix compile error if use android_stl=yes 2016-07-21 17:31:46 +09:00
Rémi Verschelde
5274f2a126 Merge pull request #5819 from hurikhan/android_getScreenDPI
Implement get_screen_dpi() on Android
2016-07-21 09:09:49 +02:00
Mario Schlack
0717893772 Implement get_screen_dpi() on Android 2016-07-20 14:54:48 +02:00
Juan Linietsky
0988970c1f Fixed properly not save signals that already exist in their base scenes, closes #5656 2016-07-19 21:26:12 -03:00
volzhs
79cb91dc84 Add querying details of IAP items for android 2016-07-18 23:45:58 +09:00
volzhs
f26f181ba9 Fix can't get all info if user purchases many items and not consumed 2016-07-18 23:45:58 +09:00
Jamil Halabi
370ae3512d Added gyroscope support to Godot and Android 2016-07-16 01:43:32 +08:00
sanikoyes
978cb0e884 Fix crash in FileAccessJAndroid::file_exists (does not free local ref) 2016-07-11 12:41:54 +08:00
Juan Linietsky
d279d060e1 Merge pull request #5077 from RandomShaper/improve-android-build
Improve Android build
2016-07-10 13:57:17 -03:00
volzhs
40d3234304 Add android_add_default_config for config.py
usage : env.android_add_default_config("applicationId 'com.godot.game'")
2016-07-07 04:03:50 +09:00
volzhs
b09dbaa78e Fix crash when null value through jni on android 2016-07-05 04:41:46 +09:00
Rémi Verschelde
9693f37fcc Merge pull request #5491 from volzhs/fix-jni-bool-string
Fix wrong return bool, string, string array data through jni
2016-07-03 19:11:04 +02:00
Juan Linietsky
1726bacf78 missnig ; 2016-07-02 16:04:00 -03:00
Juan Linietsky
973a12c5f2 Data dir returns a symlink in Android 6.0, which confuses DirAccess on android, this should fix it 2016-07-02 11:49:52 -03:00
volzhs
aac0af043c Fix wrong return bool, string, string array data through jni 2016-06-30 01:23:55 +09:00
Pedro J. Estébanez
e7b2626707 Make Android build smarter (SCons + Gradle)
Upgrade Gradle and Android plugin for Gradle
Disable all signing and zip-aligning for the export templates
Give correct names to generated APKs
Put .so files built by SCons right where Gradle has to pick them according to arch & build type
Downgrade NDK platform to 14 to match minSdkVersion
2016-06-27 10:49:15 +02:00
Rémi Verschelde
7d06d50e65 Merge pull request #5395 from vnen/android-sensors
Fix Android sensors polling rate on resume
2016-06-26 09:46:10 +02:00
Rémi Verschelde
fad6b29a59 Merge pull request #5390 from volzhs/jni-stringarray
Fix string array parameter check with jni
2016-06-26 09:45:36 +02:00
Juan Linietsky
8dac3bf3b1 Added function to notify ScriptLanguage when a thread is created/freed, allows scripts to allocate a stack there via TLS 2016-06-25 10:41:23 -03:00
Rémi Verschelde
c931ed976b Gradle: remove trailing spaces 2016-06-25 13:39:03 +02:00
George Marques
6d37253be5
Fix Android sensors polling rate on resume
Fix #5306
2016-06-24 21:00:04 -03:00
volzhs
456b7733fc Fix string array parameter check with jni 2016-06-25 02:05:46 +09:00
volzhs
a5a5bdef25 Remove duplicated aidl for android
Tested IAP function on device.
2016-06-25 01:11:21 +09:00
Rémi Verschelde
0a72f9ccb8 Merge pull request #5362 from J08nY/png
libpng: New version 1.6.27
2016-06-23 07:40:03 +02:00
Rémi Verschelde
b9ed5b12c9 Merge pull request #5235 from volzhs/fix-android-export
fix errors while exporting android
2016-06-23 07:35:22 +02:00
J08nY
0ab05b09e4
Fixed iCCp chunk in pngs
neccesary for libpng 1.6.27 to work silently
2016-06-22 21:13:29 +02:00
Rémi Verschelde
842e7bfc2f Merge pull request #5357 from volzhs/fix-locale-android
fix android resource locale
2016-06-22 16:05:59 +02:00
volzhs
591be5df25 fix android resource locale 2016-06-22 22:32:03 +09:00
volzhs
780fa60072 correct current Intent for android 2016-06-21 03:32:44 +09:00
Rémi Verschelde
8f2115529e Merge pull request #5135 from volzhs/android-manifest
fix android support screen property for large screen
2016-06-19 12:49:42 +02:00
Rémi Verschelde
b7dbf9207a Drop empty files that are not used anywhere
Part of #5272
2016-06-18 19:46:30 +02:00
Rémi Verschelde
a7fc04626a Add missing license headers in our source files (#5255)
Also removes a couple wrong Godot headers from third-party source files.
2016-06-18 14:46:12 +02:00
volzhs
e6bbe91994 fix errors while exporting android 2016-06-16 05:00:21 +09:00
Pedro J. Estébanez
1fcb2a1a00 Handle tmp files properly on Android export 2016-06-15 14:58:01 +02:00
Pedro J. Estébanez
e1948d520a Zip-align exported APK 2016-06-13 00:19:45 +02:00
Pedro J. Estébanez
1b189ad943 Fix typo 2016-06-11 13:11:42 +02:00
Pedro J. Estébanez
bb1b51f470 Keep certain assets uncompressed on Android export 2016-06-11 13:08:42 +02:00
volzhs
4f64935ab6 fix android support screen property for large screen 2016-06-10 14:09:33 +09:00
Juan Linietsky
d61b91cbe0 -Heavily improved editor startup and exit performance 2016-06-07 22:10:09 -03:00
Rémi Verschelde
aed5474238 Merge pull request #4729 from volzhs/android-23
Supporting Android API 23 (Android 6.0)
2016-06-07 09:45:24 +02:00
George Marques
408c26ce0b
Remove Make-related flags from Android build
They were wrongly placed, creating a file named "-fpic" instead of
applying "-fpic" to the build. This file was in .gitignore, which made it
less noticiable.

This also adds build.gradle to .gitignore.
2016-06-01 21:14:57 -03:00
Rémi Verschelde
e6e878e139 Icon: Remove more grey capsules behind official logo 2016-05-30 00:41:42 +02:00
fluffrabbit
4877b714b3
Add magnetometer sensor support for Android 2016-05-27 14:36:55 -03:00
volzhs
e5d16eca46 Add comments for NotificationCompat to support API < 16 2016-05-25 22:19:37 +09:00
volzhs
ff67c256f5 fix compatibility for Android API 14 with supporting API 23
using ``NotificationCompat`` in ``support-v4`` library will increase APK filesize a little bit, but it guarantees to run OK with API 4+
tested with API 19 and 23 devices
2016-05-24 11:22:35 +09:00
volzhs
5eb14d3af0 fix unexpected char: '\' error on windows
error occurred when register additional directory for android module on windows.

### config.py ###
```
def can_build(plat):
 return plat=="android"

def configure(env):
 if (env['platform'] == 'android'):
  env.android_add_res_dir("android/res")
```
2016-05-24 05:25:22 +09:00
Hubert Jarosz
33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02:00
volzhs
160713d4d3 Supporting Android API 23 (Android 6.0)
If we update build gradle to use ``compileSdkVersion 23``,
``org.apache.http`` package causes error. (issue #4711)

We need to use ``useLibrary 'org.apache.http.legacy'`` to solve this problem.
To use ``useLibrary``, we need to use latest gradle also.

And now, we faced another problem with ``APK Expansion`` java sources.

```
/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
137 :             mCurrentNotification.setLatestEventInfo(mContext, mCurrentTitle, mCurrentText, mContentIntent); // causes error
```

So, some of APK Expansion java sources are updated by referencing commits from https://github.com/danikula/Google-Play-Expansion-File
And dropped V3CustomNotification.java which was for android 3.0, since godot supports android 14 (4.0) above officially.

Unfortunately, another problem, The 'MissingTranslation' error was occurred.
So, build.gradle is updated to use ``disable 'MissingTranslation'``

Additionally, I updated ``buildToolsVersion``, ``targetSdkVersion`` to latest version.

I tested APK Expansion funtionality on Android 6.0 (Nexus 9, Nexus 6p) and Android 4.4 (Galaxy Note 2)  with Google Developer console.
2016-05-20 22:57:49 +09:00
Rémi Verschelde
5e0f0a962a Android buildsystem: Drop obsolete NDK_TOOLCHAIN argument
It was a duplicate of NDK_TARGET, and not used for anything.
2016-05-19 10:44:18 +02:00
Rémi Verschelde
94274b9ab5 OSX: Fix lib suffix for Android lib (#4499)
Fixes #1452.
2016-05-01 11:38:15 +02:00
eska
ab4caa7953 Move export GUI debug toggle to export settings window 2016-04-28 16:13:26 +02:00
volzhs
e94e710893 remove unused resources and add korean locale for android
- remove unused resources in platform/android/java/res/values/strings.xml
- add korean language resource for apk expansion download screen
2016-04-19 11:10:55 +09:00
Rémi Verschelde
0a5472e697 Remove trailing spaces 2016-04-02 20:26:12 +02:00
Rémi Verschelde
a895e2e372 Merge pull request #4105 from akien-mga/pr-android-shutdown-adb
Expose android/shutdown_adb_on_exit parameter
2016-03-20 18:34:05 +01:00
Rémi Verschelde
c584940387 Expose android/shutdown_adb_on_exit parameter and default to true
It was added in 30d0ca9 for the Steam build but only enabled
when parsing a ._sc_ file that would define it.
It is now available for all users to toggle, in and outside of Steam.

Fixes #4073.
2016-03-20 16:55:54 +01:00
blubee
a0fb5b5f95 Add support for gnu-libstc++-4.9 needed by recent NDK versions
The 4.9 version is the default one, people can still build using 4.8
with older NDK versions by setting the (optional) NDK_TARGET
and NDK_TARGET_X86 environment variables.
2016-03-20 20:29:37 +08:00
sanikoyes
9e026fecef Add -r flag to adb install for keep app user data 2016-03-18 18:11:55 +08:00
Hubert Jarosz
4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
volzhs
d6cc887627 fix gradle build on windows 2016-03-02 12:15:39 +09:00
Ariel Manzur
30d0ca9766 added [presets] to ._sc_ and "android/shutdown_adb_on_exit" to editor_settings 2016-02-27 12:11:40 -03:00
punto-
b6b33e8886 Merge pull request #3428 from Hinsbart/android-gamepad
support gamepad remapping on android
2016-02-08 20:09:02 -03:00
Hondres
e7b6e3f20b use fallback mapping from list 2016-01-27 12:18:34 +01:00
Juan Linietsky
16b8b97472 Combies driver split and spawn fix, closes #3265 2016-01-25 00:25:32 -03:00