diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2019-12-18 14:06:48 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@google.com> | 2019-12-19 22:16:00 +0000 |
| commit | 40182833f712666dad3f5405e61a28d856af5b84 (patch) | |
| tree | 75b35a7b5c515778ad0ce4d019ce0d9acd90d7f3 /core/jni/fd_utils.cpp | |
| parent | 8cb0e1cfb7e21c74d7511d9c99530a837142d3e4 (diff) | |
Move MediaStore.java inside APEX boundary.
Recent work has paved the way to get MediaStore.java building against
"core_platform", and this change is actually shifting MediaStore.java
inside the MediaProvider APEX boundary.
This involves defining a new "updatable-mediaprovider" library JAR
and ensuring that it's spliced into classpaths where needed to keep
everything building and working.
Note that the MediaProvider APK itself is still bundled, so we're
manually including the MediaStore.java when building that APK so that
we can continue referencing @hide symbols, but there's a STOPSHIP
comment to remove that once we get the APK building against
"system_current".
Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I27ed3fde40751d9ac136a31710c62004b1b8962f
Diffstat (limited to 'core/jni/fd_utils.cpp')
| -rw-r--r-- | core/jni/fd_utils.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp index a46ad6d6a35f..738965eda574 100644 --- a/core/jni/fd_utils.cpp +++ b/core/jni/fd_utils.cpp @@ -37,6 +37,7 @@ static const char* kPathWhitelist[] = { "/apex/com.android.conscrypt/javalib/conscrypt.jar", "/apex/com.android.ipsec/javalib/ike.jar", "/apex/com.android.media/javalib/updatable-media.jar", + "/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar", "/apex/com.android.os.statsd/javalib/framework-statsd.jar", "/apex/com.android.sdkext/javalib/framework-sdkext.jar", "/apex/com.android.telephony/javalib/telephony-common.jar", |