Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ff5ad9a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 5dbf94cb 291318d5

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -744,7 +744,6 @@ java_defaults { 
        "apex_aidl_interface-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",

media/Android.bp

+11 −2
Original line number Diff line number Diff line
@@ -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,

}

media/apex/java/android/media/MediaPlayer2.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

media/proto/jarjar-rules.txt

+1 −1
Original line number Diff line number Diff line 
rule com.google.protobuf.** com.android.framework.protobuf.@1

rule com.google.protobuf.** com.android.media.protobuf.@1