Merge "Merge changes from topic "cut_dependency" am: 661bb0414e am: 3e40cac16a am: af3cdce928"

2019-02-13 04:51:14 +00:00
parent 509bb13166 53a5cf55bd
commit cfb8babfa8
2 changed files with 2 additions and 3 deletions
--- 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
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -287,8 +287,8 @@ cc_library_shared {
        "libsoundtrigger",
        "libminikin",
        "libprocessgroup",
-        "libnativebridge",
-        "libnativeloader",
+        "libnativebridge_lazy",
+        "libnativeloader_lazy",
        "libmemunreachable",
        "libhidlbase",
        "libhidltransport",