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

Commit 591e121d authored by Hai Zhang's avatar Hai Zhang
Browse files

Add framework-permission-s java_sdk_library. 

This will host the moved framework classes for role.

The class RoleFrameworkPlaceholder is added because the build won't
pass if there isn't any java source.

Bug: 158736025
Test: build
Change-Id: Icabab2cc956d6c7c07a6217256d23a8402960307
parent 1581f4fc

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ filegroup { 
        ":framework-graphics-srcs",

        ":framework-mediaprovider-sources",

        ":framework-permission-sources",

        ":framework-permission-s-sources",

        ":framework-sdkextensions-sources",

        ":framework-statsd-sources",

        ":framework-tethering-srcs",
@@ -417,6 +418,7 @@ java_library { 
        "framework-media.stubs.module_lib",

        "framework-mediaprovider.stubs.module_lib",

        "framework-permission.stubs.module_lib",

        "framework-permission-s.stubs.module_lib",

        "framework-sdkextensions.stubs.module_lib",

        "framework-statsd.stubs.module_lib",

        "framework-tethering.stubs.module_lib",
@@ -435,6 +437,7 @@ java_library { 
        "framework-graphics.impl",

        "framework-mediaprovider.impl",

        "framework-permission.impl",

        "framework-permission-s.impl",

        "framework-sdkextensions.impl",

        "framework-statsd.impl",

        "framework-tethering.impl",

StubLibraries.bp

+3 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ java_library_static { 
        "framework-media.stubs",

        "framework-mediaprovider.stubs",

        "framework-permission.stubs",

        "framework-permission-s.stubs",

        "framework-sdkextensions.stubs",

        "framework-statsd.stubs",

        "framework-tethering.stubs",
@@ -333,6 +334,7 @@ java_library_static { 
        "framework-media.stubs.system",

        "framework-mediaprovider.stubs.system",

        "framework-permission.stubs.system",

        "framework-permission-s.stubs.system",

        "framework-sdkextensions.stubs.system",

        "framework-statsd.stubs.system",

        "framework-tethering.stubs.system",
@@ -370,6 +372,7 @@ java_library_static { 
        "framework-media.stubs.system",

        "framework-mediaprovider.stubs.system",

        "framework-permission.stubs.system",

        "framework-permission-s.stubs.system",

        "framework-sdkextensions.stubs.system",

        "framework-statsd.stubs.system",

        "framework-tethering.stubs.system",

apex/permission/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ apex_defaults { 
    certificate: ":com.android.permission.certificate",

    java_libs: [

        "framework-permission",

        "framework-permission-s",

        "service-permission",

    ],

    apps: ["PermissionController"],

apex/permission/framework-s/Android.bp

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



filegroup {

    name: "framework-permission-s-sources",

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

    ],

    path: "java",

    visibility: ["//frameworks/base"],

}



java_sdk_library {

    name: "framework-permission-s",

    defaults: ["framework-module-defaults"],

    srcs: [

        ":framework-permission-s-sources",

    ],

    apex_available: [

        "com.android.permission",

        "test_com.android.permission",

    ],

    hostdex: true,

    // Restrict access to implementation library.

    impl_library_visibility: ["//frameworks/base/apex/permission:__subpackages__"],

    installable: true,

    min_sdk_version: "30",

    permitted_packages: [

        "android.permission",

        "android.app.role",

    ],

}

apex/permission/framework-s/api/current.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
// Signature format: 2.0