From 83207a29e1362c86271726018993bef756722f9f Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 29 Jan 2019 00:39:04 +0900
Subject: [PATCH 1/2] Cut the static deps from libandroid_runtime to
 libnativeloader and libnativebridge

The dependencies are replaced with *_lazy libraries which dynamically
load and links to the real libraries at runtime using dlopen and dlsym.

This allows libandroid_runtime to be used by early processes that are executed
before the activation of the runtime APEX where libnativeloader and
libnativebridge are provided.

Bug: 123403798
Test: m
Test: device boots to the UI
Change-Id: I89a11bd0e9bef77db5da6d80840728b9a6f2a528
---
 core/jni/Android.bp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index c81a77d4c16e3..08a5789743cc0 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -278,8 +278,8 @@ cc_library_shared {
         "libsoundtrigger",
         "libminikin",
         "libprocessgroup",
-        "libnativebridge",
-        "libnativeloader",
+        "libnativebridge_lazy",
+        "libnativeloader_lazy",
         "libmemunreachable",
         "libhidlbase",
         "libhidltransport",

From 706bf3f6282644d0d536b88a1156fbf6c49d71d3 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 29 Jan 2019 00:44:19 +0900
Subject: [PATCH 2/2] Revert "Delay start of bootanimation until after the
 Runtime APEX is mounted."

This reverts commit d848183572d7c347937b871e9d341e0938d8764b.

Reason: the static deps to libnativeloader and libnativebridge no longer
exist

Bug: 123403798
Test: Device boots to the UI
Test: bootanimation is shown from the very beginning

Change-Id: I1a3f214b1d9a19520998c7d1f2d288465a831892
---
 cmds/bootanimation/bootanim.rc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmds/bootanimation/bootanim.rc b/cmds/bootanimation/bootanim.rc
index 1b3c32b205035..469c9646a4aa8 100644
--- a/cmds/bootanimation/bootanim.rc
+++ b/cmds/bootanimation/bootanim.rc
@@ -2,7 +2,6 @@ service bootanim /system/bin/bootanimation
     class core animation
     user graphics
     group graphics audio
-    updatable
     disabled
     oneshot
     writepid /dev/stune/top-app/tasks