Relocate code to make layout conform to our site.
Changes reflect only include path location change.
https://g3doc.corp.google.com/cloud/android/g3doc/developers/code-organization.md
Change-Id: I291f32222983705b0cf4a50c7a1339fe5e95ca2b
diff --git a/guest/usbforward/Android.mk b/guest/commands/usbforward/Android.mk
similarity index 100%
rename from guest/usbforward/Android.mk
rename to guest/commands/usbforward/Android.mk
diff --git a/guest/usbforward/BUILD b/guest/commands/usbforward/BUILD
similarity index 100%
rename from guest/usbforward/BUILD
rename to guest/commands/usbforward/BUILD
diff --git a/guest/usbforward/main.cpp b/guest/commands/usbforward/main.cpp
similarity index 95%
rename from guest/usbforward/main.cpp
rename to guest/commands/usbforward/main.cpp
index 34bf322..92b90ff 100644
--- a/guest/usbforward/main.cpp
+++ b/guest/commands/usbforward/main.cpp
@@ -18,7 +18,7 @@
#include <libusb/libusb.h>
#include "common/libs/fs/shared_fd.h"
-#include "guest/usbforward/usb_server.h"
+#include "guest/commands/usbforward/usb_server.h"
int main(int argc, char* argv[]) {
if (argc == 1) {
diff --git a/guest/usbforward/protocol.h b/guest/commands/usbforward/protocol.h
similarity index 100%
rename from guest/usbforward/protocol.h
rename to guest/commands/usbforward/protocol.h
diff --git a/guest/usbforward/transport_request.cpp b/guest/commands/usbforward/transport_request.cpp
similarity index 97%
rename from guest/usbforward/transport_request.cpp
rename to guest/commands/usbforward/transport_request.cpp
index 894c024..9f994e9 100644
--- a/guest/usbforward/transport_request.cpp
+++ b/guest/commands/usbforward/transport_request.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "guest/usbforward/transport_request.h"
+#include "guest/commands/usbforward/transport_request.h"
#include <cutils/log.h>
@@ -84,4 +84,4 @@
treq->callback_(req->status == 0, treq->Buffer(), req->actual_length);
}
-} // namespace usb_forward
\ No newline at end of file
+} // namespace usb_forward
diff --git a/guest/usbforward/transport_request.h b/guest/commands/usbforward/transport_request.h
similarity index 97%
rename from guest/usbforward/transport_request.h
rename to guest/commands/usbforward/transport_request.h
index 38dba89..6068c98 100644
--- a/guest/usbforward/transport_request.h
+++ b/guest/commands/usbforward/transport_request.h
@@ -20,7 +20,7 @@
#include <stdint.h>
#include <libusb/libusb.h>
-#include "guest/usbforward/protocol.h"
+#include "guest/commands/usbforward/protocol.h"
namespace usb_forward {
@@ -67,4 +67,4 @@
TransportRequest& operator=(const TransportRequest& other) = delete;
};
-} // namespace usb_forward
\ No newline at end of file
+} // namespace usb_forward
diff --git a/guest/usbforward/usb_server.cpp b/guest/commands/usbforward/usb_server.cpp
similarity index 98%
rename from guest/usbforward/usb_server.cpp
rename to guest/commands/usbforward/usb_server.cpp
index 13a0887..2f89155 100644
--- a/guest/usbforward/usb_server.cpp
+++ b/guest/commands/usbforward/usb_server.cpp
@@ -15,7 +15,7 @@
*/
// #undef NDEBUG
-#include "guest/usbforward/usb_server.h"
+#include "guest/commands/usbforward/usb_server.h"
#include <string>
#include <vector>
@@ -23,8 +23,8 @@
#include <cutils/log.h>
#include <libusb/libusb.h>
#include "common/libs/fs/shared_select.h"
-#include "guest/usbforward/protocol.h"
-#include "guest/usbforward/transport_request.h"
+#include "guest/commands/usbforward/protocol.h"
+#include "guest/commands/usbforward/transport_request.h"
namespace usb_forward {
namespace {
diff --git a/guest/usbforward/usb_server.h b/guest/commands/usbforward/usb_server.h
similarity index 97%
rename from guest/usbforward/usb_server.h
rename to guest/commands/usbforward/usb_server.h
index e79156d..821026a 100644
--- a/guest/usbforward/usb_server.h
+++ b/guest/commands/usbforward/usb_server.h
@@ -22,7 +22,7 @@
#include "common/libs/fs/shared_fd.h"
#include "common/libs/threads/pthread.h"
-#include "guest/usbforward/transport_request.h"
+#include "guest/commands/usbforward/transport_request.h"
namespace usb_forward {
diff --git a/guest/ril/Android.mk b/guest/hals/ril/Android.mk
similarity index 100%
rename from guest/ril/Android.mk
rename to guest/hals/ril/Android.mk
diff --git a/guest/ril/vsoc_ril.cpp b/guest/hals/ril/vsoc_ril.cpp
similarity index 99%
rename from guest/ril/vsoc_ril.cpp
rename to guest/hals/ril/vsoc_ril.cpp
index 2479c34..ff5b15f 100644
--- a/guest/ril/vsoc_ril.cpp
+++ b/guest/hals/ril/vsoc_ril.cpp
@@ -14,7 +14,7 @@
** limitations under the License.
*/
-#include "guest/ril/vsoc_ril.h"
+#include "guest/hals/ril/vsoc_ril.h"
#include <string.h>
#include <time.h>
diff --git a/guest/ril/vsoc_ril.h b/guest/hals/ril/vsoc_ril.h
similarity index 100%
rename from guest/ril/vsoc_ril.h
rename to guest/hals/ril/vsoc_ril.h
diff --git a/guest/vsoc_service/Android.mk b/guest/monitoring/vsoc_service/Android.mk
similarity index 100%
rename from guest/vsoc_service/Android.mk
rename to guest/monitoring/vsoc_service/Android.mk
diff --git a/guest/vsoc_service/AndroidManifest.xml b/guest/monitoring/vsoc_service/AndroidManifest.xml
similarity index 100%
rename from guest/vsoc_service/AndroidManifest.xml
rename to guest/monitoring/vsoc_service/AndroidManifest.xml
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/BluetoothChecker.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/BluetoothChecker.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/BluetoothChecker.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/BluetoothChecker.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/BootReporter.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/BootReporter.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/BootReporter.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/BootReporter.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/ConnectivityChecker.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/ConnectivityChecker.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/ConnectivityChecker.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/ConnectivityChecker.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/GceBroadcastReceiver.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceBroadcastReceiver.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/GceBroadcastReceiver.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceBroadcastReceiver.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/GceFuture.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceFuture.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/GceFuture.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceFuture.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/GceService.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceService.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/GceService.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceService.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/GceWifiManager.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceWifiManager.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/GceWifiManager.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceWifiManager.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/JobBase.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobBase.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/JobBase.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobBase.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/LocationServicesManager.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/LocationServicesManager.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/LocationServicesManager.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/LocationServicesManager.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/PackageVerificationConsentEnforcer.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/PackageVerificationConsentEnforcer.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/PackageVerificationConsentEnforcer.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/PackageVerificationConsentEnforcer.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/PackageVerifierManager.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/PackageVerifierManager.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/PackageVerifierManager.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/PackageVerifierManager.java
diff --git a/guest/vsoc_service/java/com/android/google/gce/gceservice/TombstoneChecker.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/TombstoneChecker.java
similarity index 100%
rename from guest/vsoc_service/java/com/android/google/gce/gceservice/TombstoneChecker.java
rename to guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/TombstoneChecker.java
diff --git a/guest/vsoc_service/proguard.flags b/guest/monitoring/vsoc_service/proguard.flags
similarity index 100%
rename from guest/vsoc_service/proguard.flags
rename to guest/monitoring/vsoc_service/proguard.flags
