diff options
author | Steven Moreland <smoreland@google.com> | 2017-11-07 21:21:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-07 21:21:40 +0000 |
commit | 26013bf6aca79fdb10c745b74cfd6aab948ca20d (patch) | |
tree | df4b2907117f403ff05b442cbafc694e2c07fe7b /thermal | |
parent | eb4eba96c9547e3562bc8d8321471441658fb6f5 (diff) | |
parent | 72c720a4e368f77729d849b766f34f3609d877da (diff) | |
download | platform_hardware_interfaces-26013bf6aca79fdb10c745b74cfd6aab948ca20d.tar.gz platform_hardware_interfaces-26013bf6aca79fdb10c745b74cfd6aab948ca20d.tar.bz2 platform_hardware_interfaces-26013bf6aca79fdb10c745b74cfd6aab948ca20d.zip |
Merge "Automatic mk -> bp." am: e5fd969f19
am: 72c720a4e3
Change-Id: Icfc8b46117e94461906806023852836a0ace3a55
Diffstat (limited to 'thermal')
-rw-r--r-- | thermal/1.0/default/Android.bp | 37 | ||||
-rw-r--r-- | thermal/1.0/default/Android.mk | 39 |
2 files changed, 36 insertions, 40 deletions
diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp index 1510509c39..2054b88f70 100644 --- a/thermal/1.0/default/Android.bp +++ b/thermal/1.0/default/Android.bp @@ -1,7 +1,22 @@ +// +// 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. + cc_library_shared { name: "android.hardware.thermal@1.0-impl", defaults: ["hidl_defaults"], - proprietary: true, + vendor: true, relative_install_path: "hw", srcs: ["Thermal.cpp"], shared_libs: [ @@ -16,3 +31,23 @@ cc_library_shared { "android.hardware.thermal@1.0", ], } + +cc_binary { + name: "android.hardware.thermal@1.0-service", + relative_install_path: "hw", + vendor: true, + init_rc: ["android.hardware.thermal@1.0-service.rc"], + srcs: ["service.cpp"], + + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libbase", + "libutils", + "libhardware", + "libhidlbase", + "libhidltransport", + "android.hardware.thermal@1.0", + ], +} diff --git a/thermal/1.0/default/Android.mk b/thermal/1.0/default/Android.mk deleted file mode 100644 index 113020a8b8..0000000000 --- a/thermal/1.0/default/Android.mk +++ /dev/null @@ -1,39 +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_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.thermal@1.0-service -LOCAL_INIT_RC := android.hardware.thermal@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.thermal@1.0 \ - -include $(BUILD_EXECUTABLE) |