summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix qemu_trusty_arm64 build after Android R mergeHEADmasterArve Hjønnevåg2020-09-141-0/+2
* Merge Android RXin Li2020-09-082-40/+1
|\
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-272-40/+1
|/|
| * Enable BOARD_VNDK_VERSION := current am: 54190ed162 am: 4b2e1a8df4Tri Vo2020-07-162-0/+13
| |\
| * \ Add adbd_system_api for adbd APEXd am: 739031d054 am: 05f592ee24Matthew Maurer2020-06-151-0/+1
| |\ \
| * \ \ [automerger skipped] Import the d/g/goldfish soong namespace am: 1b560d84ed a...Roman Kiryanov2020-05-180-0/+0
| |\ \ \
| * \ \ \ Import the d/g/goldfish soong namespace am: 57436fbd9cRoman Kiryanov2020-05-181-0/+2
| |\ \ \ \
| | * | | | Import the d/g/goldfish soong namespaceandroid11-devRoman Kiryanov2020-05-141-0/+2
| * | | | | [automerger skipped] Copy advancedFeatures.ini and fstab.ranchu from qemu am:...Roman Kiryanov2020-05-150-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Copy advancedFeatures.ini and fstab.ranchu from qemu am: 3ae7a2c9f6Roman Kiryanov2020-05-153-2/+14
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Copy advancedFeatures.ini and fstab.ranchu from qemuRoman Kiryanov2020-05-143-2/+14
| * | | | | | Fix Trusty test target build am: d9b85cce93 am: e5c146bec1Matthew Maurer2020-05-111-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Add METADATA to trusty: Apache2=NOTICE am: 5cf1f5ddbe am: e4ec4db7b5Bob Badour2020-05-051-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ qemu_trusty_base.mk Add linkerconfig to PRODUCT_PACKAGES am: 77be91f081 am: 8...Janis Danisevskis2020-04-071-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Add android.hardware.confirmationui@1.0-service.trusty am: 8baf960b11 am: 7c5...Janis Danisevskis2020-04-033-0/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Use ART_APEX_JARS instead of hard-coded list of ART boot jars. am: 457a95f6f1...Automerger Merge Worker2020-02-131-6/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS d...Automerger Merge Worker2020-02-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.Ulya Trafimovich2020-02-121-2/+0
| * | | | | | | | | | | | | Merge "Actually fix aosp_qemu_trusty build error" am: 8696990a47 am: c3e6b5be...Automerger Merge Worker2020-01-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix aosp_qemu_trusty build error" am: 78946b538d am: c3010ef221 am: 40...Automerger Merge Worker2020-01-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ qemu_trusty: Fix VINTF file inclusion again. am: 099d9f83e5 am: f92424414e am...Automerger Merge Worker2020-01-211-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "qemu_trusty: Fix VINTF file inclusion." am: 3800dbdda7 am: a5317f9ce3 ...Automerger Merge Worker2020-01-161-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without...Automerger Merge Worker2020-01-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Added PREUPLOAD.cfg" am: 34bf3f7621 am: 912a135c5b am: 196bffec58Automerger Merge Worker2020-01-132-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix build error am: a7e19bb81c am: 7eb772f443 am: 4e325cff7bAutomerger Merge Worker2020-01-131-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Remove broadcastradio HAL 1.x from emulator targetsTomasz Wasilczyk2019-12-191-9/+0
| * | | | | | | | | | | | | | | | | | | | Wifi: Remove hostapd hidl entry from manifest.xmllesl2019-12-061-9/+0
| * | | | | | | | | | | | | | | | | | | | Merge changes I08e20d20,I532d1277,If5e42692,If1230df1 am: 21d269e768 am: 215a...Automerger Merge Worker2019-12-032-8/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Move init and ueventd scripts from / to /system/etc am: ...Tom Cherry2019-11-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Move init and ueventd scripts from / to /system/etcTom Cherry2019-11-121-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Replace framework.jar with framework-minus-apex.jar am: ...Jiyong Park2019-10-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Replace framework.jar with framework-minus-apex.jarJiyong Park2019-10-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add Widevine L3 drm service to cuttlefish"Alistair Delva2019-10-241-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Add Widevine L3 drm service to cuttlefishEdwin Wong2019-10-231-2/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW" am: d69defc8ac am: 370be4...Inseob Kim2019-10-171-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW am: a3e0bd5439 am: b35f5f06fb am: ...Inseob Kim2019-10-151-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | wifi: move wpa_supplicant VINTF definition to wpa_supplicant moduleJimmy Chen2019-09-271-9/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Wifi: Remove IWifi hidl entry from manifest.xmlAhmed ElArabawy2019-09-241-9/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Keymaster declaration from manifest am: db87aa56e7 am: 90816a4071 am: ...Matthew Maurer2019-09-101-9/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Add new ART APEX after Runtime APEX split. am: d2987f613...Martin Stjernholm2019-09-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new ART APEX after Runtime APEX split.Martin Stjernholm2019-08-211-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update configstore entry to 1.1. am: f4b7087958 am: a122f22b3d am: 61bbe39cf9...Steven Moreland2019-08-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add core-icu4j into the list of boot jars am: b1687d60f9 am: ebe89be770 am: b...Victor Chang2019-08-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Include i18n packages to fix build am: 5012561d58 am: dd5fe1e967 am: 39694b6f...Matthew Maurer2019-08-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove notifications from bugreport generation using combo keysAbhijeet Kaur2019-08-081-2/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Remove conflicting Gatekeeper declaration" am: 12...Janis Danisevskis2019-06-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \