summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorSteven Moreland2017-05-04 22:50:40 -0500
committerandroid-build-merger2017-05-04 22:50:40 -0500
commit38207765fbb5dab5b4d63ac5b8a1652de5fbd2af (patch)
tree0130bc8d7c3cc72f8f6a9973a874c07464649c0f /trusty
parenteb73fcdcb83fe61cb1dd2fe081f458d24ed5e217 (diff)
parentbc7edfe56f87e5cabdb6e735be4fd0f47e3eedcf (diff)
downloadplatform-system-core-38207765fbb5dab5b4d63ac5b8a1652de5fbd2af.tar.gz
platform-system-core-38207765fbb5dab5b4d63ac5b8a1652de5fbd2af.tar.xz
platform-system-core-38207765fbb5dab5b4d63ac5b8a1652de5fbd2af.zip
Merge "trusty/storage/* to Android.bp" am: 1dcd257a21 am: 1561e34bf4 am: 9b7632ef8a
am: bc7edfe56f Change-Id: I4b762bf23b062862824a98bb9e7c099388ae3e5c
Diffstat (limited to 'trusty')
-rw-r--r--trusty/Android.bp1
-rw-r--r--trusty/storage/interface/Android.bp20
-rw-r--r--trusty/storage/interface/Android.mk25
-rw-r--r--trusty/storage/lib/Android.bp35
-rw-r--r--trusty/storage/lib/Android.mk37
-rw-r--r--trusty/storage/proxy/Android.bp38
-rw-r--r--trusty/storage/proxy/Android.mk41
-rw-r--r--trusty/storage/proxy/proxy.c1
-rw-r--r--trusty/storage/tests/Android.bp36
-rw-r--r--trusty/storage/tests/Android.mk29
10 files changed, 130 insertions, 133 deletions
diff --git a/trusty/Android.bp b/trusty/Android.bp
index 1b2e2c776..9681488d8 100644
--- a/trusty/Android.bp
+++ b/trusty/Android.bp
@@ -1,3 +1,4 @@
1subdirs = [ 1subdirs = [
2 "libtrusty", 2 "libtrusty",
3 "storage/*",
3] 4]
diff --git a/trusty/storage/interface/Android.bp b/trusty/storage/interface/Android.bp
new file mode 100644
index 000000000..a551c37aa
--- /dev/null
+++ b/trusty/storage/interface/Android.bp
@@ -0,0 +1,20 @@
1//
2// Copyright (C) 2015 The Android Open-Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15//
16
17cc_library_static {
18 name: "libtrustystorageinterface",
19 export_include_dirs: ["include"],
20}
diff --git a/trusty/storage/interface/Android.mk b/trusty/storage/interface/Android.mk
deleted file mode 100644
index 15cb6f3d5..000000000
--- a/trusty/storage/interface/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
1#
2# Copyright (C) 2015 The Android Open-Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17LOCAL_PATH:= $(call my-dir)
18
19include $(CLEAR_VARS)
20
21LOCAL_MODULE := libtrustystorageinterface
22
23LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
24
25include $(BUILD_STATIC_LIBRARY)
diff --git a/trusty/storage/lib/Android.bp b/trusty/storage/lib/Android.bp
new file mode 100644
index 000000000..5eb3f0778
--- /dev/null
+++ b/trusty/storage/lib/Android.bp
@@ -0,0 +1,35 @@
1//
2// Copyright (C) 2015 The Android Open-Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15//
16
17cc_library_static {
18 name: "libtrustystorage",
19
20 srcs: ["storage.c"],
21
22 export_include_dirs: ["include"],
23
24 static_libs: [
25 "liblog",
26 "libtrusty",
27 "libtrustystorageinterface",
28 ],
29
30 cflags: [
31 "-fvisibility=hidden",
32 "-Wall",
33 "-Werror",
34 ]
35}
diff --git a/trusty/storage/lib/Android.mk b/trusty/storage/lib/Android.mk
deleted file mode 100644
index 7e0fc9da4..000000000
--- a/trusty/storage/lib/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
1#
2# Copyright (C) 2015 The Android Open-Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17LOCAL_PATH:= $(call my-dir)
18
19include $(CLEAR_VARS)
20
21LOCAL_MODULE := libtrustystorage
22
23LOCAL_SRC_FILES := \
24 storage.c \
25
26LOCAL_CLFAGS = -fvisibility=hidden -Wall -Werror
27
28LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
29LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
30
31LOCAL_STATIC_LIBRARIES := \
32 liblog \
33 libtrusty \
34 libtrustystorageinterface
35
36include $(BUILD_STATIC_LIBRARY)
37
diff --git a/trusty/storage/proxy/Android.bp b/trusty/storage/proxy/Android.bp
new file mode 100644
index 000000000..eb34df014
--- /dev/null
+++ b/trusty/storage/proxy/Android.bp
@@ -0,0 +1,38 @@
1//
2// Copyright (C) 2016 The Android Open-Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15//
16
17cc_binary {
18 name: "storageproxyd",
19
20 srcs: [
21 "ipc.c",
22 "rpmb.c",
23 "storage.c",
24 "proxy.c",
25 ],
26
27 shared_libs: ["liblog"],
28
29 static_libs: [
30 "libtrustystorageinterface",
31 "libtrusty",
32 ],
33
34 cflags: [
35 "-Wall",
36 "-Werror",
37 ]
38}
diff --git a/trusty/storage/proxy/Android.mk b/trusty/storage/proxy/Android.mk
deleted file mode 100644
index 745e302d8..000000000
--- a/trusty/storage/proxy/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
1#
2# Copyright (C) 2016 The Android Open-Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17LOCAL_PATH:= $(call my-dir)
18
19include $(CLEAR_VARS)
20
21LOCAL_MODULE := storageproxyd
22
23LOCAL_C_INCLUDES += bionic/libc/kernel/uapi
24
25LOCAL_SRC_FILES := \
26 ipc.c \
27 rpmb.c \
28 storage.c \
29 proxy.c
30
31LOCAL_CLFAGS = -Wall -Werror
32
33LOCAL_SHARED_LIBRARIES := \
34 liblog \
35
36LOCAL_STATIC_LIBRARIES := \
37 libtrustystorageinterface \
38 libtrusty
39
40include $(BUILD_EXECUTABLE)
41
diff --git a/trusty/storage/proxy/proxy.c b/trusty/storage/proxy/proxy.c
index d645ac01c..27e58917f 100644
--- a/trusty/storage/proxy/proxy.c
+++ b/trusty/storage/proxy/proxy.c
@@ -229,7 +229,6 @@ static void parse_args(int argc, char *argv[])
229int main(int argc, char *argv[]) 229int main(int argc, char *argv[])
230{ 230{
231 int rc; 231 int rc;
232 uint retry_cnt;
233 232
234 /* drop privileges */ 233 /* drop privileges */
235 if (drop_privs() < 0) 234 if (drop_privs() < 0)
diff --git a/trusty/storage/tests/Android.bp b/trusty/storage/tests/Android.bp
new file mode 100644
index 000000000..3eff3f27a
--- /dev/null
+++ b/trusty/storage/tests/Android.bp
@@ -0,0 +1,36 @@
1//
2// Copyright (C) 2016 The Android Open Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15//
16
17cc_test {
18 name: "secure-storage-unit-test",
19
20 cflags: [
21 "-g",
22 "-Wall",
23 "-Werror",
24 "-std=gnu++11",
25 "-Wno-missing-field-initializers",
26 ],
27
28 static_libs: [
29 "libtrustystorageinterface",
30 "libtrustystorage",
31 "libtrusty",
32 "liblog",
33 ],
34
35 srcs: ["main.cpp"],
36}
diff --git a/trusty/storage/tests/Android.mk b/trusty/storage/tests/Android.mk
deleted file mode 100644
index 71c904df1..000000000
--- a/trusty/storage/tests/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
1#
2# Copyright (C) 2016 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17LOCAL_PATH:= $(call my-dir)
18
19include $(CLEAR_VARS)
20LOCAL_MODULE := secure-storage-unit-test
21LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
22LOCAL_STATIC_LIBRARIES := \
23 libtrustystorageinterface \
24 libtrustystorage \
25 libtrusty \
26 liblog
27LOCAL_SRC_FILES := main.cpp
28include $(BUILD_NATIVE_TEST)
29