aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorMarcus Comstedt2014-07-01 22:14:26 +0200
committerMarcus Comstedt2014-07-01 22:14:57 +0200
commit0adb9e7d9b5b0045d16c38c750b9253f980d0258 (patch)
treeb27809150c120262be2aeac4770d7137abe450a8 /backends/platform
parentd1157af89be708b5c5a3a14f57e29df70ea80da0 (diff)
downloadscummvm-rg350-0adb9e7d9b5b0045d16c38c750b9253f980d0258.tar.gz
scummvm-rg350-0adb9e7d9b5b0045d16c38c750b9253f980d0258.tar.bz2
scummvm-rg350-0adb9e7d9b5b0045d16c38c750b9253f980d0258.zip
ANDROID: Reinstate overscan margin resource for OUYA/GoogleTV
This reverts commits 51cb7557 and 2648062d. Please note that Android SDK Platform Tools r06 or later is needed to build ScummVM.
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/android/android.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 1a40299dcd..69aa9d8303 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -26,13 +26,10 @@ PATH_RESOURCES = $(PATH_DIST)/res
PORT_DISTFILES = $(PATH_DIST)/README.Android
-# FIXME: OUYA specific.
-# "values-television" not present in vanilla Android.
-# $(PATH_RESOURCES)/../res-ouya/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 \