diff options
author | Ryan Campbell <ryanjcampbell@google.com> | 2017-07-27 10:39:14 -0700 |
---|---|---|
committer | Ryan Campbell <ryanjcampbell@google.com> | 2017-07-27 10:39:14 -0700 |
commit | ee2cc179cdf897e4576dcd24dfb2ebd70bdbe8f1 (patch) | |
tree | 93ccc7b4a7e0bacd258f4939bdd529474f104fe1 /light | |
parent | 985907ae0b228b87d55c9768536ebd71522ce21e (diff) | |
download | android_hardware_interfaces-ee2cc179cdf897e4576dcd24dfb2ebd70bdbe8f1.tar.gz android_hardware_interfaces-ee2cc179cdf897e4576dcd24dfb2ebd70bdbe8f1.tar.bz2 android_hardware_interfaces-ee2cc179cdf897e4576dcd24dfb2ebd70bdbe8f1.zip |
Convert android.hardware.light@2.0 to soong.
Convert both the *-impl.so and the *-service to be built with Soong
instead of make.
Test: cd hardware/interfaces/light && mma -j60
Bug: 37512442
Change-Id: I15c4779a7c9eea39fb20746f69800dcf20670275
Diffstat (limited to 'light')
-rw-r--r-- | light/2.0/default/Android.bp | 53 | ||||
-rw-r--r-- | light/2.0/default/Android.mk | 44 | ||||
-rw-r--r-- | light/Android.bp | 1 |
3 files changed, 54 insertions, 44 deletions
diff --git a/light/2.0/default/Android.bp b/light/2.0/default/Android.bp new file mode 100644 index 000000000..8d4eca1d3 --- /dev/null +++ b/light/2.0/default/Android.bp @@ -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", + ], + +}
\ 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 1f44e6643..000000000 --- a/light/2.0/default/Android.mk +++ /dev/null @@ -1,44 +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_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_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.light@2.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/light/Android.bp b/light/Android.bp index 8d2c98674..654bb808d 100644 --- a/light/Android.bp +++ b/light/Android.bp @@ -1,5 +1,6 @@ // This is an autogenerated file, do not edit. subdirs = [ "2.0", + "2.0/default", "2.0/vts/functional", ] |