Migrate vsoc_input_service's Android.mk to Android.bp
Bug: 112001976
Test: m vsoc_input_service
Change-Id: I073dfc83bc5607435677e1c104db96f3f0793acf
diff --git a/guest/commands/Android.bp b/guest/commands/Android.bp
index d9f89f7..df15067 100644
--- a/guest/commands/Android.bp
+++ b/guest/commands/Android.bp
@@ -18,4 +18,5 @@
"ip_link_add",
"usbforward",
"vport_trigger",
+ "vsoc_input_service",
]
diff --git a/guest/commands/vsoc_input_service/Android.bp b/guest/commands/vsoc_input_service/Android.bp
new file mode 100644
index 0000000..76aae19
--- /dev/null
+++ b/guest/commands/vsoc_input_service/Android.bp
@@ -0,0 +1,35 @@
+//
+// Copyright (C) 2019 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: "vsoc_input_service",
+ srcs: [
+ "main.cpp",
+ "virtual_device_base.cpp",
+ "virtual_power_button.cpp",
+ "virtual_keyboard.cpp",
+ "virtual_touchscreen.cpp",
+ "vsoc_input_service.cpp",
+ ],
+ shared_libs: [
+ "cuttlefish_auto_resources",
+ "libcuttlefish_fs",
+ "libbase",
+ "liblog",
+ "vsoc_lib",
+ ],
+ defaults: ["cuttlefish_guest_only"]
+}
diff --git a/guest/commands/vsoc_input_service/Android.mk b/guest/commands/vsoc_input_service/Android.mk
deleted file mode 100644
index 2256ba5..0000000
--- a/guest/commands/vsoc_input_service/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := vsoc_input_service
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- virtual_device_base.cpp \
- virtual_power_button.cpp \
- virtual_keyboard.cpp \
- virtual_touchscreen.cpp \
- vsoc_input_service.cpp \
- main.cpp
-
-LOCAL_C_INCLUDES := \
- device/google/cuttlefish_common \
- device/google/cuttlefish_kernel
-
-LOCAL_SHARED_LIBRARIES := \
- cuttlefish_auto_resources \
- libcuttlefish_fs \
- libbase \
- liblog \
- vsoc_lib
-
-LOCAL_CFLAGS += -DLOG_TAG=\"VSoCInputService\" \
- -Wall -Werror
-
-LOCAL_MULTILIB := first
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_EXECUTABLE)