diff options
| author | Dongwon Kang <dwkang@google.com> | 2019-01-17 13:35:03 -0800 |
|---|---|---|
| committer | Dongwon Kang <dwkang@google.com> | 2019-01-17 13:35:03 -0800 |
| commit | 0d035539c217dc319dc0611d17f30cc157c2836a (patch) | |
| tree | a5a713294be6009bc46102d96d9178d1262a2a0f | |
| parent | 8afd5319b00c6a9e9bd3630a31ac302cc2730fbc (diff) | |
Include updatable-media.jar in bootclasspath & apex
Test: build & boot & MediaPlayer2Test
Bug: 112766913
Change-Id: I66e0b5f9e12f14b1758c0281caac0dfdfe0b5729
| -rw-r--r-- | core/jni/fd_utils.cpp | 1 | ||||
| -rw-r--r-- | media/Android.bp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp index 41e00b9461c8..d60d1a637962 100644 --- a/core/jni/fd_utils.cpp +++ b/core/jni/fd_utils.cpp @@ -34,6 +34,7 @@ // Static whitelist of open paths that the zygote is allowed to keep open. static const char* kPathWhitelist[] = { "/apex/com.android.conscrypt/javalib/conscrypt.jar", + "/apex/com.android.media/javalib/updatable-media.jar", "/dev/null", "/dev/socket/zygote", "/dev/socket/zygote_secondary", diff --git a/media/Android.bp b/media/Android.bp index 0c4ce0e41883..0eb86acf9ecf 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -16,7 +16,6 @@ filegroup { } java_library { - // TODO: include updatable-media.jar in the media apex and add it to the bootclasspath. name: "updatable-media", srcs: [ |