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

Merge "trusty/storage/* to Android.bp" am: 1dcd257a21 am: 1561e34bf4

Browse source 
am: 9b7632ef8a

Change-Id: I0cd118b47b1b983012666bd2f79fc78cc1b5128c
This commit is contained in:
Steven Moreland 2017-05-05 03:47:55 +00:00 • committed by android-build-merger
commit bc7edfe56f
10 changed files with 130 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trusty/Android.bp
View file

@ -1,3 +1,4 @@
subdirs = [ subdirs = [
"libtrusty", "libtrusty",
"storage/*",
] ]

20
trusty/storage/interface/Android.bp Normal file
View file

@ -0,0 +1,20 @@
//
// 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_library_static {
name: "libtrustystorageinterface",
export_include_dirs: ["include"],
}

25
trusty/storage/interface/Android.mk
View file

@ -1,25 +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 := libtrustystorageinterface
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
include $(BUILD_STATIC_LIBRARY)

35
trusty/storage/lib/Android.bp Normal file
View file

@ -0,0 +1,35 @@
//
// 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_library_static {
name: "libtrustystorage",
srcs: ["storage.c"],
export_include_dirs: ["include"],
static_libs: [
"liblog",
"libtrusty",
"libtrustystorageinterface",
],
cflags: [
"-fvisibility=hidden",
"-Wall",
"-Werror",
]
}

37
trusty/storage/lib/Android.mk
View file

@ -1,37 +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 := libtrustystorage
LOCAL_SRC_FILES := \
storage.c \
LOCAL_CLFAGS = -fvisibility=hidden -Wall -Werror
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES := \
liblog \
libtrusty \
libtrustystorageinterface
include $(BUILD_STATIC_LIBRARY)

38
trusty/storage/proxy/Android.bp Normal file
View file

@ -0,0 +1,38 @@
//
// 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.
//
cc_binary {
name: "storageproxyd",
srcs: [
"ipc.c",
"rpmb.c",
"storage.c",
"proxy.c",
],
shared_libs: ["liblog"],
static_libs: [
"libtrustystorageinterface",
"libtrusty",
],
cflags: [
"-Wall",
"-Werror",
]
}

41
trusty/storage/proxy/Android.mk
View file

@ -1,41 +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)
include $(CLEAR_VARS)
LOCAL_MODULE := storageproxyd
LOCAL_C_INCLUDES += bionic/libc/kernel/uapi
LOCAL_SRC_FILES := \
ipc.c \
rpmb.c \
storage.c \
proxy.c
LOCAL_CLFAGS = -Wall -Werror
LOCAL_SHARED_LIBRARIES := \
liblog \
LOCAL_STATIC_LIBRARIES := \
libtrustystorageinterface \
libtrusty
include $(BUILD_EXECUTABLE)

1
trusty/storage/proxy/proxy.c
View file

@ -229,7 +229,6 @@ static void parse_args(int argc, char *argv[])
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int rc; int rc;
uint retry_cnt;
/* drop privileges */ /* drop privileges */
if (drop_privs() < 0) if (drop_privs() < 0)

36
trusty/storage/tests/Android.bp Normal file
View file

@ -0,0 +1,36 @@
//
// 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.
//
cc_test {
name: "secure-storage-unit-test",
cflags: [
"-g",
"-Wall",
"-Werror",
"-std=gnu++11",
"-Wno-missing-field-initializers",
],
static_libs: [
"libtrustystorageinterface",
"libtrustystorage",
"libtrusty",
"liblog",
],
srcs: ["main.cpp"],
}

29
trusty/storage/tests/Android.mk
View file

@ -1,29 +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)
include $(CLEAR_VARS)
LOCAL_MODULE := secure-storage-unit-test
LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
LOCAL_STATIC_LIBRARIES := \
libtrustystorageinterface \
libtrustystorage \
libtrusty \
liblog
LOCAL_SRC_FILES := main.cpp
include $(BUILD_NATIVE_TEST)