[Scummvm-cvs-logs] scummvm master -> 51cb75572667b5a4e6c96fcb8741fedf12bb6056

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
51cb755726 ANDROID: Really fix compilation.


Commit: 51cb75572667b5a4e6c96fcb8741fedf12bb6056
    https://github.com/scummvm/scummvm/commit/51cb75572667b5a4e6c96fcb8741fedf12bb6056
Author: D G Turner (digitall at scummvm.org)
Date: 2013-10-09T15:26:58-07:00

Commit Message:
ANDROID: Really fix compilation.

The vanilla android toolchain even is unhappy when unknown folders are
present in the resources directory, so have moved the ouya specific
resources out to another directory.

Changed paths:
  A dists/android/res-ouya/values-television/margins.xml
  R dists/android/res/values-television/margins.xml
    backends/platform/android/android.mk



diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 15088ee..915bf8a 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -27,7 +27,7 @@ PORT_DISTFILES = $(PATH_DIST)/README.Android
 
 # FIXME: OUYA specific.
 #        "values-television" not present in vanilla Android.
-# $(PATH_RESOURCES)/values-television/margins.xml \
+# $(PATH_RESOURCES)/../res-ouya/values-television/margins.xml \
 
 RESOURCES = \
 	$(PATH_RESOURCES)/values/strings.xml \
diff --git a/dists/android/res-ouya/values-television/margins.xml b/dists/android/res-ouya/values-television/margins.xml
new file mode 100644
index 0000000..df586ee
--- /dev/null
+++ b/dists/android/res-ouya/values-television/margins.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="verticalMargin">45px</dimen>
+	<dimen name="horizontalMargin">80px</dimen>
+</resources>
diff --git a/dists/android/res/values-television/margins.xml b/dists/android/res/values-television/margins.xml
deleted file mode 100644
index df586ee..0000000
--- a/dists/android/res/values-television/margins.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<dimen name="verticalMargin">45px</dimen>
-	<dimen name="horizontalMargin">80px</dimen>
-</resources>