From 8bb85bd07c8100cb1d1c4b3a1ee63f1ae515945f Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 5 May 2017 17:16:10 -0700 Subject: [PATCH] trusty*: Android.mk -> Android.bp Test: links Bug: 37512442 Merged-In: I86bcdcfffbbd81dedb921612bd2d21ea4aabaeb1 Change-Id: I86bcdcfffbbd81dedb921612bd2d21ea4aabaeb1 --- trusty/Android.bp | 3 ++ trusty/gatekeeper/Android.bp | 46 ++++++++++++++++++++++++ trusty/gatekeeper/Android.mk | 46 ------------------------ trusty/keymaster/Android.bp | 67 +++++++++++++++++++++++++++++++++++ trusty/keymaster/Android.mk | 68 ------------------------------------ trusty/nvram/Android.bp | 61 ++++++++++++++++++++++++++++++++ trusty/nvram/Android.mk | 43 ----------------------- 7 files changed, 177 insertions(+), 157 deletions(-) create mode 100644 trusty/gatekeeper/Android.bp delete mode 100644 trusty/gatekeeper/Android.mk create mode 100644 trusty/keymaster/Android.bp delete mode 100644 trusty/keymaster/Android.mk create mode 100644 trusty/nvram/Android.bp delete mode 100644 trusty/nvram/Android.mk diff --git a/trusty/Android.bp b/trusty/Android.bp index 9681488d8..386fbe623 100644 --- a/trusty/Android.bp +++ b/trusty/Android.bp @@ -1,4 +1,7 @@ subdirs = [ + "gatekeeper", + "keymaster", "libtrusty", + "nvram", "storage/*", ] diff --git a/trusty/gatekeeper/Android.bp b/trusty/gatekeeper/Android.bp new file mode 100644 index 000000000..a9566a17e --- /dev/null +++ b/trusty/gatekeeper/Android.bp @@ -0,0 +1,46 @@ +// +// Copyright (C) 2015 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. +// + +// WARNING: Everything listed here will be built on ALL platforms, +// including x86, the emulator, and the SDK. Modules must be uniquely +// named (liblights.panda), and must build everywhere, or limit themselves +// to only building on ARM if they include assembly. Individual makefiles +// are responsible for having their own logic, for fine-grained control. + +cc_library_shared { + name: "gatekeeper.trusty", + + relative_install_path: "hw", + + srcs: [ + "module.cpp", + "trusty_gatekeeper_ipc.c", + "trusty_gatekeeper.cpp", + ], + + cflags: [ + "-fvisibility=hidden", + "-Wall", + "-Werror", + ], + + shared_libs: [ + "libgatekeeper", + "liblog", + "libcutils", + "libtrusty", + ], +} diff --git a/trusty/gatekeeper/Android.mk b/trusty/gatekeeper/Android.mk deleted file mode 100644 index 3982c8fd9..000000000 --- a/trusty/gatekeeper/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2015 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. -# - -# WARNING: Everything listed here will be built on ALL platforms, -# including x86, the emulator, and the SDK. Modules must be uniquely -# named (liblights.panda), and must build everywhere, or limit themselves -# to only building on ARM if they include assembly. Individual makefiles -# are responsible for having their own logic, for fine-grained control. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := gatekeeper.trusty - -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_SRC_FILES := \ - module.cpp \ - trusty_gatekeeper_ipc.c \ - trusty_gatekeeper.cpp - -LOCAL_CLFAGS = -fvisibility=hidden -Wall -Werror - -LOCAL_SHARED_LIBRARIES := \ - libgatekeeper \ - liblog \ - libcutils \ - libtrusty - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp new file mode 100644 index 000000000..3b6867cf1 --- /dev/null +++ b/trusty/keymaster/Android.bp @@ -0,0 +1,67 @@ +// +// Copyright (C) 2015 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. +// + +// WARNING: Everything listed here will be built on ALL platforms, +// including x86, the emulator, and the SDK. Modules must be uniquely +// named (liblights.panda), and must build everywhere, or limit themselves +// to only building on ARM if they include assembly. Individual makefiles +// are responsible for having their own logic, for fine-grained control. + +// trusty_keymaster is a binary used only for on-device testing. It +// runs Trusty Keymaster through a basic set of operations with RSA +// and ECDSA keys. +cc_binary { + name: "trusty_keymaster_tipc", + srcs: [ + "trusty_keymaster_device.cpp", + "trusty_keymaster_ipc.cpp", + "trusty_keymaster_main.cpp", + ], + shared_libs: [ + "libcrypto", + "libcutils", + "libkeymaster1", + "libtrusty", + "libkeymaster_messages", + "libsoftkeymasterdevice", + "liblog", + ], +} + +// keystore.trusty is the HAL used by keystore on Trusty devices. +cc_library_shared { + name: "keystore.trusty", + relative_install_path: "hw", + srcs: [ + "module.cpp", + "trusty_keymaster_ipc.cpp", + "trusty_keymaster_device.cpp", + ], + + cflags: [ + "-fvisibility=hidden", + "-Wall", + "-Werror", + ], + + shared_libs: [ + "libcrypto", + "libkeymaster_messages", + "libtrusty", + "liblog", + "libcutils", + ], +} diff --git a/trusty/keymaster/Android.mk b/trusty/keymaster/Android.mk deleted file mode 100644 index 2d614aec6..000000000 --- a/trusty/keymaster/Android.mk +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2015 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. -# - -# WARNING: Everything listed here will be built on ALL platforms, -# including x86, the emulator, and the SDK. Modules must be uniquely -# named (liblights.panda), and must build everywhere, or limit themselves -# to only building on ARM if they include assembly. Individual makefiles -# are responsible for having their own logic, for fine-grained control. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -### -# trusty_keymaster is a binary used only for on-device testing. It -# runs Trusty Keymaster through a basic set of operations with RSA -# and ECDSA keys. -### -LOCAL_MODULE := trusty_keymaster_tipc -LOCAL_SRC_FILES := \ - trusty_keymaster_device.cpp \ - trusty_keymaster_ipc.cpp \ - trusty_keymaster_main.cpp -LOCAL_SHARED_LIBRARIES := \ - libcrypto \ - libcutils \ - libkeymaster1 \ - libtrusty \ - libkeymaster_messages \ - libsoftkeymasterdevice \ - liblog - -include $(BUILD_EXECUTABLE) - -### -# keystore.trusty is the HAL used by keystore on Trusty devices. -## - -include $(CLEAR_VARS) - -LOCAL_MODULE := keystore.trusty -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := module.cpp \ - trusty_keymaster_ipc.cpp \ - trusty_keymaster_device.cpp -LOCAL_CLFAGS = -fvisibility=hidden -Wall -Werror -LOCAL_SHARED_LIBRARIES := \ - libcrypto \ - libkeymaster_messages \ - libtrusty \ - liblog \ - libcutils -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/trusty/nvram/Android.bp b/trusty/nvram/Android.bp new file mode 100644 index 000000000..15e6c3e5e --- /dev/null +++ b/trusty/nvram/Android.bp @@ -0,0 +1,61 @@ +// +// Copyright (C) 2016 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. +// + +// nvram.trusty is the Trusty NVRAM HAL module. +cc_library_shared { + name: "nvram.trusty", + relative_install_path: "hw", + srcs: [ + "module.c", + "trusty_nvram_device.cpp", + "trusty_nvram_implementation.cpp", + ], + + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + "-fvisibility=hidden", + ], + static_libs: ["libnvram-hal"], + shared_libs: [ + "libtrusty", + "libnvram-messages", + "liblog", + ], +} + +// nvram-wipe is a helper tool for clearing NVRAM state. +cc_binary { + name: "nvram-wipe", + srcs: [ + "nvram_wipe.cpp", + "trusty_nvram_implementation.cpp", + ], + + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + "-fvisibility=hidden", + ], + static_libs: ["libnvram-hal"], + shared_libs: [ + "libtrusty", + "libnvram-messages", + "liblog", + ], +} diff --git a/trusty/nvram/Android.mk b/trusty/nvram/Android.mk deleted file mode 100644 index 44e2212b1..000000000 --- a/trusty/nvram/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (C) 2016 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) - -# nvram.trusty is the Trusty NVRAM HAL module. -include $(CLEAR_VARS) -LOCAL_MODULE := nvram.trusty -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := \ - module.c \ - trusty_nvram_device.cpp \ - trusty_nvram_implementation.cpp -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -Wall -Werror -Wextra -fvisibility=hidden -LOCAL_STATIC_LIBRARIES := libnvram-hal -LOCAL_SHARED_LIBRARIES := libtrusty libnvram-messages liblog -include $(BUILD_SHARED_LIBRARY) - -# nvram-wipe is a helper tool for clearing NVRAM state. -include $(CLEAR_VARS) -LOCAL_MODULE := nvram-wipe -LOCAL_SRC_FILES := \ - nvram_wipe.cpp \ - trusty_nvram_implementation.cpp -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -Wall -Werror -Wextra -fvisibility=hidden -LOCAL_STATIC_LIBRARIES := libnvram-hal -LOCAL_SHARED_LIBRARIES := libtrusty libnvram-messages liblog -include $(BUILD_EXECUTABLE)