commit a06eac491cf9dc1b99c091aca8935db8c959764d
author David Anderson <dvander@google.com> Wed May 05 22:22:33 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 05 22:22:33 2021 +0000
tree d9da912cc1694798cf1f081ec9cc479fe2d2c35d
parent 7b5e682da17148e6dfe02ad963ba69bc1c6e0eb0
parent 1de6c16ad72aade9edcac403a31ac7eb2426be76

Merge "Ensure vts_libsnapshot_test will pass after being interrupted."

rootdir/etc/linker.config.json

diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json
index a22ef6f..6b03a1d 100644
--- a/rootdir/etc/linker.config.json
+++ b/rootdir/etc/linker.config.json
@@ -1,13 +1,14 @@
 {
   "requireLibs": [
+    "libandroidicu.so",
     "libdexfile.so",
     "libdexfiled.so",
+    "libicu.so",
+    "libjdwp.so",
     "libnativebridge.so",
     "libnativehelper.so",
     "libnativeloader.so",
     "libsigchain.so",
-    "libandroidicu.so",
-    "libicu.so",
     // TODO(b/122876336): Remove libpac.so once it's migrated to Webview
     "libpac.so",
     // TODO(b/120786417 or b/134659294): libicuuc.so

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 4ec5d33..1013d41 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -692,7 +692,7 @@
     mkdir /data/apex 0755 root system encryption=None
     mkdir /data/apex/active 0755 root system
     mkdir /data/apex/backup 0700 root system
-    mkdir /data/apex/decompressed 0700 root system encryption=Require
+    mkdir /data/apex/decompressed 0755 root system encryption=Require
     mkdir /data/apex/hashtree 0700 root system
     mkdir /data/apex/sessions 0700 root system
     mkdir /data/app-staging 0751 system system encryption=DeleteIfNecessary