summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 85bb01d)
raw | patch | inline | side by side (parent: 85bb01d)
author | Steven Moreland <smoreland@google.com> | |
Wed, 4 Oct 2017 23:07:57 +0000 (16:07 -0700) | ||
committer | Steven Moreland <smoreland@google.com> | |
Wed, 4 Oct 2017 23:08:30 +0000 (16:08 -0700) |
vibrator/1.0/default/Android.bp | patch | blob | history | |
vibrator/1.0/default/Android.mk | [deleted file] | patch | blob | history |
index d4200da2cbfc27daf8f674a80d3a13305a6aea4c..9170b39db3f3168c0281332da31c9d0f7e97808c 100644 (file)
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: [
"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",
+ ],
+}
diff --git a/vibrator/1.0/default/Android.mk b/vibrator/1.0/default/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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)