summaryrefslogtreecommitdiffstats
path: root/light
diff options
context:
space:
mode:
Diffstat (limited to 'light')
-rw-r--r--light/2.0/Android.mk4
-rw-r--r--light/2.0/default/Android.bp53
-rw-r--r--light/2.0/default/Android.mk44
-rw-r--r--light/Android.bp1
4 files changed, 58 insertions, 44 deletions
diff --git a/light/2.0/Android.mk b/light/2.0/Android.mk
index 24d7ab13..926c6001 100644
--- a/light/2.0/Android.mk
+++ b/light/2.0/Android.mk
@@ -15,6 +15,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
15LOCAL_JAVA_LIBRARIES := \ 15LOCAL_JAVA_LIBRARIES := \
16 android.hidl.base-V1.0-java \ 16 android.hidl.base-V1.0-java \
17 17
18LOCAL_NO_STANDARD_LIBRARIES := true
19LOCAL_JAVA_LIBRARIES += core-oj hwbinder
18 20
19# 21#
20# Build types.hal (Brightness) 22# Build types.hal (Brightness)
@@ -147,6 +149,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
147LOCAL_STATIC_JAVA_LIBRARIES := \ 149LOCAL_STATIC_JAVA_LIBRARIES := \
148 android.hidl.base-V1.0-java-static \ 150 android.hidl.base-V1.0-java-static \
149 151
152LOCAL_NO_STANDARD_LIBRARIES := true
153LOCAL_JAVA_LIBRARIES := core-oj hwbinder
150 154
151# 155#
152# Build types.hal (Brightness) 156# Build types.hal (Brightness)
diff --git a/light/2.0/default/Android.bp b/light/2.0/default/Android.bp
new file mode 100644
index 00000000..8d4eca1d
--- /dev/null
+++ b/light/2.0/default/Android.bp
@@ -0,0 +1,53 @@
1// Copyright (C) 2017 The Android Open Source Project
2//
3// Licensed under the Apache License, Version 2.0 (the "License");
4// you may not use this file except in compliance with the License.
5// You may obtain a copy of the License at
6//
7// http://www.apache.org/licenses/LICENSE-2.0
8//
9// Unless required by applicable law or agreed to in writing, software
10// distributed under the License is distributed on an "AS IS" BASIS,
11// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12// See the License for the specific language governing permissions and
13// limitations under the License.
14
15cc_library_shared {
16 name: "android.hardware.light@2.0-impl",
17 defaults: ["hidl_defaults"],
18 proprietary: true,
19 relative_install_path: "hw",
20 srcs: ["Light.cpp"],
21
22 shared_libs: [
23 "libbase",
24 "liblog",
25 "libhidlbase",
26 "libhidltransport",
27 "libhardware",
28 "libutils",
29 "android.hardware.light@2.0",
30 ],
31
32}
33
34cc_binary {
35 relative_install_path: "hw",
36 defaults: ["hidl_defaults"],
37 proprietary: true,
38 name: "android.hardware.light@2.0-service",
39 init_rc: ["android.hardware.light@2.0-service.rc"],
40 srcs: ["service.cpp"],
41
42 shared_libs: [
43 "liblog",
44 "libbase",
45 "libdl",
46 "libutils",
47 "libhardware",
48 "libhidlbase",
49 "libhidltransport",
50 "android.hardware.light@2.0",
51 ],
52
53} \ No newline at end of file
diff --git a/light/2.0/default/Android.mk b/light/2.0/default/Android.mk
deleted file mode 100644
index 1f44e664..00000000
--- a/light/2.0/default/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE := android.hardware.light@2.0-impl
5LOCAL_PROPRIETARY_MODULE := true
6LOCAL_MODULE_RELATIVE_PATH := hw
7LOCAL_SRC_FILES := \
8 Light.cpp \
9
10LOCAL_SHARED_LIBRARIES := \
11 libhidlbase \
12 libhidltransport \
13 libutils \
14 liblog \
15 libcutils \
16 libhardware \
17 libbase \
18 libcutils \
19 android.hardware.light@2.0 \
20
21include $(BUILD_SHARED_LIBRARY)
22
23include $(CLEAR_VARS)
24LOCAL_MODULE_RELATIVE_PATH := hw
25LOCAL_PROPRIETARY_MODULE := true
26LOCAL_MODULE := android.hardware.light@2.0-service
27LOCAL_INIT_RC := android.hardware.light@2.0-service.rc
28LOCAL_SRC_FILES := \
29 service.cpp \
30
31LOCAL_SHARED_LIBRARIES := \
32 liblog \
33 libcutils \
34 libdl \
35 libbase \
36 libutils \
37 libhardware \
38
39LOCAL_SHARED_LIBRARIES += \
40 libhidlbase \
41 libhidltransport \
42 android.hardware.light@2.0 \
43
44include $(BUILD_EXECUTABLE)
diff --git a/light/Android.bp b/light/Android.bp
index 8d2c9867..654bb808 100644
--- a/light/Android.bp
+++ b/light/Android.bp
@@ -1,5 +1,6 @@
1// This is an autogenerated file, do not edit. 1// This is an autogenerated file, do not edit.
2subdirs = [ 2subdirs = [
3 "2.0", 3 "2.0",
4 "2.0/default",
4 "2.0/vts/functional", 5 "2.0/vts/functional",
5] 6]