diff options
author | kellyhung <kellyhung@google.com> | 2023-11-20 08:50:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-20 08:50:55 +0000 |
commit | c7c0336d8abb0a65acf8e33c18890906523709c2 (patch) | |
tree | 0127ac3eb0674f3037087637e85987eb3039af20 | |
parent | 41d783e73b6348287ddf8980d8946f426fccc4b0 (diff) | |
parent | 397130afd0ef7925ab6e759ded562e20a4866da4 (diff) | |
download | barbet-c7c0336d8abb0a65acf8e33c18890906523709c2.tar.gz |
Convert Android.mk under device/google/barbet/dumpstate/ to Android.bp am: 9e6514e45f am: 7aae75aa78 am: 397130afd0
Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2834230
Change-Id: Ie07c86857ae5988b52b19bb858a668c004c85a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | dumpstate/Android.bp | 47 | ||||
-rw-r--r-- | dumpstate/Android.mk | 46 |
2 files changed, 47 insertions, 46 deletions
diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp new file mode 100644 index 0000000..1138f50 --- /dev/null +++ b/dumpstate/Android.bp @@ -0,0 +1,47 @@ +// +// Copyright 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. +// + +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +cc_binary { + name: "android.hardware.dumpstate@1.1-service.barbet", + init_rc: ["android.hardware.dumpstate@1.1-service.barbet.rc"], + relative_install_path: "hw", + srcs: [ + "DumpstateDevice.cpp", + "service.cpp", + ], + shared_libs: [ + "android.hardware.dumpstate@1.0", + "android.hardware.dumpstate@1.1", + "libbase", + "libcutils", + "libdumpstateutil", + "libhidlbase", + "liblog", + "libutils", + ], + cflags: [ + "-Werror", + "-Wall", + ], + proprietary: true, +} diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk deleted file mode 100644 index 4d9ca90..0000000 --- a/dumpstate/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright 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.dumpstate@1.1-service.barbet -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_INIT_RC := android.hardware.dumpstate@1.1-service.barbet.rc -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_SRC_FILES := \ - DumpstateDevice.cpp \ - service.cpp - -LOCAL_SHARED_LIBRARIES := \ - android.hardware.dumpstate@1.0 \ - android.hardware.dumpstate@1.1 \ - libbase \ - libcutils \ - libdumpstateutil \ - libhidlbase \ - liblog \ - libutils - -LOCAL_CFLAGS := -Werror -Wall - -LOCAL_MODULE_TAGS := optional -LOCAL_PROPRIETARY_MODULE := true - -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -include $(BUILD_EXECUTABLE) |