summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2019-02-12 19:09:08 -0800
committer android-build-merger <android-build-merger@google.com> 2019-02-12 19:09:08 -0800
commit3e40cac16a6b8346445b9d6bce9ffb34122fcbb0 (patch)
treedc61aab65ddb8b34648a5a3c11d8dac73f48784b
parent3699ba8e9f3171ce7e1a6905fe69d2e437b25b0c (diff)
parent661bb0414e635122117b1d554f59b9464ad90a6d (diff)
Merge changes from topic "cut_dependency"
am: 661bb0414e Change-Id: Id8b72d00604e9b1761068d89b3bfd05e48d9a0a1
-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",