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

Commit da37ed49 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Add an explicitly v4 manifest fragment" into main am: 8883c4f4 am: 4311a3ef 

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



Change-Id: I6eace4a5f58ef398cd06680ad9a3a38dd3e89de0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb02bf25 4311a3ef

security/keymint/aidl/default/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -118,6 +118,13 @@ prebuilt_etc { 
    src: "android.hardware.hardware_keystore_V3.xml",

}



prebuilt_etc {

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

    sub_dir: "permissions",

    vendor: true,

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

}



rust_library {

    name: "libkmr_hal_nonsecure",

    crate_name: "kmr_hal_nonsecure",

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

</permissions>