aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-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_r12q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: c9dbef9150 Change-Id: I9be366c1862160b304d5be0eafc2ae00d6e64957
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I4b74b99391e34c16ad79b04881e8633ee4f9de5c
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I4927ac156654b003ad14760b56e7277a63a08d5b
2019-02-05Add updateable-media to android-all jar.Brett Chabot
Bug: 123756502 Test: m RunCarSetupWizardRoboTests Change-Id: I9e998ab815d6b330988af9e2b2e69325ec650481
2019-01-16Merge "Add default code reviewers into OWNERS" am: 2952aea4fa am: 12ad2fcc9dChih-hung Hsieh
am: 15cf3db14c Change-Id: I53c68893da7f3013f4b61e224b48a0b6c9c25f80
2019-01-16Merge "Add default code reviewers into OWNERS" am: 2952aea4faChih-hung Hsieh
am: 12ad2fcc9d Change-Id: I6c5b10629cb04b6600e9b9c422a1686e3acd2972
2019-01-16Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 2952aea4fa Change-Id: If4a534f97c5b185cd84b8a6a6b26c43e64a130dd
2019-01-16Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10Chih-hung Hsieh
2019-01-16Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ie9d3553f92b6ad5763b73ff6ca88f9425ec425bf
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: ea2fd1fde2 -s ours am: fafc717d05 -s ours am: 5d2e2e3044 -s ours Change-Id: I9d7bf677f65b9dc0be72ac28b475763d5d5ebb7c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: ea2fd1fde2 -s ours am: fafc717d05 -s ours Change-Id: Ib5645a9c34672584cd6e1d9b2dcc596af2c3e0df
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: ea2fd1fde2 -s ours Change-Id: I1a41fb419a6dec3ee1358f2ceb25f6fae3ae06e6
2018-10-24Merge 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-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-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 Yi
Change-Id: I5c3dab92cd31e82de0e723a8778f46071cef5eaf
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: cf0eaeb9f9 -s ours am: eef840798b -s ours Change-Id: I13fcf7db78c56c9bb7130453e9a8d1868c7c2ec7
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: cf0eaeb9f9 -s ours Change-Id: I2cdd765dc1a3de9a6c29693d8ba219042a351bd0
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I1d448ce8770ab1aa3dd79d586e73e5dc34c6135c
2018-10-24Merge "external/robolectric: delete dead code" am: 3592ed4b0c am: a5d9aa8fe8Tobias Thierer
am: eebbcfb6ab Change-Id: I2e919d672644c873a0fb1de57142c442bafded4a
2018-10-24Merge "external/robolectric: delete dead code" am: 3592ed4b0cTobias Thierer
am: a5d9aa8fe8 Change-Id: I3fc060c5a749ccf64e7741777fd9af5473f22fb3
2018-10-24Merge "external/robolectric: delete dead code"Tobias Thierer
am: 3592ed4b0c Change-Id: Ie598f6be7f52481691228b4b071a6b5ff3688881
2018-10-24Merge "external/robolectric: delete dead code"Tobias Thierer
2018-10-18external/robolectric: delete dead codeTobias Thierer
Before this CL, this git project contained: a) prebuilts and sources for historic robolectric versions b) IntelliJ IDEA project metadata c) .mk files defining build targets and dependencies which are in turn used by the .mk files in external/robolectric-shadows and by robolectric tests across the Android platform. a) and b) appear to be unused / dead code, so this CL deletes it. Moving the remaining logic from c) into a more appropriate place (eg. in external/robolectric-shadows) or otherwise refactoring it is left to a potential future CL. Bug: 117871396 Test: Cherry-picked this change into the internal master branch and verified that the following still work: make checkbuild docs make RunCarSetupWizardRoboTests RunCarSetupWizardRoboTests-jacoco \ RunCarSetupWizardLibRoboTests RunCarSetupWizardLibRoboTests-jacoco \ RunCarMessengerRoboTests RunCarMessengerRoboTests-jacoco \ RunSettingsGoogleRoboTests Change-Id: I620422eb6127b2e55d34eda7351673b1c5ea41b2
2018-09-06[automerger skipped] Merge "Change library name" am: 02c50c453d am: ↵Sundong Ahn
362de896c6 -s ours am: 3ad0ecdbc8 -s ours Change-Id: I452b38ac6667a93e0c587e8b65458200503ac07e
2018-09-06[automerger skipped] Merge "Change library name" am: 02c50c453dSundong Ahn
am: 362de896c6 -s ours Change-Id: Icf32b9d02457953c743749f45c1d480afd343e41
2018-09-06Merge "Change library name"Sundong Ahn
am: 02c50c453d Change-Id: I18834561c7ee4d6ad1dd5485781a93183ad2f3b2
2018-09-07Merge "Change library name"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-09-02[automerger skipped] Change library nameSundong Ahn
am: e7abbc5f72 -s ours Change-Id: Ie1e9b5ff273b8c6d8958ea5873c15bfa62f4e8a2
2018-08-29Change library nameSundong Ahn
android.test.base will be changed to java sdk library, and this library can not be used as a static library. So this module uses android.test.base_static instead of android.test.base to behave the same as the existing one. Bug: 77577799 Test: make -j Merged-In: Iddc1e537deab202ad8bcaacbef7613191773e6f3 Change-Id: Iddc1e537deab202ad8bcaacbef7613191773e6f3 (cherry picked from commit 50f9c9e1aa4e3dab7000aca3edfc24039758e357)
2018-08-20Change library nameSundong Ahn
android.test.base will be changed to java sdk library, and this library can not be used as a static library. So this module uses android.test.base_static instead of android.test.base to behave the same as the existing one. Bug: 77577799 Test: make -j Merged-In: Iddc1e537deab202ad8bcaacbef7613191773e6f3 Change-Id: Iddc1e537deab202ad8bcaacbef7613191773e6f3
2018-08-17Merge "Change library name"TreeHugger Robot
2018-08-08Merge "Merge Android Pie into master" am: b7511d45de am: a4b36ce92a am: ↵Xin Li
81e67db01d am: 049b6dc0ec Change-Id: I30b180d61c435bdb3a1bde7e10d1421769173265
2018-08-07Merge "Merge Android Pie into master" am: b7511d45de am: a4b36ce92aXin Li
am: 81e67db01d Change-Id: Ibce8d897c4c4062240b43bfa99763dc3dcf0a586
2018-08-07Merge "Merge Android Pie into master" am: b7511d45deXin Li
am: a4b36ce92a Change-Id: Ibef9abaad4280371ffb2228c1e34beb26282a31a
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: b7511d45de Change-Id: I9ea9e7724c4deeae43a655201875f5b7ab35692a
2018-08-07Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Xin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: Ide1d2cf2be579ef0f313c7cd52bb505ed62593e3
2018-08-01Change library nameSundong Ahn
android.test.base will be changed to java sdk library, and this library can not be used as a static library. So this module uses android.test.base_static instead of android.test.base to behave the same as the existing one. Bug: 77577799 Test: make -j Change-Id: Iddc1e537deab202ad8bcaacbef7613191773e6f3
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 1bf821f9f3Xin Li
am: 9a7fe8794e Change-Id: Ieb40b25918f1db6992a26f35ed847b1c8f34a4f6
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 1bf821f9f3 Change-Id: Ibe0792400e1859b38cdd4909fd4c9a9fea1dce79
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I2aeb4251641c2c5430afa0ee6c91f36f1b7ecdde
2018-05-13Snap for 4778776 from 3cce3b15a19de77203336aedfda490371348f38d 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_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-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_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-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_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-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_r61android-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 Robot
Change-Id: Iaa64aeab646f2ae0d6e004dceac0c61b73591664
2018-05-10[automerger skipped] Mark classes-with-res.jar as .KATI_RESTAT am: 3cce3b15a1Colin Cross
am: 218dbb89ab -s ours Change-Id: Id792a34fa12b5a0300dd5c3984cd3827d329bb90
2018-05-10Mark classes-with-res.jar as .KATI_RESTATColin Cross
am: 3cce3b15a1 Change-Id: I699733ee3ad11648236a79bc7ac5226327d2e0ef
2018-05-10Mark classes-with-res.jar as .KATI_RESTATandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devColin Cross
classes-with-res.jar uses commit-change-for-toc, which only updates the output file if it has changed, but the rule is not marked as restat. This causes ninja to assume the file was rebuilt for the current run, but on the next run it sees the old timestamp and thinks it is dirty. Mark the rule as restat in ninja with .KATI_RESTAT. Bug: 79504400 Test: m java && m java Change-Id: I09be19d05301418850f58eb24094e342109ca3e6 Merged-In: I09be19d05301418850f58eb24094e342109ca3e6 (cherry picked from commit 5837fa0f14e0b59bdf4777800c4083f382e68c52)
2018-05-09Mark classes-with-res.jar as .KATI_RESTATColin Cross
classes-with-res.jar uses commit-change-for-toc, which only updates the output file if it has changed, but the rule is not marked as restat. This causes ninja to assume the file was rebuilt for the current run, but on the next run it sees the old timestamp and thinks it is dirty. Mark the rule as restat in ninja with .KATI_RESTAT. Bug: 79504400 Test: m java && m java Change-Id: I09be19d05301418850f58eb24094e342109ca3e6
2018-02-25Snap for 4620899 from 81f38d8b0a959658f267f169c18d95466a97d587 to pi-releaseandroid-build-team Robot
Change-Id: I5121f5256829233b223cc82cdb31f0a72333387c
2018-02-23Merge "Revert "Revert "Use FILE_NAME_TAG as part of generated jar file."""TreeHugger Robot
2018-02-23Revert "Revert "Use FILE_NAME_TAG as part of generated jar file.""Nan Zhang
This reverts commit e4eef292816073aa09f7208f53ae2b4136fcec07. Reason for revert: <Fixed the issue that broke master builds> Test: m -j Change-Id: I0db151ef351dc18d1ff9646215669c0be4fe0452
2018-02-23Revert "Use FILE_NAME_TAG as part of generated jar file."Makoto Onuki
This reverts commit 185ac2228eab2ae6ca47e6604257834d839bcbbf. Reason for revert: <INSERT REASONING HERE> Change-Id: Ib6de1e213fef3c023aa08bf1b9919fbd4eb79f50
2018-02-22Use FILE_NAME_TAG as part of generated jar file.Nan Zhang
FILE_NAME_TAG has already wrapped the logic about if we should use BUILD_NUMBER or not. Test: m -j32 Bug: b/70351683 Change-Id: Id30c513baf8a5045f3b9d42b513ab72b7fac2ead
2018-02-11Snap for 4598635 from 37cc417f94cf66eee8bb96c722cb528c073298bc to pi-releaseandroid-build-team Robot
Change-Id: Iefa804f20415f2944c7d58780c680988adf728c5
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 20:34:19 +0000