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

Commit 7dcdd5b9 authored by David Drysdale's avatar David Drysdale
Browse files

Add manifest fragments for all KeyMint versions 

Make it easier for vendors to declare the Package Manager flag
that matches the version of KeyMint that their device implements.

Test: TreeHugger
Bug: 381125092
Change-Id: I13f781836b4b06c43811b315ca78da076ecd928f
parent 8883c4f4

security/keymint/aidl/default/Android.bp

+19 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ rust_binary { 
    ],

}



// The following target declares the latest version of KeyMint.

prebuilt_etc {

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

    sub_dir: "permissions",
@@ -111,6 +112,24 @@ prebuilt_etc { 
    src: "android.hardware.hardware_keystore.xml",

}



// The following targets (and underlying XML files) declare specific

// versions of KeyMint.  Vendors should use the version that matches the

// version of the KeyMint HAL that the device implements.



prebuilt_etc {

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

    sub_dir: "permissions",

    vendor: true,

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

}



prebuilt_etc {

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

    sub_dir: "permissions",

    vendor: true,

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

}



prebuilt_etc {

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

    sub_dir: "permissions",

security/keymint/aidl/default/android.hardware.hardware_keystore_V1.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>

security/keymint/aidl/default/android.hardware.hardware_keystore_V2.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="200" />

</permissions>