diff options
| author | D G Turner | 2013-10-09 23:26:58 +0100 |
|---|---|---|
| committer | D G Turner | 2013-10-09 23:26:58 +0100 |
| commit | 51cb75572667b5a4e6c96fcb8741fedf12bb6056 (patch) | |
| tree | deea6313846b6ad1e88443bc1df2df562528b72e | |
| parent | 2271bf404cd4c66c4087478746c36d1c47d5e9fe (diff) | |
| download | scummvm-rg350-51cb75572667b5a4e6c96fcb8741fedf12bb6056.tar.gz scummvm-rg350-51cb75572667b5a4e6c96fcb8741fedf12bb6056.tar.bz2 scummvm-rg350-51cb75572667b5a4e6c96fcb8741fedf12bb6056.zip | |
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.
| -rw-r--r-- | backends/platform/android/android.mk | 2 | ||||
| -rw-r--r-- | dists/android/res-ouya/values-television/margins.xml (renamed from dists/android/res/values-television/margins.xml) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index 15088ee185..915bf8ac60 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/values-television/margins.xml b/dists/android/res-ouya/values-television/margins.xml index df586eea34..df586eea34 100644 --- a/dists/android/res/values-television/margins.xml +++ b/dists/android/res-ouya/values-television/margins.xml |