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

Commit 8f810b13 authored by Seth Moore's avatar Seth Moore
Browse files

Move remotely provisioned component tests to rkp directory 

Now that the RKP HAL AIDL has been moved to it's own directory, we
should keep the tests with the AIDL.

Test: atest VtsAidlKeyMintTargetTest
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ia87d3ea0a1b9e6704f0dea8f98b0bbaa049472fe
parent 7536e36d

security/keymint/aidl/vts/functional/Android.bp

+0 −21
Original line number Diff line number Diff line
@@ -90,24 +90,3 @@ cc_test_library { 
        "libgmock_ndk",

    ],

}
 


cc_test {

    name: "VtsHalRemotelyProvisionedComponentTargetTest",

    defaults: [

        "keymint_vts_defaults",

    ],

    srcs: [

        "VtsRemotelyProvisionedComponentTests.cpp",

    ],

    static_libs: [

        "libgmock_ndk",

        "libkeymaster_portable",

        "libkeymint_vts_test_utils",

        "libpuresoftkeymasterdevice",

    ],

    test_config: "VtsRemotelyProvisionedComponentTests.xml",

    test_suites: [

        "general-tests",

        "vts",

    ],

}

security/rkp/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "VtsHalRemotelyProvisionedComponentTargetTest"

    }

  ]

}

security/rkp/aidl/vts/functional/Android.bp

0 → 100644
+44 −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 {

    // See: http://go/android-license-faq

    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_test {

    name: "VtsHalRemotelyProvisionedComponentTargetTest",

    defaults: [

        "keymint_vts_defaults",

    ],

    srcs: [

        "VtsRemotelyProvisionedComponentTests.cpp",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libcrypto",

    ],

    static_libs: [

        "libcppbor_external",

        "libgmock_ndk",

        "libkeymint_vts_test_utils",

    ],

    test_config: "VtsRemotelyProvisionedComponentTests.xml",

    test_suites: [

        "general-tests",

        "vts",

    ],

}

security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp→security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <string>

#define LOG_TAG "VtsRemotelyProvisionableComponentTests"



#include <AndroidRemotelyProvisionedComponentDevice.h>

#include <aidl/android/hardware/security/keymint/BnRemotelyProvisionedComponent.h>

#include <aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.h>

#include <aidl/android/hardware/security/keymint/SecurityLevel.h>

#include <android/binder_manager.h>