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

Merge "Make libkeystore_aidl shared and export to PDK."

Browse source
This commit is contained in:
Dmitry Dementyev 2017-11-30 01:05:35 +00:00 committed by Android (Google) Code Review
commit 36825119a0
5 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
keystore-engine/Android.mk
View file

@ -30,6 +30,7 @@ LOCAL_SHARED_LIBRARIES += \
libcrypto \
libcutils \
libhidlbase \
libkeystore_aidl \
libkeystore_binder \
liblog \
libutils

34
keystore/Android.bp
View file

@ -50,7 +50,9 @@ cc_binary {
"libkeymaster_messages",
"libkeymaster_portable",
"libkeymaster_staging",
"libkeystore_aidl",
"libkeystore_binder",
"libkeystore_parcelables",
"liblog",
"libselinux",
"libsoftkeymasterdevice",
@ -82,7 +84,9 @@ cc_binary {
"libcutils",
"libhidlbase",
"libhwbinder",
"libkeystore_aidl", // for IKeyStoreService.asInterface()
"libkeystore_binder",
"libkeystore_parcelables",
"liblog",
"libutils",
],
@ -109,12 +113,23 @@ cc_binary {
local_include_dirs: ["include"],
}
cc_library_headers {
name: "libkeystore_headers",
cc_library_shared {
name: "libkeystore_parcelables",
defaults: ["keystore_defaults"],
export_include_dirs: ["include"],
srcs: [
"KeyAttestationApplicationId.cpp",
"KeyAttestationPackageInfo.cpp",
"KeymasterArguments.cpp",
"KeystoreArguments.cpp",
"OperationResult.cpp",
"Signature.cpp",
"keystore_aidl_hidl_marshalling_utils.cpp",
],
shared_libs: [
"android.hardware.keymaster@3.0",
"libbinder",
"libhardware",
"libhidlbase",
"libhwbinder",
"liblog",
@ -134,27 +149,21 @@ cc_library_shared {
defaults: ["keystore_defaults"],
srcs: [
"KeyAttestationApplicationId.cpp",
"KeyAttestationPackageInfo.cpp",
"KeymasterArguments.cpp",
"KeystoreArguments.cpp",
"OperationResult.cpp",
"Signature.cpp",
"authorization_set.cpp",
"keyblob_utils.cpp",
"keystore_aidl_hidl_marshalling_utils.cpp",
"keystore_client.proto",
"keystore_client_impl.cpp",
"keystore_get.cpp",
"keystore_tags_utils.cpp",
],
static_libs: ["libkeystore_aidl",],
shared_libs: [
"android.hardware.keymaster@3.0",
"libbinder",
"libhidlbase",
"libhwbinder",
"liblog",
"libkeystore_aidl",
"libkeystore_parcelables",
"libprotobuf-cpp-lite",
"libutils",
],
@ -168,14 +177,13 @@ cc_library_shared {
include_dirs: ["frameworks/base/core/java/"],
},
export_include_dirs: ["include"],
export_static_lib_headers: [
"libkeystore_aidl",
],
export_shared_lib_headers: [
"android.hardware.keymaster@3.0",
"libbinder",
"libhidlbase",
"libhwbinder",
"libkeystore_aidl",
"libkeystore_parcelables",
],
}

1
keystore/include/keystore/KeymasterArguments.h
View file

@ -17,7 +17,6 @@
#include "authorization_set.h"
#include <binder/Parcelable.h>
#include <hardware/keymaster_defs.h>
namespace android {
namespace security {

1
keystore/include/keystore/KeystoreArguments.h
View file

@ -17,7 +17,6 @@
#include "KeystoreArg.h"
#include <binder/Parcelable.h>
#include <hardware/keymaster_defs.h>
#include <utils/RefBase.h>
namespace android {

1
keystore/include/keystore/OperationResult.h
View file

@ -19,7 +19,6 @@
#include "keystore_return_types.h"
#include <binder/Parcelable.h>
#include <binder/Parcel.h>
#include <hardware/keymaster_defs.h>
namespace android {
namespace security {