Merge "frameworks: updates to use new aconfig storage read api and add storage files into allow list so these files can be accessed." into main
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index 8e4addd..0eb7c4a 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -49,6 +49,9 @@
"/dev/dri/renderD129", // Fixes b/31172436
"/dev/stune/foreground/tasks",
"/dev/blkio/tasks",
+ "/metadata/aconfig/maps/system.package.map",
+ "/metadata/aconfig/maps/system.flag.map",
+ "/metadata/aconfig/boot/system.val"
};
static const char kFdPath[] = "/proc/self/fd";
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 7c1c5b4..341599e 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -115,6 +115,7 @@
"libharfbuzz_ng",
"libminikin",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc"
],
static_libs: [
