From f304a205231ac3a31a7e75eeafb7b1fb280bcde2 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 26 Apr 2017 11:30:09 -0700 Subject: [PATCH] libtrusty: Android.mk -> Android.bp Test: links Change-Id: Ic64361f98e9e51b62bfda8b2b1c3a00ae03f0a37 --- trusty/Android.bp | 3 +++ trusty/libtrusty/Android.bp | 26 +++++++++++++++++++ trusty/libtrusty/Android.mk | 36 --------------------------- trusty/libtrusty/tipc-test/Android.bp | 26 +++++++++++++++++++ trusty/libtrusty/tipc-test/Android.mk | 29 --------------------- 5 files changed, 55 insertions(+), 65 deletions(-) create mode 100644 trusty/Android.bp create mode 100644 trusty/libtrusty/Android.bp delete mode 100644 trusty/libtrusty/Android.mk create mode 100644 trusty/libtrusty/tipc-test/Android.bp delete mode 100644 trusty/libtrusty/tipc-test/Android.mk diff --git a/trusty/Android.bp b/trusty/Android.bp new file mode 100644 index 000000000..1b2e2c776 --- /dev/null +++ b/trusty/Android.bp @@ -0,0 +1,3 @@ +subdirs = [ + "libtrusty", +] diff --git a/trusty/libtrusty/Android.bp b/trusty/libtrusty/Android.bp new file mode 100644 index 000000000..f316da229 --- /dev/null +++ b/trusty/libtrusty/Android.bp @@ -0,0 +1,26 @@ +// 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. + +subdirs = [ + "tipc-test", +] + +cc_library { + name: "libtrusty", + + srcs: ["trusty.c"], + export_include_dirs: ["include"], + + shared_libs: ["liblog"], +} diff --git a/trusty/libtrusty/Android.mk b/trusty/libtrusty/Android.mk deleted file mode 100644 index 45fc07911..000000000 --- a/trusty/libtrusty/Android.mk +++ /dev/null @@ -1,36 +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. - -LOCAL_PATH := $(call my-dir) - -# == libtrusty Static library == -include $(CLEAR_VARS) - -LOCAL_MODULE := libtrusty -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := trusty.c -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include - -include $(BUILD_STATIC_LIBRARY) - -# == libtrusty shared library == -include $(CLEAR_VARS) - -LOCAL_MODULE := libtrusty -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := trusty.c -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_SHARED_LIBRARIES := liblog - -include $(BUILD_SHARED_LIBRARY) diff --git a/trusty/libtrusty/tipc-test/Android.bp b/trusty/libtrusty/tipc-test/Android.bp new file mode 100644 index 000000000..cb00fe772 --- /dev/null +++ b/trusty/libtrusty/tipc-test/Android.bp @@ -0,0 +1,26 @@ +// 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. + +cc_test { + name: "tipc-test", + static_executable: true, + + srcs: ["tipc_test.c"], + static_libs: [ + "libc", + "libtrusty", + "liblog", + ], + gtest: false, +} diff --git a/trusty/libtrusty/tipc-test/Android.mk b/trusty/libtrusty/tipc-test/Android.mk deleted file mode 100644 index 80030fe67..000000000 --- a/trusty/libtrusty/tipc-test/Android.mk +++ /dev/null @@ -1,29 +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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := tipc-test -LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := tipc_test.c -LOCAL_STATIC_LIBRARIES := libc libtrusty liblog -LOCAL_MULTILIB := both -LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 -LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 - -include $(BUILD_EXECUTABLE)