[Scummvm-cvs-logs] scummvm master -> 2648062dcfa4cfa4177fccabd215d31d5232f595

[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:
2648062dcf ANDROID: Fix compilation.


Commit: 2648062dcfa4cfa4177fccabd215d31d5232f595
    https://github.com/scummvm/scummvm/commit/2648062dcfa4cfa4177fccabd215d31d5232f595
Author: D G Turner (digitall at scummvm.org)
Date: 2013-10-08T22:53:53-07:00

Commit Message:
ANDROID: Fix compilation.

The aapt throws an "invalid resource directory name" if the
resource directory name is not known to the tools. Unfortunately,
"values-television" is an OUYA specific addition and thus breaks
with the standard vanilla Android toolchain.

Changed paths:
    backends/platform/android/android.mk



diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index b0df5e7..15088ee 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -25,10 +25,13 @@ PATH_RESOURCES = $(PATH_DIST)/res
 
 PORT_DISTFILES = $(PATH_DIST)/README.Android
 
+# FIXME: OUYA specific.
+#        "values-television" not present in vanilla Android.
+# $(PATH_RESOURCES)/values-television/margins.xml \
+
 RESOURCES = \
 	$(PATH_RESOURCES)/values/strings.xml \
 	$(PATH_RESOURCES)/values/margins.xml \
-	$(PATH_RESOURCES)/values-television/margins.xml \
 	$(PATH_RESOURCES)/layout/main.xml \
 	$(PATH_RESOURCES)/layout/splash.xml \
 	$(PATH_RESOURCES)/drawable/gradient.xml \