From 0a0252c299731cea9535db2431ad90b1a74a3fb8 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Tue, 5 May 2020 16:05:01 +0100
Subject: [PATCH] "Move ICU into i18n APEX" Attempt 2

This reverts commit bc6062afc0052170a6225fd65a5d67aa6b92def8.
Reland https://r.android.com/1283938

Bug: 138994281
Test: device boots
Change-Id: Iad4df3651d82a806151f64655f7d623851ce40a3
---
 core/jni/fd_utils.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index ca4735ec665a8..5d71554211984 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -35,6 +35,7 @@
 static const char* kPathWhitelist[] = {
         "/apex/com.android.conscrypt/javalib/conscrypt.jar",
         "/apex/com.android.ipsec/javalib/ike.jar",
+        "/apex/com.android.i18n/javalib/core-icu4j.jar",
         "/apex/com.android.media/javalib/updatable-media.jar",
         "/apex/com.android.sdkext/javalib/framework-sdkextensions.jar",
         "/apex/com.android.tethering/javalib/framework-tethering.jar",