Skip to content

Commit 73e686e

Browse files
cnorthropAndroid (Google) Code Review
authored andcommitted
Merge changes from topic "multifile_blobcache_advanced_usage" into main
* changes: EGL Multifile Blobcache: Remove entries when valueSize is zero EGL Multifile Blobcache: Handle lost cache EGL Multifile Blobcache: Fix applyLRU EGL Multifile Blobcache: Clean up key reuse EGL: Add flag for bugfixes found via advanced blobcache usage
2 parents 73928ff + 96fa0e7 commit 73e686e

7 files changed

Lines changed: 673 additions & 40 deletions

File tree

opengl/libs/Android.bp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ ndk_library {
6363
unversioned_until: "current",
6464
}
6565

66+
aconfig_declarations {
67+
name: "egl_flags",
68+
package: "com.android.graphics.egl.flags",
69+
container: "system",
70+
srcs: ["EGL/egl_flags.aconfig"],
71+
}
72+
73+
cc_aconfig_library {
74+
name: "libegl_flags",
75+
aconfig_declarations: "egl_flags",
76+
}
77+
6678
cc_defaults {
6779
name: "gl_libs_defaults",
6880
cflags: [
@@ -136,6 +148,7 @@ cc_library_static {
136148
],
137149
export_include_dirs: ["EGL"],
138150
shared_libs: [
151+
"libegl_flags",
139152
"libz",
140153
],
141154
}
@@ -166,6 +179,7 @@ cc_library_shared {
166179
"android.hardware.configstore@1.0",
167180
"android.hardware.configstore-utils",
168181
"libbase",
182+
"libegl_flags",
169183
"libhidlbase",
170184
"libnativebridge_lazy",
171185
"libnativeloader_lazy",
@@ -202,6 +216,7 @@ cc_test {
202216
"EGL/MultifileBlobCache_test.cpp",
203217
],
204218
shared_libs: [
219+
"libegl_flags",
205220
"libutils",
206221
"libz",
207222
],

0 commit comments

Comments
 (0)