summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-10-05 14:21:37 -0500
committerandroid-build-merger2017-10-05 14:21:37 -0500
commit0b63b4ad32358d9dea892a3b968006c409038624 (patch)
tree889a32374db20dda1d820d460c38f6c682b58243
parent8bd117fa0f628f93b7363d081ba25ffbeb2d7d7e (diff)
parent457a40dbddec4afd846a1f3ebef222b4a4b5f8b7 (diff)
downloadplatform-hardware-interfaces-0b63b4ad32358d9dea892a3b968006c409038624.tar.gz
platform-hardware-interfaces-0b63b4ad32358d9dea892a3b968006c409038624.tar.xz
platform-hardware-interfaces-0b63b4ad32358d9dea892a3b968006c409038624.zip
Merge "Test extension -> Android.bp" am: d35806414c am: f7e0bafa04 am: 6067a534b0
am: 457a40dbdd Change-Id: If6c2c17edb6a3c85b0a20386642c7d519242003a
-rw-r--r--tests/Android.bp1
-rw-r--r--tests/extension/light/2.0/default/Android.bp34
-rw-r--r--tests/extension/light/2.0/default/Android.mk19
3 files changed, 35 insertions, 19 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index 18fc473f..0031637c 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -6,6 +6,7 @@ subdirs = [
6 "baz/1.0/default", 6 "baz/1.0/default",
7 "expression/1.0", 7 "expression/1.0",
8 "extension/light/2.0", 8 "extension/light/2.0",
9 "extension/light/2.0/default",
9 "foo/1.0", 10 "foo/1.0",
10 "foo/1.0/default", 11 "foo/1.0/default",
11 "foo/1.0/default/lib", 12 "foo/1.0/default/lib",
diff --git a/tests/extension/light/2.0/default/Android.bp b/tests/extension/light/2.0/default/Android.bp
new file mode 100644
index 00000000..365a34ab
--- /dev/null
+++ b/tests/extension/light/2.0/default/Android.bp
@@ -0,0 +1,34 @@
1//
2// Copyright (C) 2017 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: "android.hardware.tests.extension.light@2.0-service",
19 init_rc: ["android.hardware.tests.extension.light@2.0-service.rc"],
20 vendor: true,
21 relative_install_path: "hw",
22 srcs: [
23 "Light.cpp",
24 "service.cpp",
25 ],
26
27 shared_libs: [
28 "libhidlbase",
29 "libhidltransport",
30 "libutils",
31 "android.hardware.light@2.0",
32 "android.hardware.tests.extension.light@2.0",
33 ],
34}
diff --git a/tests/extension/light/2.0/default/Android.mk b/tests/extension/light/2.0/default/Android.mk
deleted file mode 100644
index b30d11c8..00000000
--- a/tests/extension/light/2.0/default/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE := android.hardware.tests.extension.light@2.0-service
5LOCAL_INIT_RC := android.hardware.tests.extension.light@2.0-service.rc
6LOCAL_PROPRIETARY_MODULE := true
7LOCAL_MODULE_RELATIVE_PATH := hw
8LOCAL_SRC_FILES := \
9 Light.cpp \
10 service.cpp
11
12LOCAL_SHARED_LIBRARIES := \
13 libhidlbase \
14 libhidltransport \
15 libutils \
16 android.hardware.light@2.0 \
17 android.hardware.tests.extension.light@2.0 \
18
19include $(BUILD_EXECUTABLE)