tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Keymaster test statically links to dependencies." into oc-mr1-dev

Browse source
This commit is contained in:
Tri Vo 2017-08-11 01:07:22 +00:00 committed by Android (Google) Code Review
commit c20d4caa4c
3 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
keymaster/3.0/vts/functional/Android.bp Normal file
View file

@ -0,0 +1,32 @@
//
// Copyright (C) 2017 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.
//
cc_test {
name: "VtsHalKeymasterV3_0TargetTest",
defaults: ["VtsHalTargetTestDefaults"],
srcs: [
"authorization_set.cpp",
"attestation_record.cpp",
"key_param_output.cpp",
"keymaster_hidl_hal_test.cpp",
"keystore_tags_utils.cpp",
],
static_libs: [
"android.hardware.keymaster@3.0",
"libcrypto",
"libsoftkeymasterdevice",
],
}

39
keymaster/3.0/vts/functional/Android.mk
View file

@ -1,39 +0,0 @@
# Copyright (C) 2017 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.
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := VtsHalKeymasterV3_0TargetTest
LOCAL_SRC_FILES := \
authorization_set.cpp \
attestation_record.cpp \
key_param_output.cpp \
keymaster_hidl_hal_test.cpp \
keystore_tags_utils.cpp \
LOCAL_SHARED_LIBRARIES := \
android.hardware.keymaster@3.0 \
libcrypto \
libhidlbase \
liblog \
libsoftkeymasterdevice \
libutils \
LOCAL_STATIC_LIBRARIES := \
VtsHalHidlTargetTestBase \
LOCAL_CFLAGS := -Wall -Werror
include $(BUILD_NATIVE_TEST)

1
keymaster/Android.bp
View file

@ -1,4 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"3.0",
"3.0/vts/functional",
]