commit 648ae3a9d321bbca74f6aa9d5167d4f9a8401ded
author Jiyong Park <jiyong@google.com> Sun Dec 08 00:25:15 2019 +0900
committer Jiyong Park <jiyong@google.com> Mon Dec 16 11:31:50 2019 +0900
tree 0a3c4a775eb543319bd50e5dd05066436a811308
parent 8afa4a06377959e24f62587d5fe727e95488006b

Use apex name in apex_manifest.pb as the mount point

When bind-mounting flattened APEX, use the apex name found in
apex_manifest.pb as the mount point, instead of the directory name which
might be different from apex name in case when the apex is overridden.

This allowed us to remove the special casing for the ART apex since we
/system/apex/com.android.art.release will be mounted to
/apex/com.android.art instead of /apex/com.android.art.release.

Bug: N/A
Test: m
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m, device is bootable
Change-Id: Ibdde7002b9078db390e6672b0eb82c474925451d

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 9529617..42d0b33 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -71,6 +71,7 @@
         "libpropertyinfoserializer",
         "libpropertyinfoparser",
         "libsnapshot_init",
+        "lib_apex_manifest_proto_lite",
     ],
     shared_libs: [
         "libbacktrace",