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

Commit acac2c91 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge changes Iea1d2ae2,I1d3c8e48 am: d708ea7b am: ebde74e7 am: fd4c08b6 

am: 4de7f5ea

Change-Id: Icf780d431f0dd596eee4d07ed26f33f5e0819ed9
parents 0b5b9a46 4de7f5ea

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -899,8 +899,10 @@ metalava_framework_docs_args += " --replace-documentation " + 


packages_to_document = [

    "android",

    "dalvik",

    "java",

    "javax",

    "junit",

    "org.apache.http",

    "org.json",

    "org.w3c.dom",

location/lib/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 


java_sdk_library {

    name: "com.android.location.provider",

    srcs: [

        "java/**/*.java",

        ":framework-all-sources",

    srcs: ["java/**/*.java"],

    api_srcs: [":framework-all-sources"],

    libs: [

        "androidx.annotation_annotation",

        "framework-all",

    ],

    libs: [

        "androidx.annotation_annotation",

media/lib/signer/Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ 


java_sdk_library {

    name: "com.android.mediadrm.signer",

    srcs: [

        "java/**/*.java",

        ":framework-all-sources",

    ],

    srcs: ["java/**/*.java"],

    api_srcs: [":framework-all-sources"],

    libs: ["framework-all"],

    api_packages: ["com.android.mediadrm.signer"],

}

test-mock/Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -19,10 +19,9 @@ 
java_sdk_library {

    name: "android.test.mock",



    srcs: [

        "src/**/*.java",

        ":framework-all-sources",

    ],

    srcs: ["src/**/*.java"],

    api_srcs: [":framework-all-sources"],

    libs: ["framework-all"],



    api_packages: [

        "android.test.mock",