commit | 2233bd5f71220d0afc10f3592a3d2f52dbc97efe | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 17 13:33:56 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 17 13:33:56 2019 +0000 |
tree | 3575d95b1f6464cb1476e6738c86f563921225a1 | |
parent | 1074333b007da0126a9b828ab75877946fdd2ed0 [diff] | |
parent | 858d8c807afb3ef775f235200e809f766386aec6 [diff] |
Merge "Rename VSoCService as CuttlefishService" into cuttlefish-testing
diff --git a/guest/monitoring/vsoc_service/Android.mk b/guest/monitoring/cuttlefish_service/Android.mk similarity index 95% rename from guest/monitoring/vsoc_service/Android.mk rename to guest/monitoring/cuttlefish_service/Android.mk index 2f30405..d1baf7d 100644 --- a/guest/monitoring/vsoc_service/Android.mk +++ b/guest/monitoring/cuttlefish_service/Android.mk
@@ -19,7 +19,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, java) LOCAL_STATIC_JAVA_LIBRARIES := guava -LOCAL_PACKAGE_NAME := VSoCService +LOCAL_PACKAGE_NAME := CuttlefishService LOCAL_SDK_VERSION := 28 LOCAL_PROGUARD_FLAGS := -include build/core/proguard.flags LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/guest/monitoring/vsoc_service/AndroidManifest.xml b/guest/monitoring/cuttlefish_service/AndroidManifest.xml similarity index 100% rename from guest/monitoring/vsoc_service/AndroidManifest.xml rename to guest/monitoring/cuttlefish_service/AndroidManifest.xml
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/BluetoothChecker.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/BluetoothChecker.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/BluetoothChecker.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/BluetoothChecker.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/BootReporter.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/BootReporter.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/BootReporter.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/BootReporter.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/ConnectivityChecker.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/ConnectivityChecker.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/ConnectivityChecker.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/ConnectivityChecker.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceBroadcastReceiver.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/GceBroadcastReceiver.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceBroadcastReceiver.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/GceBroadcastReceiver.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceFuture.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/GceFuture.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceFuture.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/GceFuture.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceService.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/GceService.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceService.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/GceService.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceWifiManager.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/GceWifiManager.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/GceWifiManager.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/GceWifiManager.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobBase.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/JobBase.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobBase.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/JobBase.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/JobExecutor.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/JobExecutor.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/LocationServicesManager.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/LocationServicesManager.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/LocationServicesManager.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/LocationServicesManager.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/PackageVerificationConsentEnforcer.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/PackageVerificationConsentEnforcer.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/PackageVerificationConsentEnforcer.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/PackageVerificationConsentEnforcer.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/PackageVerifierManager.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/PackageVerifierManager.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/PackageVerifierManager.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/PackageVerifierManager.java
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/TombstoneChecker.java b/guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/TombstoneChecker.java similarity index 100% rename from guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/TombstoneChecker.java rename to guest/monitoring/cuttlefish_service/java/com/android/google/gce/gceservice/TombstoneChecker.java
diff --git a/guest/monitoring/vsoc_service/proguard.flags b/guest/monitoring/cuttlefish_service/proguard.flags similarity index 100% rename from guest/monitoring/vsoc_service/proguard.flags rename to guest/monitoring/cuttlefish_service/proguard.flags