Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a8a6f91 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Vibrator service -> .bp"

parents a8c16c91 fb686820
Loading
Loading
Loading
Loading
+18 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
cc_library_shared {
    name: "android.hardware.vibrator@1.0-impl",
    defaults: ["hidl_defaults"],
    proprietary: true,
    vendor: true,
    relative_install_path: "hw",
    srcs: ["Vibrator.cpp"],
    shared_libs: [
@@ -28,3 +28,20 @@ cc_library_shared {
        "android.hardware.vibrator@1.0",
    ],
}

cc_binary {
    name: "android.hardware.vibrator@1.0-service",
    init_rc: ["android.hardware.vibrator@1.0-service.rc"],
    vendor: true,
    relative_install_path: "hw",
    srcs: ["service.cpp"],

    shared_libs: [
        "libhidlbase",
        "libhidltransport",
        "liblog",
        "libutils",
        "libhardware",
        "android.hardware.vibrator@1.0",
    ],
}

vibrator/1.0/default/Android.mk

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line
#
# 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.


LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.vibrator@1.0-service
LOCAL_INIT_RC := android.hardware.vibrator@1.0-service.rc
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
  service.cpp \

LOCAL_SHARED_LIBRARIES := \
  libhidlbase \
  libhidltransport \
  liblog \
  libutils \
  libhardware \
  android.hardware.vibrator@1.0

include $(BUILD_EXECUTABLE)