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

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

Merge "Add an explicitly v3 manifest fragment" into main am: b9c1291d am: 0525a8a3 

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



Change-Id: I1faa4c3a9a6cbafc73e578fd0068d03a4beea824
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3202279 0525a8a3

security/keymint/aidl/default/Android.bp

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

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

}

}





prebuilt_etc {

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

    sub_dir: "permissions",

    vendor: true,

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

}



rust_library {

rust_library {

    name: "libkmr_hal_nonsecure",

    name: "libkmr_hal_nonsecure",

    crate_name: "kmr_hal_nonsecure",

    crate_name: "kmr_hal_nonsecure",

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

0 → 100644
+18 −0
Original line number Original line 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="300" />

</permissions>