summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-01-20 13:20:13 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-01-20 13:25:35 +0200
commitdd013e7a6f68ab144ce2330ca139cd5d5e80e479 (patch)
treea4c9a4009d2a37dc75a6519df4ee25b239c9b77c /android
parentAdd a stop-start-cycle target to do the adb shell stop & start dance (diff)
downloadcore-dd013e7a6f68ab144ce2330ca139cd5d5e80e479.tar.gz
core-dd013e7a6f68ab144ce2330ca139cd5d5e80e479.zip
Improve Android configury
Add a --with-android-sdk switch, and make that and the --with-android-ndk mandatory when building for Android. Automatically create a proper android/sc/qa/local.properties file (which points to the SDK) for Ant. Restore the Android ARM code generation related flags that I think we want to use (that used to be mentioned in README.cross but were accidentally dropped) to the automated setting of CC and CXX.
Diffstat (limited to 'android')
-rw-r--r--android/qa/sc/local.properties.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/android/qa/sc/local.properties.in b/android/qa/sc/local.properties.in
new file mode 100644
index 000000000000..27c8eb5f4dac
--- /dev/null
+++ b/android/qa/sc/local.properties.in
@@ -0,0 +1,2 @@
+# Location of the SDK. This is only used by Ant.
+sdk.dir=@ANDROID_SDK_HOME@