commit edf5b662f3f04768c3fb1b8571ecace6fa82146a
author Anton Hansson <hansson@google.com> Tue Mar 31 18:40:26 2020 +0100
committer Anton Hansson <hansson@google.com> Tue Mar 31 18:40:26 2020 +0100
tree 82473c63b8d85dda209a7e7b01368591828d4810
parent 9f2ea9a0a7b50e8db7a7cfe984349786ef08386b

Compile framework-mediaprovier against the SDK

Linking against the stubs directly bypasses the linktype checks
we have, so compile against the module sdk instead.

Bug: 146757305
Bug: 152864915
Test: m
Change-Id: I9c1a5a626b1585a5bfa1f3167e22d293f6a71044

apex/framework/Android.bp

diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index 8648c72..f5747d5 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -25,11 +25,9 @@
 
     installable: true,
 
-    sdk_version: "core_current",
+    sdk_version: "module_current",
     libs: [
-        // The order matters. android_system_* library should come later.
         "framework_mediaprovider_annotation",
-        "android_system_stubs_current",
         "unsupportedappusage",
     ],