diff options
-rw-r--r-- | README.md | 41 | ||||
-rw-r--r-- | host_package.mk | 1 | ||||
-rw-r--r-- | shared/BoardConfig.mk | 8 | ||||
-rw-r--r-- | shared/device.mk | 10 | ||||
-rw-r--r-- | shared/sepolicy/vendor/file_contexts | 2 |
5 files changed, 52 insertions, 10 deletions
diff --git a/README.md b/README.md new file mode 100644 index 000000000..232cc776f --- /dev/null +++ b/README.md @@ -0,0 +1,41 @@ +# So you want to try cuttlefish? + +1. Go to http://ci.android.com/ +2. Enter a branch name. Start with `aosp-master` if you don't know what you're + looking for +3. Navigate to `aosp_cf_x86_phone` and click on `userdebug` for the latest build +4. Click on `Artifacts` +5. Scroll down to the OTA images. These packages look like + `aosp_cf_x86_phone-img-xxxxxx.zip` -- it will always have `img` in the name. + Download this file +6. Scroll down to `cvd-host_package.tar.gz`. You should always download a host + package from the same build as your images. +7. On your local system, combine the packages: + + `$ mkdir cf` + `$ cd cf` + `$ tar xvf /path/to/cvd-host_package.tar.gz` + `$ unzip /path/to/aosp_cf_x86_phone-img-xxxxxx.zip` + +8. Launch cuttlefish with: + + `$ HOME=$PWD ./bin/launch_cvd` + +9. Stop cuttlefish with: + + `$ HOME=$PWD ./bin/stop_cvd` + +# So you want to debug cuttlefish? + +You can use `adb` to debug it, just like a physical device: + + `$ ./bin/adb -e shell` + +# So you want to see cuttlefish? + +You can use the [TightVNC JViewer](https://www.tightvnc.com/download.php). Once +you have downloaded the *TightVNC Java Viewer JAR in a ZIP archive*, run it with + + `$ java -jar tightvnc-jviewer.jar -ScalingFactor=50 -Tunneling=no -host=localhost -port=6444` + +Click "Connect" and you should see a lock screen! diff --git a/host_package.mk b/host_package.mk index 815af3b07..cd47c1e97 100644 --- a/host_package.mk +++ b/host_package.mk @@ -86,6 +86,7 @@ cvd_host_shared_libraries := \ libcuttlefish_device_config.so \ cdisk_spec.so \ libprotobuf-cpp-full.so \ + libziparchive.so \ cvd_host_package_files := \ diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index d41ef0e8d..97a073f25 100644 --- a/shared/BoardConfig.mk +++ b/shared/BoardConfig.mk @@ -60,8 +60,8 @@ TARGET_USES_HWC2 := true # The compiler will occasionally generate movaps, etc. BOARD_MALLOC_ALIGNMENT := 16 -# Make the userdata partition 4G to accomodate ASAN and CTS -BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296 +# Make the userdata partition 4.25G to accomodate ASAN and CTS +BOARD_USERDATAIMAGE_PARTITION_SIZE := 4563402752 # Cache partition size: 64M BOARD_CACHEIMAGE_PARTITION_SIZE := 67108864 @@ -140,10 +140,10 @@ TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888 TARGET_RECOVERY_FSTAB ?= device/google/cuttlefish/shared/config/fstab -BOARD_SUPER_PARTITION_SIZE := 6442450944 +BOARD_SUPER_PARTITION_SIZE := 6174015488 BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := system vendor product system_ext -BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 6442450944 +BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 6174015488 BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE := true TARGET_RELEASETOOLS_EXTENSIONS := device/google/cuttlefish/shared diff --git a/shared/device.mk b/shared/device.mk index e626c8680..cd64ef507 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -307,11 +307,11 @@ PRODUCT_PACKAGES += \ # NeuralNetworks HAL # PRODUCT_PACKAGES += \ - android.hardware.neuralnetworks@1.2-service-sample-all \ - android.hardware.neuralnetworks@1.2-service-sample-float-fast \ - android.hardware.neuralnetworks@1.2-service-sample-float-slow \ - android.hardware.neuralnetworks@1.2-service-sample-minimal \ - android.hardware.neuralnetworks@1.2-service-sample-quant + android.hardware.neuralnetworks@1.3-service-sample-all \ + android.hardware.neuralnetworks@1.3-service-sample-float-fast \ + android.hardware.neuralnetworks@1.3-service-sample-float-slow \ + android.hardware.neuralnetworks@1.3-service-sample-minimal \ + android.hardware.neuralnetworks@1.3-service-sample-quant # # USB diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts index 69c5ad886..876e09a6f 100644 --- a/shared/sepolicy/vendor/file_contexts +++ b/shared/sepolicy/vendor/file_contexts @@ -60,7 +60,7 @@ /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0 /vendor/bin/hw/android\.hardware\.health@2\.0-service\.cuttlefish u:object_r:hal_health_default_exec:s0 /vendor/bin/hw/android\.hardware\.health\.storage@1\.0-service\.cuttlefish u:object_r:hal_health_storage_default_exec:s0 -/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-sample-.* u:object_r:hal_neuralnetworks_sample_exec:s0 +/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-sample-.* u:object_r:hal_neuralnetworks_sample_exec:s0 /vendor/bin/hw/android\.hardware\.vibrator@1\.3-service\.example u:object_r:hal_vibrator_default_exec:s0 /vendor/bin/hw/android\.hardware\.tv\.cec@1\.0-service\.mock u:object_r:hal_tv_cec_mock_exec:s0 /vendor/bin/ip_link_add u:object_r:ip_link_add_exec:s0 |