summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2019-02-12 20:11:51 -0800
committer android-build-merger <android-build-merger@google.com> 2019-02-12 20:11:51 -0800
commitaf3cdce9287dec12d2424cd0c42821fbd64ee4ee (patch)
tree1eacd05b0d530501ee7a33ccd4d5fb6471ff4342
parent4ddcd60b8411554b13c204414ece01b4f2b30108 (diff)
parent3e40cac16a6b8346445b9d6bce9ffb34122fcbb0 (diff)
Merge changes from topic "cut_dependency" am: 661bb0414e
am: 3e40cac16a Change-Id: I82a66665741eae62a9edbd956464c7ee070f4950
-rw-r--r--cmds/bootanimation/bootanim.rc1
-rw-r--r--core/jni/Android.bp4
2 files changed, 2 insertions, 3 deletions
diff --git a/cmds/bootanimation/bootanim.rc b/cmds/bootanimation/bootanim.rc
index 1b3c32b20503..469c9646a4aa 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
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index c81a77d4c16e..08a5789743cc 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",