diff options
| author | Steven Moreland <smoreland@google.com> | 2017-10-05 17:38:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-05 17:38:27 +0000 |
| commit | de0074027161fd5923be46efd7745d7665811fd5 (patch) | |
| tree | 42cb56829b7807946aa81b880f1a8eeef90057d7 /usb | |
| parent | 08853ff3ae5c27aaa57d5d448523477c5fb798c9 (diff) | |
| parent | 16b3e062ce199709d483b0033f510114270300c8 (diff) | |
| download | android_hardware_interfaces-de0074027161fd5923be46efd7745d7665811fd5.tar.gz android_hardware_interfaces-de0074027161fd5923be46efd7745d7665811fd5.tar.bz2 android_hardware_interfaces-de0074027161fd5923be46efd7745d7665811fd5.zip | |
Merge "Convert usb service .mk -> .bp."
am: 16b3e062ce
Change-Id: Ic8011399e470a1c62156c656a0ea1987ed999382
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/1.0/default/Android.bp | 34 | ||||
| -rw-r--r-- | usb/1.0/default/Android.mk | 21 | ||||
| -rw-r--r-- | usb/Android.bp | 1 |
3 files changed, 35 insertions, 21 deletions
diff --git a/usb/1.0/default/Android.bp b/usb/1.0/default/Android.bp new file mode 100644 index 000000000..2ebe61fde --- /dev/null +++ b/usb/1.0/default/Android.bp @@ -0,0 +1,34 @@ +// 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_binary { + name: "android.hardware.usb@1.0-service", + init_rc: ["android.hardware.usb@1.0-service.rc"], + relative_install_path: "hw", + vendor: true, + srcs: [ + "service.cpp", + "Usb.cpp", + ], + + shared_libs: [ + "libcutils", + "libhidlbase", + "libhidltransport", + "liblog", + "libutils", + "libhardware", + "android.hardware.usb@1.0", + ], +} diff --git a/usb/1.0/default/Android.mk b/usb/1.0/default/Android.mk deleted file mode 100644 index afd53cfc7..000000000 --- a/usb/1.0/default/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.usb@1.0-service -LOCAL_INIT_RC := android.hardware.usb@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - Usb.cpp - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libhidlbase \ - libhidltransport \ - liblog \ - libutils \ - libhardware \ - android.hardware.usb@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/usb/Android.bp b/usb/Android.bp index 5cacbf341..a5415df34 100644 --- a/usb/Android.bp +++ b/usb/Android.bp @@ -1,6 +1,7 @@ // This is an autogenerated file, do not edit. subdirs = [ "1.0", + "1.0/default", "1.0/vts/functional", "1.1", "1.1/vts/functional", |