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

Commit b4852382 authored by Anna Trostanetski's avatar Anna Trostanetski Committed by Gerrit Code Review
Browse files

Merge "Move android.compat.annotation package out of libcore"

parents 6d5457bb 1a945504

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ java_library { 
    name: "framework-minus-apex",

    defaults: ["framework-defaults"],

    srcs: [":framework-non-updatable-sources"],

    libs: ["app-compat-annotations"],

    installable: true,

    javac_shard_size: 150,

    required: [
@@ -454,12 +455,14 @@ java_library { 
    defaults: ["framework-defaults"],

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

    installable: false,

    libs: ["app-compat-annotations"],

}



java_library {

    name: "framework-annotation-proc",

    defaults: ["framework-defaults"],

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

    libs: ["app-compat-annotations"],

    installable: false,

    plugins: [

        "unsupportedappusage-annotation-processor",
@@ -500,6 +503,7 @@ java_library { 
java_library {

    name: "framework-atb-backward-compatibility",

    installable: true,

    libs: ["app-compat-annotations"],

    srcs: [

        "core/java/android/content/pm/AndroidTestBaseUpdater.java",

    ],

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ java_library_static { 
        "android.hardware.light-V2.0-java",

        "android.hardware.power-V1.0-java",

        "android.hardware.tv.cec-V1.0-java",

        "app-compat-annotations",

    ],



    required: [

services/devicepolicy/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ java_library_static { 


    libs: [

        "services.core",

        "app-compat-annotations",

    ],

}

test-mock/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ java_sdk_library { 
        ":framework-core-sources-for-test-mock",

        ":framework_native_aidl",

    ],

    libs: ["framework-all"],

    libs: [

        "framework-all",

        "app-compat-annotations",

    ],



    api_packages: [

        "android.test.mock",