ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libtrusty: Android.mk -> Android.bp"

Browse source
This commit is contained in:
Treehugger Robot 2017-04-27 20:02:16 +00:00 • committed by Gerrit Code Review
commit de70e33092
5 changed files with 55 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
trusty/Android.bp Normal file
View file

@ -0,0 +1,3 @@
subdirs = [
"libtrusty",
]

26
trusty/libtrusty/Android.bp Normal file
View file

@ -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"],
}

36
trusty/libtrusty/Android.mk
View file

@ -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)

26
trusty/libtrusty/tipc-test/Android.bp Normal file
View file

@ -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,
}

29
trusty/libtrusty/tipc-test/Android.mk
View file

@ -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)