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

Commit 82a6227f authored by Hai Zhang's avatar Hai Zhang
Browse files

Allow adding framework and service java code into permission APEX. 

Along with two empty classes to make build happy.

Bug: 136503238
Test: presubmit
Change-Id: Ib706a7ac4d09374ce220961f9439f712a38f7c0c
parent 270d5225

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ filegroup { 
        ":framework-tethering-srcs",

        ":updatable-media-srcs",

        ":framework-mediaprovider-sources",

        ":framework-permission-sources",

        ":framework-wifi-updatable-sources",

        ":ike-srcs",

    ]
@@ -440,6 +441,7 @@ java_library { 
        "framework-appsearch-stubs",

        // TODO(b/146167933): Use framework-statsd-stubs

        "framework-statsd",

        "framework-permission-stubs",

        "framework-wifi-stubs",

        "ike-stubs",

    ],
@@ -465,6 +467,7 @@ java_library { 
        "//frameworks/base/apex/appsearch/framework",

        "//frameworks/base/apex/blobstore/framework",

        "//frameworks/base/apex/jobscheduler/framework",

        "//frameworks/base/apex/permission/framework",

        "//frameworks/base/apex/statsd/service",

        "//frameworks/base/wifi",

        "//frameworks/opt/net/wifi/service",
@@ -489,6 +492,7 @@ java_library { 
        "updatable_media_stubs",

        "framework_mediaprovider_stubs",

        "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs

        "framework-permission-stubs",

        "framework-sdkextensions-stubs-systemapi",

        // TODO(b/146167933): Use framework-statsd-stubs instead.

        "framework-statsd",

apex/permission/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ apex_defaults { 
    name: "com.android.permission-defaults",

    key: "com.android.permission.key",

    certificate: ":com.android.permission.certificate",

    java_libs: [

        "framework-permission",

        "service-permission",

    ],

    apps: ["PermissionController"],

}

apex/permission/framework/Android.bp

0 → 100644
+60 −0
Original line number Diff line number Diff line 
// Copyright (C) 2020 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-sources",

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

    ],

    path: "java",

}



java_library {

    name: "framework-permission",

    srcs: [

        ":framework-permission-sources",

    ],

    sdk_version: "system_current",

    apex_available: [

        "com.android.permission",

        "test_com.android.permission",

    ],

    hostdex: true,

    installable: true,

    visibility: [

        "//frameworks/base/apex/permission:__subpackages__",

    ],

}



droidstubs {

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

    srcs: [

        ":framework-annotations",

        ":framework-permission-sources",

    ],

    sdk_version: "system_current",

    defaults: [

        "framework-module-stubs-defaults-systemapi",

    ],

}



java_library {

    name: "framework-permission-stubs",

    srcs: [

        ":framework-permission-stubs-sources",

    ],

    sdk_version: "system_current",

    installable: false,

}

apex/permission/framework/java/android/permission/PermissionState.java

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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 android.permission;



/**

 * @hide

 */

public class PermissionState {}

apex/permission/service/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
// Copyright (C) 2020 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.



java_library {

    name: "service-permission",

    srcs: [

        "java/**/*.java",

    ],

    sdk_version: "system_current",

    libs: [

        "framework-permission",

    ],

    apex_available: [

        "com.android.permission",

        "test_com.android.permission",

    ],

    installable: true,

}