diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c index a1db67a5845..ab36aa49266 100644 --- a/src/compiler/glsl/tests/cache_test.c +++ b/src/compiler/glsl/tests/cache_test.c @@ -204,6 +204,13 @@ test_disk_cache_create(void) disk_cache_destroy(cache); +#ifdef ANDROID + /* Android doesn't try writing to disk (just calls the cache callbacks), so + * the directory tests below don't apply. + */ + exit(error ? 1 : 0); +#endif + /* Test with XDG_CACHE_HOME set */ setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); cache = disk_cache_create("test", "make_check", 0); diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c index 9953de62819..e1eee29839f 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c @@ -95,6 +95,14 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Assume failure. */ cache->path_init_failed = true; +#ifdef ANDROID + /* Android needs the "disk cache" to be enabled for + * EGL_ANDROID_blob_cache's callbacks to be called, but it doesn't actually + * want any storing to disk to happen inside of the driver. + */ + goto path_fail; +#endif + char *path = disk_cache_generate_cache_dir(local); if (!path) goto path_fail;