Merge "Convert Android.mk to Android.bp under redfin/dumpstate" into main
diff --git a/Android.mk b/Android.mk
index c7a4e06..55d2d7e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,8 +14,6 @@
# limitations under the License.
#
-LOCAL_PATH := $(call my-dir)
-
$(eval $(call declare-copy-files-license-metadata,device/google/redfin,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/redfin,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/redfin,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
@@ -31,8 +29,3 @@
$(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-1p-copy-files,device/google/redfin,audio_policy_configuration.xml))
-
-ifeq ($(USES_DEVICE_GOOGLE_REDFIN),true)
- subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
- $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
-endif
diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp
new file mode 100644
index 0000000..1da1bde
--- /dev/null
+++ b/dumpstate/Android.bp
@@ -0,0 +1,48 @@
+//
+// 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.redfin",
+ init_rc: ["android.hardware.dumpstate@1.1-service.redfin.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 e702557..0000000
--- a/dumpstate/Android.mk
+++ /dev/null
@@ -1,44 +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.redfin
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_INIT_RC := android.hardware.dumpstate@1.1-service.redfin.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
-
-include $(BUILD_EXECUTABLE)
