Skip to content

Commit 143903c

Browse files
committed
Merge pull request #24 from ThorstenBux/ARTK-85
ARTK-85: Updated documentation in regards to now using AndroidStudio …
2 parents c060e9a + 1a11ab7 commit 143903c

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

4_Android/android_sdk.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ Therefore, video capture requires coordination between corresponding libraries o
3131
##SDK Requirements
3232
This SDK targets devices running Android 2.1 (Eclair) or later.
3333

34-
A working Android development environment is required, including the Eclipse IDE and Android SDK. For native development, the Android NDK is also needed.
34+
A working Android development environment with AndroidStudio is required. For native development, the Android NDK is also needed. For more details about native development see [here][android_native]
3535

36-
The SDK is currently tested predominantly on the Windows platform, and some build scripts are currently only provided as Windows batch files. However, these scripts are basic and their function should be clear and easy to replicate on other platforms.
36+
The SDK is currently tested predominantly on the Mac OSX platform, however we also support development with Windows. Not actively supported but also working is the development with ARToolKit and AndroidStudio on Linux.
3737

3838
A printer will be required to print out markers.
3939

40-
Currently the libraries assume data files are present on the mobile device. Please copy the contents of the directory “Misc/copy to device SD card” to the device before running the examples. The SD card will need to be mounted to perform the copy, but needs to be unmounted before running the examples.
41-
4240
[1]: 4_Android:android_examples
41+
[android_native]: 4_Android:android_native

0 commit comments

Comments
 (0)