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

Commit 56dea3a7 authored by atrost's avatar atrost
Browse files

resolve merge conflicts of 8e8c40b5 to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3ee4dce9639f9b66a44828f28c1fa7cd645dfe5
parents fce6ba29 8e8c40b5

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -425,6 +425,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: [
@@ -463,6 +464,7 @@ java_library { 
    defaults: ["framework-defaults"],

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

    installable: false,

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

    plugins: [

        "unsupportedappusage-annotation-processor",

        "compat-changeid-annotation-processor",
@@ -502,6 +504,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
@@ -91,6 +91,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,6 +4,7 @@ java_library_static { 


    libs: [

        "services.core",

        "app-compat-annotations",

    ],



    plugins: [

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",