summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-11Snap for 6001391 from 3f5327ec7edd8e6005403b21324e720bf4dbdf0c to ↵android-mainline-10.0.0_r6android10-mainline-networking-releaseandroid-build-team Robot
qt-aml-networking-release Change-Id: If79a8c6cc173dc2da01029a3e8805d05c4c8fde6
2019-11-08Merge "Only get ".img" files from ANDROID_PRODUCT_OUT" am: 3b821daa1eCody Schuffelen
am: f3a7a5eeb4 Change-Id: I2b996a83c639cf30c445cbda303b94d3d4f64cd4
2019-11-08Merge "Only get ".img" files from ANDROID_PRODUCT_OUT"Cody Schuffelen
am: 3b821daa1e Change-Id: Ib7455bd3a851c08f1c6906f770f32b81589173c3
2019-11-09Merge "Only get ".img" files from ANDROID_PRODUCT_OUT"Treehugger Robot
2019-11-08Merge changes from topic "schuffelen-cf-2019-11-05-qemu-input" am: feed8df381Cody Schuffelen
am: b66ba3fe9f Change-Id: Ia22fefc59945117d7bcef757531c2077871392cf
2019-11-08Merge changes from topic "schuffelen-cf-2019-11-05-qemu-input"Cody Schuffelen
am: feed8df381 Change-Id: I99c85286ab2be1c67a55bd9115039eb6934d7657
2019-11-09Merge changes from topic "schuffelen-cf-2019-11-05-qemu-input"Cody Schuffelen
* changes: Retrofit vsoc_input_service to use vsock Run qemu without vsoc
2019-11-08Only get ".img" files from ANDROID_PRODUCT_OUTCody Schuffelen
This avoids accidentally seeing a "kernel" file in ANDROID_PRODUCT_OUT as being a user-supplied kernel image. Bug: 144189763 Test: Build and run locally Change-Id: Ie2ff37d9b508bbee8b59ba62e6f503b0eef64b2a
2019-11-08Merge "Discover the kernel/ramdisk from the fetcher config" am: a3d54abfbcCody Schuffelen
am: a26f8a1648 Change-Id: I692ce7c91ecae5fff7d512736e029a62c810b7bd
2019-11-08Merge "Discover the kernel/ramdisk from the fetcher config"Cody Schuffelen
am: a3d54abfbc Change-Id: I583c92b15fe1c494130f008e9414c554de7f5001
2019-11-08Merge "Discover the kernel/ramdisk from the fetcher config"Cody Schuffelen
2019-11-07Merge "Allow for tombstones of unlimited length to be transfered to host" ↵Ram Muthiah
am: 55427cd2f1 am: 8fcbd4f16b Change-Id: I025be8cc7372c892fe3afd84c21aba702b317fd1
2019-11-07Merge "Allow for tombstones of unlimited length to be transfered to host"Ram Muthiah
am: 55427cd2f1 Change-Id: I410c156d0583c904f71822ca5e214b4d44a43404
2019-11-08Merge "Allow for tombstones of unlimited length to be transfered to host"Ram Muthiah
2019-11-07Discover the kernel/ramdisk from the fetcher configCody Schuffelen
This allows assemble_cvd to react to whether fetch_cvd downloaded a kernel or ramdisk without that information having to be repeated as arguments to kernel_path or initramfs_path. Test: `acloud create` with a kernel_build Bug: 143562630 Change-Id: I93e069eba25c4a0ebc53bcb448fc7a319ab11524
2019-11-07Retrofit vsoc_input_service to use vsockCody Schuffelen
This allows using vsoc_input_service under qemu without the vsoc/ivshmem support that is missing in 4.19 gki. The alternative is to use virtio-input, but in qemu this requires forwarding a hardware device (by using root permissions) while in crosvm the same functionality is available through a file descriptor. Test: launch_cvd -vm_manager=qemu_cli, check adb and vnc Bug: 143713267 Change-Id: I5b7bdc063ff57aa3a455f77b8a7c23db29e1646e
2019-11-07Run qemu without vsocCody Schuffelen
This enables the crosvm options on qemu and disables references to the vsoc driver. The vsoc driver was specially written to share memory with the guest and the host through ivsh, but it is not included in the 4.19 kernel due to difficulty including it as a module in the gki setup. Test: launch_cvd -vm_manager=qemu_cli, check adb and vnc Bug: 143713267 Change-Id: I747f7f4c2f21c2e737899a07f1d8e8439da3ea6e
2019-11-07Merge "Add cas@1.2 to whitelist before enable it." am: 6989eb787dHenry Fang
am: d6f5624dc7 Change-Id: I1699d85a0a21a813e5a955294343417799777601
2019-11-07Merge "Add cas@1.2 to whitelist before enable it."Henry Fang
am: 6989eb787d Change-Id: I7ad1189c5b3e14d4b406890529717898837fa04f
2019-11-07Merge "Add cas@1.2 to whitelist before enable it."Henry Fang
2019-11-06Merge "Use the correct module type for script files" am: ec215505bcJorge E. Moreira
am: 3b0dfee995 Change-Id: If44935d1adf92c9a68aebcb9f4f35d67213f9777
2019-11-06Merge "Use the correct module type for script files"Jorge E. Moreira
am: ec215505bc Change-Id: Id1bac768ba2b8c499df3ed25cfb4b3990ebc9753
2019-11-07Merge "Use the correct module type for script files"Treehugger Robot
2019-11-06Use the correct module type for script filesJorge E. Moreira
sh_binay_host instead of cc_prebuilt_binary for cf_qemu.sh and cf_bpttool. cf_bpttool is actually a python script, but it's closer to a shell script that it is to a c++ prebuilt. Bug: none Test: locally Change-Id: Ie184b8dbd406f92fb27cc22315a9c9900cf698e8
2019-11-06Add cas@1.2 to whitelist before enable it.Henry Fang
Test: Manual bug: 141783130 Change-Id: I03c14b7e59cc955b4cebd8af61747169037e181c Merged-In: I03c14b7e59cc955b4cebd8af61747169037e181c
2019-11-06Remove health@2.0-service.rc am: 91849c18f6Yifan Hong
am: 44eec50299 Change-Id: I100f9017d0108c96211aefa15488c13a7fa7be12
2019-11-06Remove health@2.0-service.rcYifan Hong
am: 91849c18f6 Change-Id: Ic5ff5e6ce98fce30e3ecb8edb192e49064693d32
2019-11-05Allow for tombstones of unlimited length to be transfered to hostRam Muthiah
Bug: 138260220 Test: Unit tests Change-Id: I007ed30fd96471e79ba8a2ddc6b9d02b931e0efc
2019-11-05Remove health@2.0-service.rcYifan Hong
Unused. Test: pass Change-Id: I37410c68a79fd4f65feae0b1a1db13a57b00dc89
2019-11-05Snap for 5988121 from e1e1ebcde2eb0518312c1d0d955654bcb8370226 to ↵android-build-team Robot
qt-aml-networking-release Change-Id: Iff688317a39229f217cf55b872ddccbc35184a58
2019-11-04Merge changes from topic "u-boot v2019.10" am: 42a3965b55Tristan Muntsinger
am: d39c98b3e5 Change-Id: I303d656af22007f48eb1bcee9a4bb32c510d2e81
2019-11-04Merge changes from topic "u-boot v2019.10"Tristan Muntsinger
am: 42a3965b55 Change-Id: I78596d2855b65a235115a065363a665a07a0e1df
2019-11-05Merge changes from topic "u-boot v2019.10"Treehugger Robot
* changes: Revert "Hack in random, but valid MAC address in arm64 base image" Fix bug that breaks booting in U-Boot v2019.10
2019-11-04Merge changes Ie097ea65,I4e32f172 am: 36ac208cb9Jason Macnak
am: b7ec60efa0 Change-Id: I1d0e60a3a2c2b85687207ee8852c8c8020ff9b78
2019-11-04Merge changes Ie097ea65,I4e32f172Jason Macnak
am: 36ac208cb9 Change-Id: I512321adc6b49d8d06fe5dadc94ee91db66aed67
2019-11-04Merge changes Ie097ea65,I4e32f172Jason Macnak
* changes: Update hwcomposer to retry when fetching the device config Update rild to handle init failure
2019-11-04Update hwcomposer to retry when fetching the device configJason Macnak
I am some what frequently enountering the case where hwcomposer is timing out when trying to connect to the config server. This results in hwcomposer stopping the frame broadcast thread and vnc showing a black screen until after a reboot. Let's retry a couple times in case config server is not yet ready (still starting up the host or the vock kernel module isn't ready?). Bug: b/143876883 Test: m dist && launch_cvd Change-Id: Ie097ea65d619c960ebd07e0d957812c6ee091883
2019-11-04Update rild to handle init failureJason Macnak
RIL_Init can return null when it fails to connect to the config server which eventually leads to crash later on. Bug: b/143876883 Test: m dist && launch_cvd Change-Id: I4e32f172d7d549968c9a19ac3dde9cc32f040e17
2019-11-01Revert "Hack in random, but valid MAC address in arm64 base image"Tristan Muntsinger
This reverts commit 44f0817c3c6c78ae2186f4b67294c8a054bda72d. U-Boot v2019.10 enables efuse-derived MAC addresses, which obviates the need for this change. Also, this change directly causes the system to fail to boot on v2019.10 due to the efuse code seeing a conflict with the existing MAC address from the SD card environment and thus errors out which hangs U-Boot. BUG: 142311474 Test: local build and boot Change-Id: Ib1c6f110bb733e8538f5ed9143d71fe7e9cd2f83
2019-11-01Merge "Add health@2.1" am: 48377a0983Yifan Hong
am: 2a10723d35 Change-Id: I1fb26f73e93fcd4d208154e2974f4e3da12aef04
2019-11-01Merge "Add health@2.1"Yifan Hong
am: 48377a0983 Change-Id: If727a8f1ca95bdc064275bb4db2aac54b4f796d7
2019-11-01Merge "Add health@2.1"Treehugger Robot
2019-11-01Merge "defaults: exclude vibrator@1.4" am: c4c7dcc6b9Steven Moreland
am: c38c76265a Change-Id: Ic6e276d8e6e2e318fa3b0d37f11539f074621623
2019-11-01Merge "defaults: exclude vibrator@1.4"Steven Moreland
am: c4c7dcc6b9 Change-Id: I0d97e2c08192bacaf2ca6dfb9f5f862911097002
2019-11-01Merge "defaults: exclude vibrator@1.4"Steven Moreland
2019-11-01Merge "Consolidate flag default values." am: 30073834e6Cody Schuffelen
am: c7027599ce Change-Id: I262fea4658a29368c3b9af346a8bc55ed127940c
2019-11-01Merge "Consolidate flag default values."Cody Schuffelen
am: 30073834e6 Change-Id: If82762728ff24eac66dbe3c9a4bc32dccb7052d1
2019-11-01Merge "Consolidate flag default values."Treehugger Robot
2019-10-31Fix bug that breaks booting in U-Boot v2019.10Tristan Muntsinger
Rename $part back to $distro_bootpart, which fixes a bug that causes the kernel not to boot under v2019.10. BUG: 142311474 Test: local build and boot Change-Id: I6abb8a5f56df5daaa7c506aed5f1a1fa0a23e93d
2019-10-31Merge "Reorder network script to get network-manager out of the way" am: ↵Tristan Muntsinger
7ffc4e61b6 am: 8a742da3dd Change-Id: I37216c6c479c4f0fb9ef9bc05dc50975b1b2c907
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 10:36:57 +0000