summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 6504394 from 6316951371e5f1f3f5d84991eea918001b8fe720 to mainline-re...android-mainline-11.0.0_r1android11-mainline-releaseandroid-build-team Robot2020-05-181-0/+2
|\
| * 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
* | | Snap for 6499480 from 8adc6eb0dfcb672b5da1ec523c03fa4cf4a2c68c to mainline-re...android-build-team Robot2020-05-153-2/+14
|\| |
| * | 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
|/
* Use ART_APEX_JARS instead of hard-coded list of ART boot jars. am: 457a95f6f1...Automerger Merge Worker2020-02-131-6/+1
|\
| * Use ART_APEX_JARS instead of hard-coded list of ART boot jars. am: 457a95f6f1...Automerger Merge Worker2020-02-131-6/+1
| |\
| | * Use ART_APEX_JARS instead of hard-coded list of ART boot jars. am: 457a95f6f1android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker2020-02-131-6/+1
| | |\
| | | * Use ART_APEX_JARS instead of hard-coded list of ART boot jars.Ulya Trafimovich2020-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. am: 00b6489c...Automerger Merge Worker2020-02-131-2/+0
| |\| |
| | * | Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint. am: 00b6489cbbAutomerger Merge Worker2020-02-131-2/+0
| | |\|
| | | * Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.Ulya Trafimovich2020-02-131-2/+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 "Actually fix aosp_qemu_trusty build error" am: 8696990a47 am: c3e6b5be92Automerger Merge Worker2020-01-271-0/+1
| |\| |
| | * | Merge "Actually fix aosp_qemu_trusty build error"Remi NGUYEN VAN2020-01-271-0/+1
| | |\|
| | | * Merge "Actually fix aosp_qemu_trusty build error"android-r-preview-1Remi NGUYEN VAN2020-01-271-0/+1
| | | |\
| | | | * Actually fix aosp_qemu_trusty build errorRemi NGUYEN VAN2020-01-271-0/+1
* | | | | Merge "Fix aosp_qemu_trusty build error" am: 78946b538d am: c3010ef221 am: 40...Automerger Merge Worker2020-01-271-0/+1
|\| | | |
| * | | | Merge "Fix aosp_qemu_trusty build error" am: 78946b538d am: c3010ef221Automerger Merge Worker2020-01-271-0/+1
| |\| | |
| | * | | Merge "Fix aosp_qemu_trusty build error"Remi NGUYEN VAN2020-01-261-0/+1
| | |\| |
| | | * | Merge "Fix aosp_qemu_trusty build error"Remi NGUYEN VAN2020-01-271-0/+1
| | | |\|
| | | | * Fix aosp_qemu_trusty build errorRemi NGUYEN VAN2020-01-271-0/+1
* | | | | qemu_trusty: Fix VINTF file inclusion again. am: 099d9f83e5 am: f92424414e am...Automerger Merge Worker2020-01-211-1/+0
|\| | | |
| * | | | qemu_trusty: Fix VINTF file inclusion again. am: 099d9f83e5 am: f92424414eAutomerger Merge Worker2020-01-211-1/+0
| |\| | |
| | * | | qemu_trusty: Fix VINTF file inclusion again.Yifan Hong2020-01-211-1/+0
| | |\| |
| | | * | qemu_trusty: Fix VINTF file inclusion again.Yifan Hong2020-01-171-1/+0
| | | |/
* | | | Merge "qemu_trusty: Fix VINTF file inclusion." am: 3800dbdda7 am: a5317f9ce3 ...Automerger Merge Worker2020-01-161-2/+7
|\| | |
| * | | Merge "qemu_trusty: Fix VINTF file inclusion." am: 3800dbdda7 am: a5317f9ce3Automerger Merge Worker2020-01-161-2/+7
| |\| |
| | * | Merge "qemu_trusty: Fix VINTF file inclusion."Yifan Hong2020-01-151-2/+7
| | |\|
| | | * Merge "qemu_trusty: Fix VINTF file inclusion."Yifan Hong2020-01-161-2/+7
| | | |\
| | | | * qemu_trusty: Fix VINTF file inclusion.Yifan Hong2020-01-141-2/+7
* | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without...Automerger Merge Worker2020-01-160-0/+0
|\| | | |
| * | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) int...Automerger Merge Worker2020-01-160-0/+0
| |\| | |
| | * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) int...Xin Li2020-01-150-0/+0
| | |\ \ \
* | | | | | Merge "Added PREUPLOAD.cfg" am: 34bf3f7621 am: 912a135c5b am: 196bffec58Automerger Merge Worker2020-01-132-0/+18
|\| | | | |
| * | | | | Merge "Added PREUPLOAD.cfg" am: 34bf3f7621 am: 912a135c5bAutomerger Merge Worker2020-01-132-0/+18
| |\| | | |
| | * | | | Merge "Added PREUPLOAD.cfg"Janis Danisevskis2020-01-132-0/+18
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Added PREUPLOAD.cfg"Treehugger Robot2020-01-132-0/+18
| | | |\ \ \
| | | | * | | Added PREUPLOAD.cfgJanis Danisevskis2020-01-102-0/+18
| | | | | |/ | | | | |/|
* | | | | | Fix build error am: a7e19bb81c am: 7eb772f443 am: 4e325cff7bAutomerger Merge Worker2020-01-131-0/+3
|\| | | | |
| * | | | | Fix build error am: a7e19bb81c am: 7eb772f443Automerger Merge Worker2020-01-131-0/+3
| |\| | | | | | |_|_|/ | |/| | |
| | * | | Fix build errorJiyong Park2020-01-121-0/+3
| | |\| |
| | | * | Fix build errorJiyong Park2020-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
|\| | |
| * | | Merge changes I08e20d20,I532d1277,If5e42692,If1230df1 am: 21d269e768Matthew Maurer2019-12-032-8/+13
| |\| |