Commit Graph

351 Commits

Author SHA1 Message Date
Ner'zhul 8e7449e092 Environment & IGameDef code refactoring (#4985)
* Environment code refactoring
* Cleanup includes & class declarations in client & server environment to improve build speed
* ServerEnvironment::m_gamedef is now a pointer to Server instead of IGameDef, permitting to cleanup many casts.
* Cleanup IGameDef
  * Move ITextureSource* IGameDef::getTextureSource() to Client only.
  * Also move ITextureSource *IGameDef::tsrc() helper
  * drop getShaderSource, getSceneManager, getSoundManager & getCamera abstract call
  * drop unused emerge() call
  * cleanup server unused functions (mentionned before)
* Drop one unused parameter from ContentFeatures::updateTextures
* move checkLocalPrivilege to Client
* Remove some unnecessary casts
* create_formspec_menu: remove IWritableTextureSource pointer, as client already knows it
* Fix some comments
* Change required IGameDef to Server/Client pointers
* Previous change that game.cpp sometimes calls functions with Client + InventoryManager + IGameDef in same functions but it's the same objects
* Remove duplicate Client pointer in GUIFormSpecMenu::GUIFormSpecMenu
* drop ClientMap::sectorWasDrawn which is unused
2017-01-09 20:39:22 +01:00
Wayward1 8f22272df5 Add raycast.cpp and tileanimation.cpp to Android.mk 2017-01-05 08:19:54 +01:00
Ner'zhul b95f543da9 Add gradle wrapper (#4954)
Gradle wrapper permit to use multiple gradle versions across OS versions
2016-12-24 12:30:18 +01:00
rubenwardy e3cbe521fc Update Android build tools to latest version (#4872) 2016-12-24 08:34:19 +01:00
sfan5 231ac33d34 Bump version to 0.4.15 2016-12-22 23:14:17 +01:00
sfan5 70579dc7c3 Android: Workarounds for Googles completely broken NDK 2016-12-22 22:17:54 +01:00
est31 1dd361f37c Android: update curl and libgmp 2016-12-21 14:36:14 +01:00
sfan5 158aa77fc9 iOS: Versioned assets (#49) 2016-12-19 23:22:25 +02:00
Maksim Gamarnik a68186451b iOS: 1.0.4 2016-12-19 23:20:21 +02:00
Maksim Gamarnik e7ee249303 Update light.cpp (thank's @sofar), iOS: small fix 2016-12-12 00:21:27 +02:00
Maksim Gamarnik 13d4a1f341 iOS: fix patches (maybe) 2016-12-11 17:02:43 +02:00
Maksim Gamarnik e0177a7c6e iOS: make luajit multiple threads 2016-12-11 14:55:36 +02:00
rubenwardy 2886f0ccb0 Fix sqlite databases being read-only on 64bit Android by patching sqlite (#4871)
Fixes #4121
2016-12-09 18:27:36 +01:00
est31 24719c6908 Android: fix build and update deps 2016-12-07 21:27:07 +01:00
Stefan aa9ca89ec2 Fix build problems with LuaJIT
(was caused by 12b714424d)
2016-11-26 02:37:57 +02:00
Stefan a413e73b8d Add support for ads 2016-11-26 02:37:57 +02:00
Maksim Gamarnik 12b714424d iOS: remove redis, minimap and add pause texture. Fix build script 2016-11-23 20:21:32 +02:00
sfan5 1d07c51eea iOS: LuaJIT & Intl
* LuaJIT

* intl
2016-11-23 20:20:42 +02:00
Maksim Gamarnik b67b74e366 iOS: Small tune 2016-11-14 18:31:22 +02:00
Maksim Gamarnik 21ddbd15c6 Android: optimization flags 2016-11-14 18:25:05 +02:00
sfan5 faafd4d0cc iOS added files (#42) 2016-11-06 00:14:22 +02:00
Maksim Gamarnik 66c5b30f60 Android: Small update
small reduction in the size JNI
2016-11-05 06:15:51 +03:00
Ner'zhul 7252c803e0 Add missing remoteplayer.cpp to Android build
this should fix #4683
2016-10-28 15:37:19 +02:00
Maksim Gamarnik a2a0b0ae47 Update Android, remove content_cso 2016-10-24 18:26:32 +03:00
ubulem e48a6e0b7a Actualize java part 2016-10-20 15:56:05 +03:00
Maksim Gamarnik b30cbda468 Fix mo create 2016-10-19 05:47:03 +03:00
sfan5 5e24e2bd73 Fix APK build Part2 (#35)
* Fix asset collection

* Split assets into three seperate .zip files
2016-10-19 03:30:18 +03:00
Maksim Gamarnik 4782ad207a Fix APK build Part1 2016-10-19 03:14:10 +03:00
sfan5 c9f51e805c Fix irrlicht patch (#34) 2016-10-19 02:40:50 +03:00
sfan5 949ac5a7ed Android intl (#31)
* Add libintl-lite to Android build

* Build and install .mo files on Android

* Compile with libintl on Android

* Make gettext actually function on Android

* Autodetect language on Android

* Fix small bug in asset collection
2016-10-19 02:18:23 +03:00
Maksim Gamarnik 7d466a9e4b Android: Fix build. Change progress bar size, android tune 2016-10-18 01:15:14 +03:00
Maksim Gamarnik f6322dcc0b Back LevelDB 2016-10-17 00:42:56 +03:00
Maksim Gamarnik de3ea028b3 ver. 1.1.6 2016-10-16 22:23:15 +03:00
Maksim Gamarnik 94fe1d3d79 Android: ndk12b - good bye, armeabi-v7a-hard! 2016-09-18 03:16:16 +03:00
Maksim Gamarnik c55c90b608 GNUIntl wip (not done) 2016-09-13 15:21:40 +03:00
Maksim Gamarnik 9a41787eda Update depends 2016-09-09 00:43:05 +03:00
Rogier-5 a4962240bd Fix for failure to find jsoncpp in android build (#4456)
Commit 4503b5 did not update the android build script.
2016-08-19 20:23:30 +02:00
Maksim Gamarnik 5d393e912b MultiCraft 1.1.4 Part 1 2016-08-12 19:59:03 +03:00
Ner'zhul 919d9d791c Increase android versionCode (#4350)
This little update is due to a packaging problem when uploading on play store. They don't permit to re upload an APK with same version code.
This case was a fail on openssl packaged version which was old and rejected by Google but they don't remove the APK then i should increase the version code to permit having it on play store
2016-07-28 13:13:25 +02:00
kwolekr 3c63c3044d Add MapSettingsManager and new mapgen setting script API functions
This commit refactors the majority of the Mapgen settings system.
- MapgenParams is now owned by MapSettingsManager, itself a part of ServerMap,
  instead of the EmergeManager.
- New Script API functions added:
    core.get_mapgen_setting
    core.get_mapgen_setting_noiseparams,
    core.set_mapgen_setting, and
    core.set_mapgen_setting_noiseparams.
- minetest.get/set_mapgen_params are deprecated by the above new functions.
- It is now possible to view and modify any arbitrary mapgen setting from a mod,
  rather than the base MapgenParams structure.
- MapgenSpecificParams has been removed.
2016-07-03 15:38:36 -04:00
est31 817fea6330 Fix android build
Thanks to @Wayward1 for reporting the bug.

Fixes #4212.
2016-06-11 05:44:55 +02:00
est31 fa6b21a15b Tell irrlicht if we handle a key or not.
We can remove the function in MtNativeActivity now
as it serves precisely that purpose: to tell irrlicht
that we handled the esc key.

TODO for later:
 * Perhaps try to find a more performant container than KeyList
2016-05-26 20:33:33 +02:00
berkut 2fed4ee962 Rate this app module added 2016-05-21 22:21:46 +03:00
est31 7a828de1bc Android: enable parallelism for main target too
This adds to the changes that commit

98d16e0d9a "Android: Tell make about sub-makes to speed up build"

did, and enables parallel builds for minetest
itself as well.
2016-05-16 05:14:25 +01:00
Maksim Gamarnik 778868d088 Update to Minetest 0.4.14 2016-05-15 16:30:09 +03:00
sfan5 854d9e3745 Bump version to 0.4.14 2016-05-15 14:49:15 +02:00
est31 b25554c8d7 Fix android build by fixing patch line endings 2016-05-14 16:46:46 +02:00
Maksim Gamarnik b906ed4e59 Fix locked hardware buttons on Android
Fixes #2122
Fixes #1454

Addendum (est31)
According from its docs in android_native_app_glue.h (from the NDK), the
onInputEvent should "Return 1 if you have handled the event, 0 for any
default dispatching". Before, we always returned 1, meaning we blocked
all hardware keys to be given to the OS.
This broke the volume keys and has caused #2122 and #1454.

Although it bases on lots of guesswork, it can probably safely be said that
CGUIEnvironment::postEventFromUser returns true if the event was handled,
and false if not. Therefore, set the status variable depending on what
postEventFromUser returned.
2016-05-14 23:42:36 +10:00
Maksim Gamarnik f9f5564517 Small update 2016-05-13 21:58:46 +03:00
Maksim Gamarnik d726a38380 Update README.md 2016-05-13 00:40:05 +03:00
est31 997002703b Android: download deps using https
Its more secure, and some pages even redirect to the https version.
2016-05-12 05:03:15 +02:00
est31 a9b5c2662f Android: update openssl to 1.0.2h 2016-05-12 00:52:29 +02:00
Maksim Gamarnik cc42dc0b9b Merge latest code 2016-05-07 23:40:31 +03:00
Maksim Gamarnik 75a555f90c Fix merge prev commits and fix bugs
Android: mpir, x86 flags, range view, fix favorite server icon, other
2016-05-03 04:21:56 +03:00
Maksim Gamarnik 751550ee53 Release
Or no? :)
2016-05-02 06:09:17 +03:00
Maksim Gamarnik 8718dec521 Fix tab and include 2016-05-02 00:01:06 +03:00
Maksim Gamarnik 7a8d64c4fa Fix build 2016-05-01 22:39:43 +03:00
berkut bb020a7a74 Migrate to Gradle build system 2016-04-30 17:03:00 +03:00
Maksim Gamarnik 0f37c8bf7f CRLF fix 2016-04-29 11:47:13 +03:00
Maksim Gamarnik 51cb15bc45 Merge minetest commits / WIP!
Java part WIP, pls, use prev commits!
2016-04-29 10:11:25 +03:00
Maksim Gamarnik 83f9b13d84 Minor update 2016-04-29 09:17:11 +03:00
ShadowNinja e41673820f Upgrade Android build to Gradle build system
The old Ant build system has been deprecated for a while and new development is focused on Gradle.
I also removed a hardcoded string that lint caught and moved the patch files to a subdirectory.
I left the JNI files in the root directory.
2016-04-28 12:28:42 -04:00
Maksim Gamarnik 26a9a85129 Android: Update dependencies, GMP was required as a dependency 2016-04-26 10:17:04 +01:00
ubulem 72f08ab8f3 latest changes 2016-04-22 19:26:56 +03:00
Maksim Gamarnik 3857a3b0bd Part III 2016-04-21 01:53:17 +03:00
Maksim Gamarnik efcd9ec28f Part I 2016-04-18 22:40:42 +03:00
Maksim Gamarnik 44f98aa061 ver. 1.1.2.3 2016-04-08 20:43:15 +03:00
Maksim Gamarnik 66d9352586 Remove ogg and item_drop improve 2016-04-01 00:26:03 +03:00
ubulem e7ece988d3 Latest changes 2016-03-29 14:15:26 +03:00
Maksim Gamarnik 758af96b60 Merge release 2016-03-28 20:08:34 +03:00
Maksim Gamarnik 2d64ccab9a Minor update Android, light, remove pageflip, other 2016-03-21 01:38:25 +02:00
Maksim Gamarnik 7039222ef9 ver. 1.2.1.1 2016-03-19 00:16:30 +02:00
Maksim Gamarnik 363afe5a55 Merge branch 'upstream/master' 2016-03-14 11:44:17 +02:00
ShadowNinja 0079887b64 Move AreaStore to util 2016-03-07 16:33:20 -05:00
Maksim Gamarnik 096a01ffef Update Android dependencies, -O3 optimization, remove old ARMv5 config
* Update OpenSSL (thanks @sapier, i use his patch!), Curl and SQLite3.
* Remove old arm config. Almost all phones that use ARMv5 have 1 core and 256-512 RAM, it's about 2-5 FPS.
* Do -O3 optimization for libs and remove -fexpensive-optimizations for Minetest (-O3 includes this! Read gcc docs).
* OpenSSL fix - thanks @sapier, again.
2016-03-05 05:52:45 +01:00
Maksim Gamarnik 8104974751 Small fix 2016-03-04 16:27:44 +02:00
Maksim Gamarnik 25d909bfdc Merge 2016-03-04 15:14:34 +02:00
berkut 69b1dca4f3 Latest changes 2016-03-01 22:46:58 +03:00
Maksim Gamarnik 92dff0178a build2 2016-02-24 04:27:46 +02:00
Maksim Gamarnik 92041152e1 v. 1.1.2-pre | build1 2016-02-23 06:40:14 +02:00
est31 f3f4af3fb9 Fix android build
Android had a linker error since commit:

31e0667a4a "Add Lua interface to HTTPFetchRequest"

Fixes #3766. Thanks to @MoNTE48 for reporting the bug.
2016-02-23 01:48:52 +01:00
Maksim Gamarnik 7420584c5d test 2016-02-23 02:31:19 +02:00
Maksim Gamarnik ae3d7c3ebc Merge remote-tracking branch 'upstream/master' 2016-02-23 00:38:30 +02:00
est31 a26970cdd4 Android: hardcode leveldb revision
Newest leveldb commit breaks build.
With no fix in sight, there is no other way
than to fall back to the last working leveldb
revision, and hardcode it.

Workaround for upstream bug

https://github.com/google/leveldb/issues/340
2016-02-22 17:46:16 +01:00
Maksim Gamarnik 9ac4477a67 Doc fix 2016-02-20 01:36:36 +02:00
Maksim Gamarnik 152d9cfbdb ver. 1.1.2
Fix license, remove npc, fix creative inventory, mobs spawning fix, doc
improve
2016-02-19 00:31:22 +02:00
Maksim Gamarnik 108b5aa536 Fix 2016-02-17 20:34:20 +02:00
Maksim Gamarnik 1f7f17458e Android: final optimization! 2016-02-17 10:16:41 +02:00
Maksim Gamarnik 7b5d77084e Android: SPEEEEED! 2016-02-17 07:13:12 +02:00
Maksim Gamarnik 6a235702a3 Optimization, scaling and game control improve 2016-02-16 16:31:14 +02:00
Maksim Gamarnik 69f679800d RC1 2016-02-12 06:35:36 +02:00
Maksim Gamarnik 9abdf23879 Not Minetest, MultiCraft!
Change Minetest on MultiCraft. =)
2016-02-12 05:52:43 +02:00
Maksim Gamarnik 4a1647fcf4 Revert2 2016-02-12 05:10:44 +02:00
Maksim Gamarnik e5b0d4b95c Revert ogg/vorbis patch 2016-02-12 04:43:50 +02:00
Maksim Gamarnik 6f0ffee2d9 revert 2016-02-12 04:35:46 +02:00
Maksim Gamarnik 86bc1f4300 Merge pull request #22 from grigoriis/freetype
Android: vorbis with ogg
2016-02-11 22:04:09 +02:00
ubulem 6b1e289987 New algorithm. Transliteration 2016-02-11 16:26:38 +03:00
grigoriis ba956be80f vorbis with ogg 2016-02-11 14:56:22 +02:00
grigoriis f71f59a33c fix description 2016-02-10 17:14:27 +02:00
grigoriis 90efbed7f6 -png -harfbuzz 2016-02-10 17:09:54 +02:00
grigoriis 98f5e59321 vorbis OK 2016-02-09 22:18:41 +02:00
grigoriis 8abae4e924 add ogg, vorbis 2016-02-09 21:26:55 +02:00
grigoriis a8c0bedc4f success openal 2016-02-09 16:29:53 +02:00
grigoriis 2b61fee0ee openal with patch 2016-02-09 15:22:04 +02:00
grigoriis b84eaceb66 Freetype 2016-02-09 14:58:21 +02:00
Maksim Gamarnik 7958b395ed Android performance
Thanks http://blog.alexrp.com/2014/02/18/android-hard-float-support/

1
2016-02-09 06:51:01 +02:00
Maksim Gamarnik e4364bcff6 Update Makefile
Add ARMv8 (not working now!)
2016-02-08 23:42:41 +02:00
Maksim Gamarnik 1ac7f0dbc5 Very big update! MultiCraft 1.1 | Part 1/3
Joystick.
environment.cpp improve (thanks @Bremaweb)
Improving the management interface.
The new font.
Settings to improve performance.
Improvements ellementov size on larger phones.
A lot of small fixes and improvements.
2016-02-07 03:11:12 +02:00
Maksim Gamarnik 4327fab167 Fix OpenAl, -O3 optimisation, fix LevelDB disabling 2016-02-04 13:27:56 +02:00
Maksim Gamarnik af41a0321c Pre-release 2016-02-01 18:11:26 +02:00
Maksim Gamarnik 18c6b747b6 Merge branch 'master' of https://github.com/minetest/minetest 2016-01-31 20:57:03 +02:00
est31 ef779b0ab6 Fix compilation warning if compiling for android with c++11 2016-01-23 06:26:58 +01:00
Duane Robertson 3c6b2ffb10 Add Valleys mapgen. 2016-01-14 05:04:29 +00:00
ubulem ab26e30b68 MultiCraft instead SnowCraft in strings 2015-12-30 18:25:01 +03:00
berkut dc3d9784f9 Bunch of actual files 2015-12-29 23:10:33 +03:00
berkut 927e063e47 old files removed 2015-12-29 23:08:30 +03:00
Maksim Gamarnik a2251f0f79 MultiCraft 1.0.2 2015-12-27 22:55:32 +02:00
Sapier 9c9b02ca8a Android: shorten initial progress bar text way more simple 2015-12-23 21:01:35 +01:00
est31 98d16e0d9a Android: Tell make about sub-makes to speed up build
Before, sub-makes called by make were called without make knowing they
were sub-makes. This however led make's jobserver not do its tasks,
and the build process ended up with inefficient parralelisation. This
commit fixes this by applying the two ways the make manual tells
about: putting + to the start of the line (used when ndk-build is
invoked), and exchanging "make" with "$(MAKE)".

Before, make complained with messages like:

make[2]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.

This complaint can now only been seen for openssl. openssl has issues
if make gets exchanged with $(MAKE): if exchanged, above error message
is multiplied for various subdirs of the openssl source tree.

On a 4 core box, "make -j 4" build time from "make clean_all" cleaned
source tree could be improved from 15:34 minutes to 10:45 minutes.
This means a speedup of 45%.
2015-12-23 06:17:42 +01:00
ShadowNinja b4eb614d31 Android: Fix extra files being copied to the APK
dcb91cf0c0 hacked around the biggest issue
this caused, but wasted a lot of CPU time and disk space  It also still
included a lot of other unwanted files.  This removes all of `doc/` except
the license, and also removes the server list.
2015-12-20 12:48:55 +01:00
Sapier bde6194638 Android: Remove unused build target curl_binary 2015-12-17 23:00:51 +01:00
Sapier dcb91cf0c0 Android: Don't put html docs to apk 2015-12-17 23:00:43 +01:00
Sapier a3fd167dda Android: Remove non freetype fonts from apk 2015-12-17 23:00:31 +01:00
Maksim Gamarnik b05a829924 Fix 2015-12-15 14:05:18 +02:00
est31 6133b2bc45 Fix android build
Fix android build since commit

696148e298 "Fix Event implementation"

by @ShadowNinja.

Fixes #3444. Thanks @kwolekr for pointing out the fix.
2015-12-11 11:24:26 +01:00
Maksim Gamarnik 9251e980f8 Merge and Fix 2015-12-11 11:18:54 +02:00
Maksim Gamarnik e150219b9d Merge last minetest commits 2015-11-27 12:57:52 +02:00
Maksim Gamarnik 4edb331124 Update 1 2015-11-27 12:03:23 +02:00
est31 2f58e4d962 Android: hardcode irrlicht revision, update other dependencies
Recent irrlicht revisions break the build, hardcode the revision to a working one
until upstream publishes a working version. See issue #3366 for
a discussion about this.

Also update dependencies to current versions.
2015-11-16 17:33:01 +01:00
paramat 76c9abe4c8 Mapgen: Add flat mapgen in hidden form 2015-11-11 09:37:54 +00:00
Maksim Gamarnik 58a0ca7ed0 Fix 2015-11-10 21:14:24 +02:00
Maksim Gamarnik cece4a6685 Android update 2015-11-10 20:39:17 +02:00
Maksim Gamarnik bef9573aeb Merge last Minetest commits 2015-11-10 20:29:00 +02:00
Maksim Gamarnik d3d35550f7 Fix makefile 2015-11-10 19:18:32 +02:00
Maksim Gamarnik 9012ac8f22 Update
Sync all Minetest commits
2015-11-10 13:49:24 +02:00
est31 49bda7f98d Android: statically load iconv library
Fixes #3291

Thanks to @arpruss for reporting the bug, and suggesting the fix.

Also, remove trailing whitespaces.
2015-10-24 20:47:02 +02:00
paramat d152b55971 Android/Mapgen: Add fractal mapgen file to android makefiles 2015-10-06 22:32:13 +01:00
est31 183d0d5633 Update leveldb git url
Google code was shut down, project moved to github.
2015-09-08 21:45:16 +02:00
ShadowNinja 67d38a303b Add setting for mods to copy to Android app 2015-08-24 14:37:14 -04:00
ShadowNinja 32e4f4b32d Fix Android build of threading sources 2015-08-24 11:20:53 -04:00
ShadowNinja e4bff8be94 Clean up threading
* Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
2015-08-23 22:04:06 -04:00
est31 6a1047d8c1 Fix wrong android versionName
Before, android versionName was set to "...13", which made the f-droid build fail.
2015-08-21 22:47:04 +02:00
est31 d44fceac7e Bump version to 0.4.13 2015-08-20 04:02:00 +02:00
Maksim Gamarnik 2a3fb395be Update libs, performance improve, update gui 2015-08-16 17:07:40 +03:00
berkut f877bda0b6 Fixed restart when launched by shortcut. Moved dialogs to MainActivity. Other minor improvements 2015-08-14 10:28:51 +03:00
est31 47225346be Android: fix sound issue, and gitignore
Previously, sound failed due to errors with hardfp abi build
instructions. As the problem couldn't be found, the softfp
compatible abi was chosen instead.

This move will cause a small performance overhead, but due to the
abi being armeabi-v7a, the internal calculations will still be done
using the FPU.

We also fix some issues with ABI information passing. However, the
fixes aren't sufficient to get sound working.

The patch also fixes an issue with the gitignore file.
2015-08-02 19:23:17 +02:00
est31 c39a85a88d Android: Add githash header to spare rebuilds after new commits
Before, android_version.h got changed at every new commit. Now, we
only change it with new minetest releases. Analogous to how cmake
does it,  we add an android_version_githash.h file that communicates
the git hash to C++ code.

Also, unify VERS_MAJOR, VERS_MINOR and VERS_PATCH variable
calculation inside the whole makefile.
2015-08-01 20:42:07 +02:00
est31 e29b61ecd4 Android: speed up rebuild, and prevent race condition fail
Speeding up rebuild:

Before, we've written the android_version.h file at every rebuild.
As it thought the file's content has changed, make has rebuilt files
in the source tree that depended on that header file during rebuild,
causing lots of files being rebuilt without there being a reason.

The reasoning of make can be observed by passing -d and V=1 params
to the ndk-build command. You then got logging entries like:

Prerequisite `jni/src/android_version.h' is newer than target `obj/local/armeabi-v7a-hard/objs-debug/minetest/jni/src/areastore.o'.

Preventing race condition build fail:

Before, there was a race condition, where, if the prep_srcdir target
was executed in parallel with the $(ROOT)/jni/src/android_version.h
one, it could happen that the jni/src directory was nonexistent, and
we were trying to write into a file inside. This resulted in a build
failue:

/bin/sh: 1: cannot create [...]/jni/src/android_version.h: Directory nonexistent

Additionally, we now don't remove the link to src/ needlessly anymore.
Keeping this wouldn't have affected the rebuild, but this way its
more proper.
2015-07-31 10:12:20 +02:00
est31 7217fd32eb Fix 0.4.11 githash for android
Also make only one >-redirection, sparing repetition.
Also, use cut instead of awk, which is shorter and should be a bit faster.
2015-07-31 04:51:57 +02:00
est31 eb3aac20c8 Android: fix horrible libiconv build
Before, our libiconv build was a joke. We first called configure for our own build host system,
then called make, before we executed a Android.mk script we provided as patch. The first "native make"
always failed, and the LIBICONV_LIB file setting in our Makefile didn't match the built one,
resulting in an always-rebuild of iconv.

This commit cleans up this total mess, removes the double-build, and the Android.mk, and properly calls
./configure with the according target platform, and uses a built toolchain.

As we have to deal with the android bug "NDK: Support for prebuild libs with full sonames"
https://code.google.com/p/android/issues/detail?id=55868
as the 2013 patch
https://lists.gnu.org/archive/html/libtool-patches/2013-06/msg00002.html
by Google's David Turner wasn't inside the 2011 libtool, we pass -avoid-version to
libtool.

Thanks to the proper build, wide_to_utf8 works for android now, removing us of the need to disable it.
2015-07-29 15:59:06 +02:00