commit 437354181694798af24038dd65455eeab06a329e
author Cody Northrop <cnorthrop@google.com> Wed Feb 08 16:19:05 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 08 16:19:11 2023 +0000
tree 336987e776e1e449aab0bec3374d8e16a5ab625f
parent c9576892d1e1137d392548e00e0a63c18a176d8e

Revert "Reland "EGL: Refactor multifile blobcache""

Revert submission 21292947-reland_blobcache_20230203

Reason for revert: Suspected cause of boot time regression

Reverted changes: /q/submissionid:21292947-reland_blobcache_20230203

Bug: b/266725576
Bug: b/268248090
Change-Id: Ic70ffa65d8d194b00106853d8c05b9cc2992e02d

opengl/libs/Android.bp

diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp
index 49e1cba..750338b 100644
--- a/opengl/libs/Android.bp
+++ b/opengl/libs/Android.bp
@@ -144,7 +144,6 @@
     srcs: [
         "EGL/BlobCache.cpp",
         "EGL/FileBlobCache.cpp",
-        "EGL/MultifileBlobCache.cpp",
     ],
     export_include_dirs: ["EGL"],
 }
@@ -161,6 +160,7 @@
     srcs: [
         "EGL/egl_tls.cpp",
         "EGL/egl_cache.cpp",
+        "EGL/egl_cache_multifile.cpp",
         "EGL/egl_display.cpp",
         "EGL/egl_object.cpp",
         "EGL/egl_layers.cpp",
@@ -205,11 +205,6 @@
     srcs: [
         "EGL/BlobCache.cpp",
         "EGL/BlobCache_test.cpp",
-        "EGL/MultifileBlobCache.cpp",
-        "EGL/MultifileBlobCache_test.cpp",
-    ],
-    shared_libs: [
-        "libutils",
     ],
 }