Android builds tested successfully after changeover to git

This commit is contained in:
Matthias Melcher 2019-01-03 23:16:59 +01:00
parent bf9dfa2afd
commit 005a744d68
5 changed files with 37 additions and 36 deletions

View File

@ -477,7 +477,7 @@ fltk-config --compile main.cxx
<a name="dropstart"></a>
### Make an Application Launchable by Dropping Files on its Icon
## Make an Application Launchable by Dropping Files on its Icon
TODO: update for FLTK 1.4
@ -497,6 +497,9 @@ to the Info.plist file you have prepared.
- Rebuild your application.
## Links
[GitHub, git, forking, fetching. and pull requests](https://gist.github.com/Chaser324/ce0505fbed06b947d962)
<a name="doc_history"></a>
## DOCUMENT HISTORY

View File

@ -1,49 +1,46 @@
Hello Android
=============
# Hello Android
Hello Android is an FLTK sample app that derives from the Android Studio sample
project Native Plasma. This sample uses Android Studio 3 and CMake.
Pre-requisites
--------------
- Android Studio 3.0+ with [NDK](https://developer.android.com/ndk/) bundle.
## Pre-requisites
* Android Studio 3.0+ with [NDK](https://developer.android.com/ndk/) bundle.
Getting Started
---------------
## Getting Started
1. [Download Android Studio](http://developer.android.com/sdk/index.html)
1. Launch Android Studio.
1. Open the Android directory inside the FLTK directory.
1. Open the AndroidStudio project by loading the HelloAndroid directory.
1. Open the `IDE` directory inside the FLTK directory.
1. Open the Android Studio project by loading the `AndroidStudio3` directory.
1. Click *Run/Run 'app'*.
Micrososft Windows Users
------------------------
The file 'gradlew.zip' must be unzipped before you can use AndroidStudio. It contains the required file 'gradlew.bat'. This was neccessary because some svn setups block anything that looks like an executable file, including files that end in .bat .
## Support
Support
-------
If you've found an error in these samples, please [file an issue](http://www.fltk.org/str.php). Patches are encouraged, and may be submitted via the same FLTK Bug & Feature system.
Please visit the FLTK [Forum](http://www.fltk.org/newsgroups.php) for additional help.
License
-------
## License
FLTK is provided under the terms of the [GNU Library Public License, Version 2 with exceptions](http://www.fltk.org/COPYING.php) that allow for static linking.
Android Shell
-------------
> am start -n org.fltk.android_hello/android.app.NativeActivity
> am force-stop org.fltk.android_hello
## Android Shell
> stop
> setprop libc.debug.malloc 10
> // setprop libc.debug.malloc.program org.fltk.android_hello
> setprop libc.debug.malloc.options "guard fill"
> start
List of short little helpers:
```bash
am start -n org.fltk.android_hello/android.app.NativeActivity
am force-stop org.fltk.android_hello
stop
setprop libc.debug.malloc 10
// setprop libc.debug.malloc.program org.fltk.android_hello
setprop libc.debug.malloc.options "guard fill"
start
```

View File

@ -56,14 +56,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
@ -72,6 +64,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@ -104,6 +104,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />

View File

@ -135,4 +135,4 @@
* test/hello.cxx : + 'hello' works fine, italics, shadow, etc.
* test/label.cxx : + 'label' works
*/
*/