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

Commit 82acf8b6 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Switch to new incompatibilities targets" am: b5b62960 am: d258bf95 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If764610f4ac9f30a30e6968b7cd9b5e4936a68bd
parents 8e84f29c d258bf95

StubLibraries.bp

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ droidstubs { 
        last_released: {

            api_file: ":android-non-updatable.api.public.latest",

            removed_api_file: ":android-non-updatable-removed.api.public.latest",

            baseline_file: ":public-api-incompatibilities-with-last-released",

            baseline_file: ":android-incompatibilities.api.public.latest",

        },

        api_lint: {

            enabled: true,
@@ -165,7 +165,7 @@ droidstubs { 
        last_released: {

            api_file: ":android-non-updatable.api.system.latest",

            removed_api_file: ":android-non-updatable-removed.api.system.latest",

            baseline_file: ":system-api-incompatibilities-with-last-released"

            baseline_file: ":android-incompatibilities.api.system.latest"

        },

        api_lint: {

            enabled: true,

services/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ droidstubs { 
        last_released: {

            api_file: ":android.api.system-server.latest",

            removed_api_file: ":removed.api.system-server.latest",

            baseline_file: ":system-server-api-incompatibilities-with-last-released"

            baseline_file: ":android-incompatibilities.api.system-server.latest"

        },

        api_lint: {

            enabled: true,