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

Commit b210d975 authored by David Zeuthen's avatar David Zeuthen Committed by Automerger Merge Worker
Browse files

Merge "KeyMint + KeyMaster: Include permissions for... 

Merge "KeyMint + KeyMaster: Include permissions for FEATURE_HARDWARE_KEYSTORE." am: 94b8b113 am: c49df884

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1626739

Change-Id: I8984cbcdfe2bfe6aec7fcd1725645058cf9798d1
parents bc2b4613 c49df884

keymaster/4.1/default/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -45,5 +45,14 @@ cc_binary { 
        "liblog",

        "libutils",

    ],

    required: [

        "android.hardware.hardware_keystore.km41.xml",

    ],

}



prebuilt_etc {

    name: "android.hardware.hardware_keystore.km41.xml",

    sub_dir: "permissions",

    vendor: true,

    src: "android.hardware.hardware_keystore.km41.xml",

}

keymaster/4.1/default/android.hardware.hardware_keystore.km41.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 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.

-->

<permissions>

  <feature name="android.hardware.hardware_keystore" version="41" />

</permissions>

security/keymint/aidl/default/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -39,7 +39,17 @@ cc_binary { 
    srcs: [

        "service.cpp",

    ],

    required: ["RemoteProvisioner"],

    required: [

        "RemoteProvisioner",

        "android.hardware.hardware_keystore.xml",

    ],

}



prebuilt_etc {

    name: "android.hardware.hardware_keystore.xml",

    sub_dir: "permissions",

    vendor: true,

    src: "android.hardware.hardware_keystore.xml",

}



cc_library {

security/keymint/aidl/default/android.hardware.hardware_keystore.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 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.

-->

<permissions>

  <feature name="android.hardware.hardware_keystore" version="100" />

</permissions>