diff options
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | apex/com.google.aosp_cf.rros/Android.bp (renamed from apex/com.google.aosp_cf_phone.rros/Android.bp) | 7 | ||||
-rw-r--r-- | apex/com.google.aosp_cf.rros/apex_manifest.json | 4 | ||||
-rw-r--r-- | apex/com.google.aosp_cf.rros/file_contexts (renamed from apex/com.google.aosp_cf_phone.rros/file_contexts) | 0 | ||||
-rw-r--r-- | apex/com.google.aosp_cf_phone.rros/apex_manifest.json | 4 | ||||
-rw-r--r-- | apex/com.google.aosp_cf_slim.rros/Android.bp | 38 | ||||
-rw-r--r-- | apex/com.google.aosp_cf_slim.rros/apex_manifest.json | 4 | ||||
-rw-r--r-- | apex/com.google.aosp_cf_slim.rros/file_contexts | 2 | ||||
-rw-r--r-- | host/commands/assemble_cvd/flags_defaults.h | 4 | ||||
-rw-r--r-- | host/commands/cvd/selector/instance_database_types.cpp | 9 | ||||
-rw-r--r-- | shared/BoardConfig.mk | 4 | ||||
-rw-r--r-- | shared/device.mk | 8 | ||||
-rw-r--r-- | shared/phone/device_vendor.mk | 4 | ||||
-rw-r--r-- | shared/slim/device_vendor.mk | 7 | ||||
-rwxr-xr-x | tools/launch_cvd_arm64_server.sh | 7 |
15 files changed, 15 insertions, 95 deletions
diff --git a/Android.bp b/Android.bp index e9390b9c4..b1abfe06d 100644 --- a/Android.bp +++ b/Android.bp @@ -97,7 +97,7 @@ soong_config_module_type { name: "cf_cc_defaults", module_type: "cc_defaults", config_namespace: "cvdhost", - bool_variables: ["enforce_mac80211_hwsim", "vhost_user_vsock_by_default"], + bool_variables: ["enforce_mac80211_hwsim"], properties: ["cflags"], } @@ -112,12 +112,6 @@ cf_cc_defaults { cflags: [], } }, - vhost_user_vsock_by_default: { - cflags: ["-DVHOST_USER_VSOCK_BY_DEFAULT=true"], - conditions_default: { - cflags: [], - } - } } } // Defaults for cuttlefish modules that are available only in the guest OS (i.e. cuttlefish running diff --git a/apex/com.google.aosp_cf_phone.rros/Android.bp b/apex/com.google.aosp_cf.rros/Android.bp index 325e1b340..acb3add46 100644 --- a/apex/com.google.aosp_cf_phone.rros/Android.bp +++ b/apex/com.google.aosp_cf.rros/Android.bp @@ -17,19 +17,18 @@ package { } apex { - name: "com.google.aosp_cf_phone.rros", + name: "com.google.aosp_cf.rros", manifest: "apex_manifest.json", key: "com.google.cf.apex.key", certificate: ":com.google.cf.apex.certificate", file_contexts: "file_contexts", - use_vndk_as_stable: true, updatable: false, - // Install the apex in /vendor/apex soc_specific: true, + + // RROs shared across CF-derived devices rros: [ "cuttlefish_overlay_connectivity", "cuttlefish_overlay_frameworks_base_core", "cuttlefish_overlay_settings_provider", - "cuttlefish_phone_overlay_frameworks_base_core", ], } diff --git a/apex/com.google.aosp_cf.rros/apex_manifest.json b/apex/com.google.aosp_cf.rros/apex_manifest.json new file mode 100644 index 000000000..faf4eef25 --- /dev/null +++ b/apex/com.google.aosp_cf.rros/apex_manifest.json @@ -0,0 +1,4 @@ +{ + "name": "com.google.aosp_cf.rros", + "version": 1 +} diff --git a/apex/com.google.aosp_cf_phone.rros/file_contexts b/apex/com.google.aosp_cf.rros/file_contexts index cb7fd8dc3..cb7fd8dc3 100644 --- a/apex/com.google.aosp_cf_phone.rros/file_contexts +++ b/apex/com.google.aosp_cf.rros/file_contexts diff --git a/apex/com.google.aosp_cf_phone.rros/apex_manifest.json b/apex/com.google.aosp_cf_phone.rros/apex_manifest.json deleted file mode 100644 index e5ebe27d7..000000000 --- a/apex/com.google.aosp_cf_phone.rros/apex_manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "com.google.aosp_cf_phone.rros", - "version": 1 -} diff --git a/apex/com.google.aosp_cf_slim.rros/Android.bp b/apex/com.google.aosp_cf_slim.rros/Android.bp deleted file mode 100644 index 1a98d1c2d..000000000 --- a/apex/com.google.aosp_cf_slim.rros/Android.bp +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2022 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. - -soong_namespace { - imports: [ - "device/generic/goldfish", - ], -} - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -apex { - name: "com.google.aosp_cf_slim.rros", - manifest: "apex_manifest.json", - key: "com.google.cf.apex.key", - certificate: ":com.google.cf.apex.certificate", - file_contexts: "file_contexts", - use_vndk_as_stable: true, - updatable: false, - // Install the apex in /vendor/apex - soc_specific: true, - rros: [ - "slim_overlay_frameworks_base_core", - ], -} diff --git a/apex/com.google.aosp_cf_slim.rros/apex_manifest.json b/apex/com.google.aosp_cf_slim.rros/apex_manifest.json deleted file mode 100644 index 26c7bd5b5..000000000 --- a/apex/com.google.aosp_cf_slim.rros/apex_manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "com.google.aosp_cf_slim.rros", - "version": 1 -} diff --git a/apex/com.google.aosp_cf_slim.rros/file_contexts b/apex/com.google.aosp_cf_slim.rros/file_contexts deleted file mode 100644 index cb7fd8dc3..000000000 --- a/apex/com.google.aosp_cf_slim.rros/file_contexts +++ /dev/null @@ -1,2 +0,0 @@ -(/.*)? u:object_r:vendor_file:s0 -/overlay(/.*)? u:object_r:vendor_overlay_file:s0 diff --git a/host/commands/assemble_cvd/flags_defaults.h b/host/commands/assemble_cvd/flags_defaults.h index 207675f63..1ae9e2b52 100644 --- a/host/commands/assemble_cvd/flags_defaults.h +++ b/host/commands/assemble_cvd/flags_defaults.h @@ -42,11 +42,7 @@ #define CF_DEFAULTS_DAEMON false #define CF_DEFAULTS_VM_MANAGER CF_DEFAULTS_DYNAMIC_STRING #define CF_DEFAULTS_VSOCK_GUEST_CID cuttlefish::GetDefaultVsockCid() -#ifdef VHOST_USER_VSOCK_BY_DEFAULT -#define CF_DEFAULTS_VHOST_USER_VSOCK true -#else #define CF_DEFAULTS_VHOST_USER_VSOCK false -#endif // VHOST_USER_VSOCK_BY_DEFAULT #define CF_DEFAULTS_ENABLE_MINIMAL_MODE false #define CF_DEFAULTS_RESTART_SUBPROCESSES false #define CF_DEFAULTS_SETUPWIZARD_MODE "DISABLED" diff --git a/host/commands/cvd/selector/instance_database_types.cpp b/host/commands/cvd/selector/instance_database_types.cpp index 13d9a8617..bb7920e23 100644 --- a/host/commands/cvd/selector/instance_database_types.cpp +++ b/host/commands/cvd/selector/instance_database_types.cpp @@ -16,8 +16,6 @@ #include "host/commands/cvd/selector/instance_database_types.h" -#include <ctime> - #include <android-base/parseint.h> #include <fmt/core.h> @@ -59,12 +57,7 @@ Result<TimeStamp> DeserializeTimePoint(const Json::Value& group_json) { } std::string Format(const TimeStamp& time_point) { - time_t time = std::chrono::system_clock::to_time_t(time_point); - std::string ctime_str = std::ctime(&time); - if (!ctime_str.empty() && (*ctime_str.rbegin() == '\n')) { - ctime_str.pop_back(); - } - return ctime_str; + return fmt::format("{:%b-%d-%Y %H:%M:%S}", time_point); } } // namespace selector diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index 2281b1d9c..55a6d74e7 100644 --- a/shared/BoardConfig.mk +++ b/shared/BoardConfig.mk @@ -424,7 +424,3 @@ endif ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE), false) AB_OTA_PARTITIONS += vbmeta endif - -ifeq ($(TARGET_ARCH),arm64) -$(call soong_config_append,cvdhost,vhost_user_vsock_by_default,true) -endif
\ No newline at end of file diff --git a/shared/device.mk b/shared/device.mk index c65e1404a..e73ffe100 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -180,13 +180,7 @@ PRODUCT_PACKAGES += \ hidl_lazy_cb_test_server # Runtime Resource Overlays -ifneq ($(LOCAL_PREFER_VENDOR_APEX),true) -PRODUCT_PACKAGES += \ - cuttlefish_overlay_connectivity \ - cuttlefish_overlay_frameworks_base_core \ - cuttlefish_overlay_settings_provider - -endif +PRODUCT_PACKAGES += com.google.aosp_cf.rros # # Satellite vendor service for CF diff --git a/shared/phone/device_vendor.mk b/shared/phone/device_vendor.mk index 5c07ef1b1..3c08d388b 100644 --- a/shared/phone/device_vendor.mk +++ b/shared/phone/device_vendor.mk @@ -62,11 +62,7 @@ PRODUCT_COPY_FILES += \ DEVICE_PACKAGE_OVERLAYS += device/google/cuttlefish/shared/phone/overlay # Runtime Resource Overlays -ifeq ($(LOCAL_PREFER_VENDOR_APEX),true) -PRODUCT_PACKAGES += com.google.aosp_cf_phone.rros -else PRODUCT_PACKAGES += cuttlefish_phone_overlay_frameworks_base_core -endif # NFC AIDL HAL PRODUCT_PACKAGES += \ diff --git a/shared/slim/device_vendor.mk b/shared/slim/device_vendor.mk index f7b2962c2..63005bb18 100644 --- a/shared/slim/device_vendor.mk +++ b/shared/slim/device_vendor.mk @@ -51,16 +51,9 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.faketouch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.faketouch.xml \ - # Runtime Resource Overlays -ifeq ($(LOCAL_PREFER_VENDOR_APEX),true) -PRODUCT_PACKAGES += \ - com.google.aosp_cf_phone.rros \ - com.google.aosp_cf_slim.rros -else PRODUCT_PACKAGES += \ cuttlefish_phone_overlay_frameworks_base_core \ slim_overlay_frameworks_base_core -endif TARGET_BOARD_INFO_FILE ?= device/google/cuttlefish/shared/slim/android-info.txt diff --git a/tools/launch_cvd_arm64_server.sh b/tools/launch_cvd_arm64_server.sh index 6c429bb3b..60c7a4966 100755 --- a/tools/launch_cvd_arm64_server.sh +++ b/tools/launch_cvd_arm64_server.sh @@ -87,10 +87,13 @@ echo -e "Web UI port: $web_ui_port. ${color_cyan}Please point your browser to ht # sets up SSH port forwarding to the remote server for various ports and launch cvd instance adb_port_forwarding="" +print_launcher_logs="" for instance_num in $(seq $base_instance_num $(($base_instance_num+$num_instances-1))); do + device_name="cvd_$base_instance_num-$instance_num" adb_port=$((6520+$instance_num-1)) - echo -e "Device-$instance_num is using adb port $adb_port. Try ${color_cyan}adb connect 127.0.0.1:${adb_port}${color_plain} if you want to connect to this device" + echo -e "$device_name is using adb port $adb_port. Try ${color_cyan}adb connect 127.0.0.1:${adb_port}${color_plain} if you want to connect to this device" adb_port_forwarding+="-L $adb_port:127.0.0.1:$adb_port " + print_launcher_logs+="tail -f ~/$cvd_home_dir/cuttlefish/instances/cvd-$instance_num/logs/launcher.log | sed 's/^/[$device_name] /' &" done ports_forwarding="-L $web_ui_port:127.0.0.1:1443 \ @@ -100,4 +103,4 @@ ports_forwarding="-L $web_ui_port:127.0.0.1:1443 \ $adb_port_forwarding" echo "Set up ssh ports forwarding: $ports_forwarding" echo -e "${color_yellow}Please stop the running instances by ctrl+c${color_plain}" -ssh -N $server $ports_forwarding +ssh $server $ports_forwarding $print_launcher_logs |