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

Commit b2cf181a authored by Andrei Onea's avatar Andrei Onea Committed by Andrei-Valentin Onea
Browse files

Add genrules for merged system server stubs 

This is a change analogous to https://r.android.com/1432681 for system
server stubs; it feeds into metalava the stubs for the non-updatable
system server api stubs and the individual mainline module system server
stubs to generate a merged .txt file that will eventually replace the
monolithic one in frameworks/base/services/api/current.txt .

Bug: 177640454
Test: diff frameworks/base/services/api/current.txt \
out/soong/.intermediates/frameworks/base/api/services-system-server-current.txt/gen/system-server-current.txt

Change-Id: I021f59bb91572d28798a97ab8aa687b684599d6c
parent 359eca32

api/Android.bp

+46 −0
Original line number Diff line number Diff line
@@ -312,3 +312,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",

        },

    ],

}

services/api/Android.bp

0 → 100644
+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