diff options
| author | Insun Kang <insun@google.com> | 2019-01-30 17:28:47 +0900 |
|---|---|---|
| committer | Insun Kang <insun@google.com> | 2019-02-13 11:52:46 +0900 |
| commit | 291318d5f455cc3d03ec7eb3ce061ba24dabe9b2 (patch) | |
| tree | 5fc5f83f6000e2c4129e584e48e0196b0bb01032 | |
| parent | 2134893486e8ff63542d174d861c09e264f91d9e (diff) | |
Remove duplicated classes with framework.jar from updatable-media.jar
Bug: 111107855
Test: Sucessfully build with aosp/884112
Change-Id: Ic3c93ab395ccfae6150297bf6447043f928a01c5
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | media/Android.bp | 13 | ||||
| -rw-r--r-- | media/apex/java/android/media/MediaPlayer2.java | 2 | ||||
| -rw-r--r-- | media/proto/jarjar-rules.txt | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 0848d2b7668e..fd3a78b74c79 100644 --- a/Android.bp +++ b/Android.bp @@ -744,7 +744,6 @@ java_defaults { "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 141d415cbaf3..86dc509501a4 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -3,7 +3,6 @@ java_library { srcs: [ ":updatable-media-srcs", - ":framework-media-annotation-srcs", ], aidl: { @@ -28,7 +27,12 @@ java_library { 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 @@ java_library { 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 c38a83131a6c..89a954061958 100644 --- a/media/apex/java/android/media/MediaPlayer2.java +++ b/media/apex/java/android/media/MediaPlayer2.java @@ -45,8 +45,8 @@ import android.util.Size; 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 7be6e732d3fd..bfb0b2782486 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 |