commit 291318d5f455cc3d03ec7eb3ce061ba24dabe9b2
author Insun Kang <insun@google.com> Wed Jan 30 17:28:47 2019 +0900
committer Insun Kang <insun@google.com> Wed Feb 13 11:52:46 2019 +0900
tree 5fc5f83f6000e2c4129e584e48e0196b0bb01032
parent 2134893486e8ff63542d174d861c09e264f91d9e

Remove duplicated classes with framework.jar from updatable-media.jar

Bug: 111107855
Test: Sucessfully build with aosp/884112
Change-Id: Ic3c93ab395ccfae6150297bf6447043f928a01c5

media/Android.bp

diff --git a/media/Android.bp b/media/Android.bp
index 141d415c..86dc509 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -3,7 +3,6 @@
 
     srcs: [
         ":updatable-media-srcs",
-        ":framework-media-annotation-srcs",
     ],
 
     aidl: {
@@ -28,7 +27,12 @@
     installable: true,
 
     // Make sure that the implementaion only relies on SDK or system APIs.
-    sdk_version: "system_current",
+    no_framework_libs: true,
+    libs: [
+        // The order matters. android_system_* library should come later.
+        "framework_media_annotation",
+        "android_system_stubs_current",
+    ],
 }
 
 filegroup {
@@ -125,3 +129,8 @@
     sdk_version: "28",
 }
 
+java_library {
+    name: "framework_media_annotation",
+    srcs: [":framework-media-annotation-srcs"],
+    installable: false,
+}