EGL BlobCache: Disable multifile to address Wembley perf

Need to investigate multifile performance on Wembley, which does
not use SkiaVk.  That means many small/simple GL programs are taking
longer to start.  Accessing the filesystem is taking longer than a
quick return from a sub 1MB cache.

Test: Build and inspect cache locally
Test: /data/nativetest64/EGL_test/EGL_test
Bug: b/263574392
Change-Id: Iacc725f902fd91c7cbd06b293ec96f5ab5eeb1c3

2 files changed, 4 insertions, 3 deletions

diff --git a/opengl/libs/EGL/egl_cache.cpp b/opengl/libs/EGL/egl_cache.cpp
index 55979444ee..1e8a34863d 100644
--- a/opengl/libs/EGL/egl_cache.cpp
+++ b/opengl/libs/EGL/egl_cache.cpp
@@ -69,7 +69,7 @@ static EGLsizeiANDROID getBlob(const void* key, EGLsizeiANDROID keySize, void* v
 //
 egl_cache_t::egl_cache_t()
       : mInitialized(false),
-        mMultifileMode(true),
+        mMultifileMode(false),
         mCacheByteLimit(maxTotalSize),
         mMultifileCleanupPending(false) {}
 
@@ -114,8 +114,6 @@ void egl_cache_t::initialize(egl_display_t* display) {
         }
     }
 
-    mMultifileMode = true;
-
     // Allow forcing monolithic cache for debug purposes
     if (base::GetProperty("debug.egl.blobcache.multifilemode", "") == "false") {
         ALOGD("Forcing monolithic cache due to debug.egl.blobcache.multifilemode == \"false\"");
diff --git a/opengl/tests/EGLTest/egl_cache_test.cpp b/opengl/tests/EGLTest/egl_cache_test.cpp
index c4fa65f044..265bec492e 100644
--- a/opengl/tests/EGLTest/egl_cache_test.cpp
+++ b/opengl/tests/EGLTest/egl_cache_test.cpp
@@ -134,6 +134,9 @@ std::string EGLCacheTest::getCachefileName() {
 }
 
 TEST_F(EGLCacheTest, ModifiedCacheMisses) {
+    // Turn this back on if multifile becomes the default
+    GTEST_SKIP() << "Skipping test designed for multifile, see b/263574392 and b/246966894";
+
     uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee };
     mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));