Moves socket_forward_proxy from commands/ to frontend/
Test: all good on gce-dev
Change-Id: Id9c60b0730a6ccba25cc8713f7dc7c7cb6db4415
diff --git a/common/Android.bp b/common/Android.bp
index 646ec16..2280c23 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -15,5 +15,6 @@
subdirs = [
"commands",
+ "frontend",
"libs",
]
diff --git a/common/commands/Android.bp b/common/commands/Android.bp
index 4c9bc69..70311b6 100644
--- a/common/commands/Android.bp
+++ b/common/commands/Android.bp
@@ -14,6 +14,5 @@
// limitations under the License.
subdirs = [
- "socket_forward_proxy",
"wificlient",
]
diff --git a/common/commands/socket_forward_proxy/Android.bp b/common/commands/socket_forward_proxy/Android.bp
deleted file mode 100644
index 53069f6..0000000
--- a/common/commands/socket_forward_proxy/Android.bp
+++ /dev/null
@@ -1,26 +0,0 @@
-cc_binary {
- name: "socket_forward_proxy",
- srcs: [
- "main.cpp",
- ],
- shared_libs: [
- "libbase",
- "libcuttlefish_fs",
- "vsoc_lib",
- "liblog",
- ],
- static_libs: [
- "libgflags",
- ],
- header_libs: [
- "cuttlefish_glog",
- ],
- target: {
- linux_glibc: {
- static_libs: [
- "libcuttlefish_host_config",
- ],
- },
- },
- defaults: ["cuttlefish_host_and_guest", "cuttlefish_native_isa"]
-}
diff --git a/common/frontend/Android.bp b/common/frontend/Android.bp
new file mode 100644
index 0000000..8021915
--- /dev/null
+++ b/common/frontend/Android.bp
@@ -0,0 +1,18 @@
+//
+// Copyright (C) 2018 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.
+
+subdirs = [
+ "socket_forward_proxy",
+]
diff --git a/common/frontend/socket_forward_proxy/Android.bp b/common/frontend/socket_forward_proxy/Android.bp
new file mode 100644
index 0000000..f8fd78f
--- /dev/null
+++ b/common/frontend/socket_forward_proxy/Android.bp
@@ -0,0 +1,41 @@
+//
+// Copyright (C) 2018 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: "socket_forward_proxy",
+ srcs: [
+ "main.cpp",
+ ],
+ shared_libs: [
+ "libbase",
+ "libcuttlefish_fs",
+ "vsoc_lib",
+ "liblog",
+ ],
+ static_libs: [
+ "libgflags",
+ ],
+ header_libs: [
+ "cuttlefish_glog",
+ ],
+ target: {
+ linux_glibc: {
+ static_libs: [
+ "libcuttlefish_host_config",
+ ],
+ },
+ },
+ defaults: ["cuttlefish_host_and_guest", "cuttlefish_native_isa"]
+}
diff --git a/common/commands/socket_forward_proxy/main.cpp b/common/frontend/socket_forward_proxy/main.cpp
similarity index 100%
rename from common/commands/socket_forward_proxy/main.cpp
rename to common/frontend/socket_forward_proxy/main.cpp
