Remove duplicated classes with framework.jar from updatable-media.jar
Bug: 111107855
Test: Sucessfully build with aosp/884112
Change-Id: Ic3c93ab395ccfae6150297bf6447043f928a01c5
diff --git a/Android.bp b/Android.bp
index 0848d2b..fd3a78b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -744,7 +744,6 @@
"networkstack-aidl-interfaces-java",
"framework-protos",
"game-driver-protos",
- "mediaplayer2-protos",
"android.hidl.base-V1.0-java",
"android.hardware.cas-V1.1-java",
"android.hardware.cas-V1.0-java",
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,
+}
diff --git a/media/apex/java/android/media/MediaPlayer2.java b/media/apex/java/android/media/MediaPlayer2.java
index c38a831..89a9540 100644
--- a/media/apex/java/android/media/MediaPlayer2.java
+++ b/media/apex/java/android/media/MediaPlayer2.java
@@ -45,8 +45,8 @@
import android.view.Surface;
import android.view.SurfaceHolder;
-import com.android.framework.protobuf.InvalidProtocolBufferException;
import com.android.internal.annotations.GuardedBy;
+import com.android.media.protobuf.InvalidProtocolBufferException;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/media/proto/jarjar-rules.txt b/media/proto/jarjar-rules.txt
index 7be6e73..bfb0b27 100644
--- a/media/proto/jarjar-rules.txt
+++ b/media/proto/jarjar-rules.txt
@@ -1,2 +1,2 @@
-rule com.google.protobuf.** com.android.framework.protobuf.@1
+rule com.google.protobuf.** com.android.media.protobuf.@1