Add basic apps to all generic-arm64 projects
Move IPC unittest to separate project
Change-Id: I08d4c8ec610896f8b1afdf96629cf29e0a9102b9
diff --git a/project/generic-arm-inc.mk b/project/generic-arm-inc.mk
index 3945d8d..8e7de28 100644
--- a/project/generic-arm-inc.mk
+++ b/project/generic-arm-inc.mk
@@ -82,8 +82,9 @@
# compiled from source
TRUSTY_ALL_USER_TASKS := \
- sample/ipc-unittest/main \
- sample/ipc-unittest/srv \
+ keymaster \
+ gatekeeper \
+ storage \
# This project requires trusty IPC
WITH_TRUSTY_IPC := true
diff --git a/project/generic-arm32-ipc-unittest.mk b/project/generic-arm32-ipc-unittest.mk
new file mode 100644
index 0000000..59f8385
--- /dev/null
+++ b/project/generic-arm32-ipc-unittest.mk
@@ -0,0 +1,22 @@
+# 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.
+#
+
+KERNEL_32BIT := true
+
+include project/generic-arm-inc.mk
+
+TRUSTY_ALL_USER_TASKS += \
+ sample/ipc-unittest/main \
+ sample/ipc-unittest/srv \
diff --git a/project/generic-arm64-ipc-unittest.mk b/project/generic-arm64-ipc-unittest.mk
new file mode 100644
index 0000000..1fd9042
--- /dev/null
+++ b/project/generic-arm64-ipc-unittest.mk
@@ -0,0 +1,22 @@
+# 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.
+#
+
+KERNEL_32BIT := false
+
+include project/generic-arm-inc.mk
+
+TRUSTY_ALL_USER_TASKS += \
+ sample/ipc-unittest/main \
+ sample/ipc-unittest/srv \
