summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ANDROID: Re-run cargo2android.py with device support am: 959c5453ccHEADmasterAlistair Delva2020-08-296-18/+63
|\
| * ANDROID: Re-run cargo2android.py with device supportAlistair Delva2020-08-286-18/+63
* | Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li2020-08-270-0/+0
|\ \ | |/ |/|
| * Fix paths in Cargo.toml files. am: ebb04f5661 am: ac554d6a1eAndrew Walbran2020-07-154-6/+6
| |\
| * \ Add METADATA to adhd: contains GPL=RESTRICTED am: cf570714d0 am: bdf0d80f2cBob Badour2020-05-041-0/+3
| |\ \
| * \ \ Merge remote-tracking branch 'aosp/upstream-master' am: 2e5b55c9a2 am: 162d1b...Lingfeng Yang2020-04-3084-733/+1237
| |\ \ \
| * \ \ \ Update to aosp/crosvm-master 805e83ebf5f am: 32baafc273 am: 439aeb6eceChih-Hung Hsieh2020-04-23122-1939/+4678
| |\ \ \ \
| * \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Update to aosp/crosvm-master e65070b6531 am: 2b1e50dc35 am: 8b3f70eb8aChih-Hung Hsieh2020-03-17260-8902/+3972
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Revert "Revert submission"" am: e8f4fb5db0 am: 78b70961cdandroid-mainline-11.0.0_r1android11-mainline-releaseandroid11-devAutomerger Merge Worker2019-12-036-5/+77
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Revert submission am: 925486576e am: 113e18402dColin Cross2019-11-266-77/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Add rust_test modules and TEST_MAPPING. am: feecafdb86 am: cba24f7d67Chih-Hung Hsieh2019-11-196-5/+77
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Apply crosvm_defaults to adhd modules." am: 0297e0f98d am: fd2f5d2441Ivan Lozano2019-11-153-2/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Revert "Add rust_test modules." am: c0005ccc40 am: 54b0531cd1Anna Trostanetski2019-11-153-57/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Add rust_test modules. am: 7a8a8536f6 am: 016f40a00cChih-Hung Hsieh2019-11-143-7/+57
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Use default module name 'liblibc' am: de06c35609 am: e3a308514dChih-Hung Hsieh2019-11-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'cros/master' into uprev am: 0323debe2d am: 5505...paulhsia2019-10-22269-14746/+17581
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add an OWNERS.android file. am: 15721ec762 am: 8b9ed1f010 am: 6999dbb714Ivan Lozano2019-10-031-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Allow warnings in some rust modules. am: 6f392d895f am: b50ae33796 am: 0c3148...Chih-Hung Hsieh2019-09-273-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Mark Rust modules host_only. am: f966ecb6fd am: 9bb151ba43 am: add75d0052Ivan Lozano2019-09-243-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add blueprint files for crosvm dependencies. am: 247dd441c5 am: 0de6ed78b3 am...Ivan Lozano2019-09-093-0/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'cros/master' into uprev am: ced4ae2804 am: 3531...paulhsia2019-07-08132-4416/+4393
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add libcutils as dependency. am: f6c54f9adf am: 37fd415695 am: cf21804acdGarfield Tan2019-06-241-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 3a565abc...Jeff Vander Stoep2019-06-24282-7945/+22316
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Use cargo2android.py new global_defaults flag. am: 9ed35185f8Chih-Hung Hsieh2020-08-053-8/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Use cargo2android.py new global_defaults flag.Chih-Hung Hsieh2020-08-043-8/+48
* | | | | | | | | | | | | | | | | | | | | | | | | Re-run cargo2android.py and fix up results. am: 17f1344bfdAndrew Walbran2020-07-236-25/+29
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Re-run cargo2android.py and fix up results.Andrew Walbran2020-07-226-25/+29
* | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/upstream-master' am: 409b221d58Alistair Delva2020-07-22148-1300/+6301
|\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/upstream-master'Alistair Delva2020-07-20148-1300/+6301
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | audio_streams: Change timer start time in null_consumption_ratepaulhsia2020-07-181-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | | sound_card_init: add boot time calibration flow for max98390Judy Hsiao2020-07-1712-60/+1069
| | * | | | | | | | | | | | | | | | | | | | | | | sound_card_init: initial commitJudy Hsiao2020-07-177-0/+424
| | * | | | | | | | | | | | | | | | | | | | | | | cros_alsa: safe rust wrapper for alsa-libJudy Hsiao2020-07-1612-0/+1221
| | * | | | | | | | | | | | | | | | | | | | | | | libcras: add new_pinned_playback_stream()Judy Hsiao2020-07-161-0/+31
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: Log the volume of output devicesYu-Hsuan Hsu2020-07-154-1/+51
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: cras_iodev - Log device overrunsYu-Hsuan Hsu2020-07-126-0/+62
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: Access num_channels only for valid messagepaulhsia2020-07-101-5/+5
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: dev_io - Record missed cb eventHsin-Yu Chao2020-07-071-0/+1
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: Fix cras_config_global_remix usagepaulhsia2020-07-063-5/+39
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: alsa_helpers: Fall back to max channelsDylan Reid2020-07-061-2/+16
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: Reject invalid channel_layout in functionspaulhsia2020-07-031-2/+4
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: cras_alsa_ucm - Remove the incorrect error messageYu-Hsuan Hsu2020-07-021-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | | ucm: remove MixerNameCurtis Malainey2020-07-014-48/+22
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: hfp_alsa_io: Add get_valid_frames opsCheng-Yi Chiang2020-07-016-3/+50
| | * | | | | | | | | | | | | | | | | | | | | | | ucm: remove mic positionsCurtis Malainey2020-07-014-42/+0
| | * | | | | | | | | | | | | | | | | | | | | | | cras: fixing typo in volume feature bit definitionAlain Michaud2020-06-291-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: a2dp - Avoid underrun in no_stream stateHsin-Yu Chao2020-06-292-42/+119
| | * | | | | | | | | | | | | | | | | | | | | | | CRAS: a2dp - Add warning log for possible buffer overrunHsin-Yu Chao2020-06-295-0/+17