aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-250-0/+0
|\ | | | | | | | | | | am: b6368bc7f9 Change-Id: If2cbff6c6dc53a5e40f20067bdcb4b60febf49aa
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | Bug: 126125118 Change-Id: Ie2c4de3bfb8fc462367328da788d6f9461ac542b
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I855fc6b040bbed604660fe308082679c123de098
* | | | Merge "find_java2: Fix array size calculation" am: 1400d85340 am: c73b2761d7Greg Kaiser2019-01-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 70d3b909d4 Change-Id: Iedd72ea40a2e1edfd3c4792098486a9daef44a1c
| * | | Merge "find_java2: Fix array size calculation" am: 1400d85340Greg Kaiser2019-01-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: c73b2761d7 Change-Id: If2c68d0743444210ce3b9bff0cc30eca3da5b543
| | * | Merge "find_java2: Fix array size calculation"Greg Kaiser2019-01-241-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 1400d85340 Change-Id: Ifaf8d2dd36565eaf400162604cde10f6d063e2ff
| | | * \ Merge "find_java2: Fix array size calculation"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot2019-01-241-1/+1
| | | |\ \
| | | | * | find_java2: Fix array size calculationGreg Kaiser2018-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetModuleFileName() takes the maximum number of TCHARs we can fit as the final argument, and thus we need to divide by sizeof(TCHAR), instead of multiplying by it. Test: Treehugger Change-Id: Icbbb04c29955075e9341a0153dbd750cce8e884b
* | | | | | Merge "Remove LOCAL_MODULE_TAGS := debug" am: 98d261c0a1 am: fd2a17c268Dan Willemsen2019-01-222-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 438eeed270 Change-Id: I465f5f6290fad04067bf95a13f2f39935bce2cd2
| * | | | | Merge "Remove LOCAL_MODULE_TAGS := debug" am: 98d261c0a1Dan Willemsen2019-01-222-2/+0
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | am: fd2a17c268 Change-Id: Ic2cb462914ace75298544f3a6be37ceb211ed490
| | * | | Merge "Remove LOCAL_MODULE_TAGS := debug"Dan Willemsen2019-01-222-2/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 98d261c0a1 Change-Id: I876ce929ed7074dc52641b7798a7d089aa96a318
| | | * | Merge "Remove LOCAL_MODULE_TAGS := debug"Treehugger Robot2019-01-232-2/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * Remove LOCAL_MODULE_TAGS := debugDan Willemsen2019-01-192-2/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't appear to be necessary here, there are no other references to these in our tree, and hierarchyviewer is deprecated. Users can always trigger these to be installed with `m` Test: treehugger Change-Id: I9fee7813b103598ae0438a6adee625e29f968624
* | | | Remove DeviceConfigJim Kaye2018-11-0560-1637/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version here is obsolete. The live version is in Android Studio (e.g. goog/studio-master-dev) in tools/base/apps/DeviceConfig/ Bug: 117556079 Test: None added Change-Id: I13279ff8b4ec21f20f3b93b127183ce5e2368cbb
* | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 1fc951b21c -s ours am: de53f696e7 -s ours am: 0c15b39c82 -s ours Change-Id: I453b942f80a58ec42dd4f84e7d7742cdf65192ef
| * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 1fc951b21c -s ours am: de53f696e7 -s ours Change-Id: Ide10993798e74111a51bc18806abf6b84a2596fc
| | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | am: 1fc951b21c -s ours Change-Id: Ic7e36caa8b13e4b01f176f430a5344fc936e113e
| | | * Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi2018-10-240-0/+0
| | | |\ | | | | | | | | | | | | | | | Change-Id: Id89ad1e9f5e9801bd35e555f10f62775f85c1aaf
* | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c8bcfc6d97 -s ours am: 35a4ab43da -s ours Change-Id: Ida68a68f91bee6a12a05f5f2f11a8530c39a9be2
| * | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c8bcfc6d97 -s ours Change-Id: I019187584f69a88d4651049aef65bed2bfd8119e
| | * | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/ Change-Id: If677da2091a1aa81e9d46dc4f2e16faa7d9163b7
| | | * Snap for 4620899 from ff3c39e8a6204096cf4e532b50bfc9bc6c290e3b to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot2018-02-252-30/+65
| | | |\ | | | | | | | | | | | | | | | Change-Id: I9a3db0c582e158a9baf4a5fb7f5bf8961cf549a2
| | | * \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | | |\ \
| | | | * \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | Snap for 4557233 from 7bfdcaceb97709849655c2ab6f369a3646ad1fe1 to pi-releaseandroid-build-team Robot2018-01-211-1/+11
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | Change-Id: Ie945bebea10f3d15099573b663fdf95703bbd46c
| | | * | | Snap for 4500033 from 8c10380c7686264fe5780a4e4ddcb76f585dde28 to pi-releaseandroid-build-team Robot2017-12-131-2/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I235955b53b3deacfab5c854040e0bc09408bb536
* | | | | | | Remove mksdcard from the System source treeJim Kaye2018-08-307-622/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The live version is in aosp/emu-master-dev under sdk/emulator/ Bug: 113514423 Test: None Change-Id: Ib6a6d3fe79d434d3c76a969049c7e212f309b29b
* | | | | | | Merge "Remove obsolete windows sdk files" am: 34ce035aa6 am: dee214d4c1Dan Willemsen2018-08-282-56/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 20d40f7c52 Change-Id: I9a700dceaad1be598074c33ed32e72c81fe8e6c0
| * | | | | | Merge "Remove obsolete windows sdk files" am: 34ce035aa6Dan Willemsen2018-08-282-56/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dee214d4c1 Change-Id: I0dd9b4270feb3516dff585d1c71f6232389cecfc
| | * | | | | Merge "Remove obsolete windows sdk files"Dan Willemsen2018-08-282-56/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 34ce035aa6 Change-Id: I5f1d572b71c131bfe6bca60b20786315c66a8e80
| | | * \ \ \ \ Merge "Remove obsolete windows sdk files"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot2018-08-282-56/+0
| | | |\ \ \ \ \
| | | | * | | | | Remove obsolete windows sdk filesDan Willemsen2018-08-272-56/+0
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: m win_sdk Change-Id: I8d8f3e4b1f453aba1e350c5c4b5ae5f224328289
* | | | | | | | Merge "Merge Android Pie into master" am: fec4f7d58d am: ac41ef6b6d am: ↵Xin Li2018-08-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3692a7d9d2 am: d0586fe50c Change-Id: I6e8896d7abd86881b737ff5b85e0d5357ff0412d
| * | | | | | | Merge "Merge Android Pie into master" am: fec4f7d58d am: ac41ef6b6dXin Li2018-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3692a7d9d2 Change-Id: I5d4912f5828bbf54cf9d45014c6a24b583d32c88
| | * | | | | | Merge "Merge Android Pie into master" am: fec4f7d58dXin Li2018-08-070-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ac41ef6b6d Change-Id: I01df2de70e8141c9df3dd3d90fb6528073d57664
| | * | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fec4f7d58d Change-Id: I3ba2a384dcf3d1effbaa9c70d80680dfdad12874
| | | * | | | | Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.3Xin Li2018-08-071-8/+8
| | | |\ \ \ \ \
| | | | * | | | | Merge Android Pie into masterXin Li2018-08-061-8/+8
| | | |/| | | | | | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 112104996 Change-Id: Id14d159801662039153d76c10c99108d5d725e4d
* | | | | | | | Merge "Add -static-libgcc to mksdcard on Windows" am: 21b5f6fef1 am: 7fabb508f9Lingfeng Yang2018-07-021-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4b275213a6 Change-Id: I56ed8e36c446691015eb035124944516c61fc955
| * | | | | | | Merge "Add -static-libgcc to mksdcard on Windows" am: 21b5f6fef1Lingfeng Yang2018-07-021-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7fabb508f9 Change-Id: Ic7f610c5f06bf4127b362af3d5f73a91a4f8c812
| | * | | | | | Merge "Add -static-libgcc to mksdcard on Windows"Lingfeng Yang2018-07-021-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 21b5f6fef1 Change-Id: Ie4c54feb2d79a529d3df231bdc6c0f725981db56
| | | * | | | | Merge "Add -static-libgcc to mksdcard on Windows"android-p-preview-5android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2Lingfeng Yang2018-07-021-0/+3
| | | |\ \ \ \ \
| | | | * | | | | Add -static-libgcc to mksdcard on WindowsLingfeng Yang2018-07-021-0/+3
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 110978596 Change-Id: Ib27bfa75b72991e3c79b8c4a73aaeb8acb58bae1
* | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: abd24e2603Xin Li2018-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cad5a56b7a Change-Id: Id1f922769962fa85a0256a0faa3ba32f44c15bbd
| * | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: abd24e2603 Change-Id: I0b9a66a45c692b2e47a4e4be03a815147d7fd697
| | * | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-081-8/+8
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 79597307 Change-Id: I55e2713512e56b2f860f499ed279b8c153068c99
* | | | | | | | Merge "Lose adb/fastboot bash completion to adb and fastboot." am: ↵Elliott Hughes2018-04-045-883/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ce300881f am: 4536a2b17f am: 82665cde34 Change-Id: I24ba7f01670bdc173a5b9a5572c87d848095fbe4
| * | | | | | | Merge "Lose adb/fastboot bash completion to adb and fastboot." am: 1ce300881fElliott Hughes2018-04-045-883/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4536a2b17f Change-Id: I73c56a94aeebfe11c61561d37f3f7b9fca8ee7b6
| | * | | | | | Merge "Lose adb/fastboot bash completion to adb and fastboot."Elliott Hughes2018-04-045-883/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1ce300881f Change-Id: I9e90dc0e387b8aadfc660b8e20ef14b6549055a5
| | | * | | | | Merge "Lose adb/fastboot bash completion to adb and fastboot."android-wear-p-preview-2android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8Elliott Hughes2018-04-045-883/+0
| | | |\ \ \ \ \