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

Commit d39d82be authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Add genrules for merged system server stubs" am: f91d4e49 am:...

Merge "Add genrules for merged system server stubs" am: f91d4e49 am: f86b2497 am: 8e7cddee am: c8609a5a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42373fce4fcd60057a90a7227417264be2c2ac11
parents a22d9d39 c8609a5a
Loading
Loading
Loading
Loading
+46 −0
Original line number Diff line number Diff line
@@ -347,3 +347,49 @@ genrule {
    out: ["combined-removed-dex.txt"],
    cmd: "$(location gen_combined_removed_dex.sh) $(location metalava) $(genDir) $(in) > $(out)",
}

genrule {
    name: "services-system-server-current.txt",
    srcs: [
        ":service-permission{.system-server.api.txt}",
        ":non-updatable-system-server-current.txt",
    ],
    out: ["system-server-current.txt"],
    tools: ["metalava"],
    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
    dists: [
        {
            targets: ["droidcore"],
            dir: "api",
            dest: "system-server-current.txt",
        },
        {
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/system-server/api",
            dest: "merge-android.txt",
        },
    ],
}

genrule {
    name: "services-system-server-removed.txt",
    srcs: [
        ":service-permission{.system-server.removed-api.txt}",
        ":non-updatable-system-server-removed.txt",
    ],
    out: ["system-server-removed.txt"],
    tools: ["metalava"],
    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
    dists: [
        {
            targets: ["droidcore"],
            dir: "api",
            dest: "system-server-removed.txt",
        },
        {
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/system-server/api",
            dest: "merge-removed.txt",
        },
    ],
}
+29 −0
Original line number Diff line number Diff line
// Copyright (C) 2021 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package {
    default_visibility: ["//visibility:private"],
}

filegroup {
    name: "non-updatable-system-server-current.txt",
    srcs: ["non-updatable-current.txt"],
    visibility: ["//frameworks/base/api"],
}

filegroup {
    name: "non-updatable-system-server-removed.txt",
    srcs: ["non-updatable-removed.txt"],
    visibility: ["//frameworks/base/api"],
}
 No newline at end of file