Merge "Light mk -> bp." am: aaa995113e
am: c25e76d8ab
Change-Id: Ib066b06afa3eb92535ea0122b458b6f48b3a0351
This commit is contained in:
commit
886207933c
2 changed files with 53 additions and 48 deletions
53
light/2.0/default/Android.bp
Normal file
53
light/2.0/default/Android.bp
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
// Copyright (C) 2017 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_shared {
|
||||||
|
name: "android.hardware.light@2.0-impl",
|
||||||
|
defaults: ["hidl_defaults"],
|
||||||
|
proprietary: true,
|
||||||
|
relative_install_path: "hw",
|
||||||
|
srcs: ["Light.cpp"],
|
||||||
|
|
||||||
|
shared_libs: [
|
||||||
|
"libbase",
|
||||||
|
"liblog",
|
||||||
|
"libhidlbase",
|
||||||
|
"libhidltransport",
|
||||||
|
"libhardware",
|
||||||
|
"libutils",
|
||||||
|
"android.hardware.light@2.0",
|
||||||
|
],
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
cc_binary {
|
||||||
|
relative_install_path: "hw",
|
||||||
|
defaults: ["hidl_defaults"],
|
||||||
|
proprietary: true,
|
||||||
|
name: "android.hardware.light@2.0-service",
|
||||||
|
init_rc: ["android.hardware.light@2.0-service.rc"],
|
||||||
|
srcs: ["service.cpp"],
|
||||||
|
|
||||||
|
shared_libs: [
|
||||||
|
"liblog",
|
||||||
|
"libbase",
|
||||||
|
"libdl",
|
||||||
|
"libutils",
|
||||||
|
"libhardware",
|
||||||
|
"libhidlbase",
|
||||||
|
"libhidltransport",
|
||||||
|
"android.hardware.light@2.0",
|
||||||
|
],
|
||||||
|
|
||||||
|
}
|
|
@ -1,48 +0,0 @@
|
||||||
LOCAL_PATH := $(call my-dir)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE := android.hardware.light@2.0-impl
|
|
||||||
LOCAL_PROPRIETARY_MODULE := true
|
|
||||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
|
||||||
LOCAL_SRC_FILES := \
|
|
||||||
Light.cpp \
|
|
||||||
|
|
||||||
LOCAL_CFLAGS := -Wall -Werror
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
|
||||||
libhidlbase \
|
|
||||||
libhidltransport \
|
|
||||||
libutils \
|
|
||||||
liblog \
|
|
||||||
libcutils \
|
|
||||||
libhardware \
|
|
||||||
libbase \
|
|
||||||
libcutils \
|
|
||||||
android.hardware.light@2.0 \
|
|
||||||
|
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
|
||||||
LOCAL_PROPRIETARY_MODULE := true
|
|
||||||
LOCAL_MODULE := android.hardware.light@2.0-service
|
|
||||||
LOCAL_INIT_RC := android.hardware.light@2.0-service.rc
|
|
||||||
LOCAL_SRC_FILES := \
|
|
||||||
service.cpp \
|
|
||||||
|
|
||||||
LOCAL_CFLAGS := -Wall -Werror
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
|
||||||
liblog \
|
|
||||||
libcutils \
|
|
||||||
libdl \
|
|
||||||
libbase \
|
|
||||||
libutils \
|
|
||||||
libhardware \
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES += \
|
|
||||||
libhidlbase \
|
|
||||||
libhidltransport \
|
|
||||||
android.hardware.light@2.0 \
|
|
||||||
|
|
||||||
include $(BUILD_EXECUTABLE)
|
|
Loading…
Reference in a new issue