aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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
2018-02-09Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly." am: ↵Tobias Thierer
18cb219ca7 am: 806b50f604 am: 8c178510c0 Change-Id: I88a5732a325f5ea318bcf3cbb239336aa9ec8728
2018-02-09Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly." am: 18cb219ca7Tobias Thierer
am: 806b50f604 Change-Id: I32e0d08632b8e2e5e9634073f26468e9884f8831
2018-02-09Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly."Tobias Thierer
am: 18cb219ca7 Change-Id: Ibf808a63fd7ee5f7f519b1f7924939f7231e0d7f
2018-02-09Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly."android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-02-08Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly.Tobias Thierer
robolectric_android-all-stub was carrying jarjar rules, even though those only affected the icu4j-{tz,}icudata parts of the target. This CL switches to the dependency to the already-jarjar'ed icu4j-icu{tz,}data-jarjar targets, which is better isolated and may be built with an earlier LOCAL_JAVA_LANGUAGE_VERSION. Bug: 72703434 Test: Treehugger (after http://r.android.com/c/612671 ) Change-Id: I56649cd31687159f5035b89a98677bd8c1a6a169
2017-12-24Snap for 4517567 from 829a824cccbf1917fe38bfb1e5c9eaa99b508e50 to pi-releaseandroid-build-team Robot
Change-Id: Iabd961df86f6bbc6712b38086c54380fa713dc38
2017-12-21Include binary framework resources in robolectric-android-all jar am: bde334d928Brett Chabot
am: fbfdc725de -s ours Change-Id: I9c4aacab2770f30e09616cd686fcb91a6b9ed24d
2017-12-21Include binary framework resources in robolectric-android-all jarBrett Chabot
am: bde334d928 Change-Id: I7df1885dc0f59d607f890e63efd3b2b89e04b525
2017-12-19Snap for 4509671 from cdcb5e73f2b9a99541af7648c0d30eb7b361aabb to pi-releaseandroid-build-team Robot
Change-Id: Ic06b5ed74421e504ac3d986b987bf5698daf3fed
2017-12-18Include binary framework resources in robolectric-android-all jarBrett Chabot
Test: make robolectric-android-all, sdk Bug: b/70808141 Merged-In: I357df06a054e7bc697b6f7e05dbcdd27d3854c26 Change-Id: I357df06a054e7bc697b6f7e05dbcdd27d3854c26 (cherry picked from commit e94d3a3fa6a09132a203c27857ddd5e6e102993c)
2017-12-18Include build.prop in robolectric jar. am: 34b0bf2163Brett Chabot
am: 663962901c -s ours Change-Id: I35d2010bae232055aa50f39eacbc6733cfbacacb
2017-12-18Include build.prop in robolectric jar.Brett Chabot
am: 34b0bf2163 Change-Id: I577ad7440fdd624ff3d2a313c70ec556674db91f
2017-12-18Include build.prop in robolectric jar.Brett Chabot
Test: make robolectric-android-all Bug: https://github.com/robolectric/robolectric/issues/3492 Bug: b/70808141 Merged-In: Ia7342ea154657b45356c82c5983f5e8a618c4845 Change-Id: Ia7342ea154657b45356c82c5983f5e8a618c4845 (cherry picked from commit f3b2594bef445a75bf7c6f3c3bccf97ac6714979)
2017-12-03Snap for 4481641 from 9db9aa81d8f10abece7bb6c3279304d3990724d4 to pi-releaseandroid-build-team Robot
Change-Id: I0149b798589f1a4a541a8fb5b36e043801a67837
2017-11-30Switch usages of legacy-test to android.test.basePaul Duffin
The legacy-test library has been deprecated in favour of the android.test.base library which is part of the SDK. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * Android.mk Replaced 'legacy-test' with 'android.test.base' in LOCAL_STATIC_JAVA_LIBRARIES because 'robolectric_android-all-stub' statically included legacy-test Bug: 30188076 Test: make checkbuild Change-Id: Ica12e65487ffe37c929f87f9c3a2f683458bf541
2017-11-16Snap for 4455093 from cf7cc8b7d674e3672e657d686d3601046070afa2 to pi-releaseandroid-build-team Robot
Change-Id: I6d6c64cc2df0b536b9283a5efd47dc5cfc30791c
2017-11-16Merge "Include binary framework resources in robolectric-android-all jar"TreeHugger Robot
2017-11-15Include binary framework resources in robolectric-android-all jarBrett Chabot
Test: make robolectric-android-all, sdk Change-Id: I357df06a054e7bc697b6f7e05dbcdd27d3854c26
2017-11-15Snap for 4453288 from 0e9426f6d57d8cc1de4aa6c194cc280bb6685b8d to pi-releaseandroid-build-team Robot
Change-Id: I14b62abe5febbc7c91dadbc2b37dda05c6332174
2017-11-15Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
am: 19188f4476 Change-Id: Ie6c606a69173a3bf3453d6f0ff54efbe679597e5
2017-11-14Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
Change-Id: I9da874514f76e1f4682da06a06f087cdfb2c2224
2017-11-13Merge commit '19a49586eec957b3e0402d5360d6fea35dbca0db' into HEADandroid-wear-8.0.0_r1Xin Li
Change-Id: I0d8fcdcd4f2857b701de553b4846776929262636
2017-11-01Snap for 4428213 from f3b2594bef445a75bf7c6f3c3bccf97ac6714979 to pi-releaseandroid-build-team Robot
Change-Id: I8d9b227c3ea6aa3641e9632a2330802886344508
2017-10-31Include build.prop in robolectric jar.Brett Chabot
Test: make robolectric-android-all Bug: https://github.com/robolectric/robolectric/issues/3492 Change-Id: Ia7342ea154657b45356c82c5983f5e8a618c4845
2017-10-22Snap for 4410736 from 997e24f17ed1536f84221b22f5ae7a5b26be7afa to pi-releaseandroid-build-team Robot
Change-Id: I1928108f66a1800bdb369a0caea5726c0d1ee825
2017-10-21Merge "Follow renames of hamcrest-host and junit-host" am: 7d750ea029 am: ↵Colin Cross
ce5e27d3a7 am: 08e43c95d3 am: 48d5139b46 Change-Id: I3b4f40aea3d4fb948a19341ec029de60d83137b1
2017-10-21Merge "Follow renames of hamcrest-host and junit-host" am: 7d750ea029 am: ↵Colin Cross
ce5e27d3a7 am: 08e43c95d3 Change-Id: Ie11eb876b233afa87b063c1baaf5518979b40a85
2017-10-21Merge "Follow renames of hamcrest-host and junit-host" am: 7d750ea029Colin Cross
am: ce5e27d3a7 Change-Id: Ideb1520f888ef3851c90ee565b400191675e4e6a
2017-10-21Merge "Follow renames of hamcrest-host and junit-host"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Colin Cross
am: 7d750ea029 Change-Id: I39b6132cabcc084e29a5d2c983309d0e96dab380
2017-10-21Merge "Follow renames of hamcrest-host and junit-host"Colin Cross
2017-10-09Follow renames of hamcrest-host and junit-hostColin Cross
hamcrest-host is now hamcrest and junit-host is now junit. Test: m -j checkbuild Change-Id: Ie6dfae8dc9acbe1e81eaf61aa0871fc149445f34
2017-07-21Use libphonenumber-platform instead of libphonenumber. am: d80393c600 am: ↵Brett Chabot
718b86b61a am: cee047bace am: 19a49586ee Change-Id: I3857d238c7b0812f84453146d91641a13db18f92
2017-07-21Merge "Use libphonenumber-platform instead of libphonenumber. am: d80393c600 ↵Brett Chabot
am: 39053bd24c am: 66690579e9" into oc-mr1-dev-plus-aosp am: 15243098a0 Change-Id: Ib042a7640d3f366b5cf0094d95e1d30b97411389
2017-07-21Use libphonenumber-platform instead of libphonenumber. am: d80393c600 am: ↵Brett Chabot
39053bd24c am: 5c7eed7f31 am: fcbd95c71c Change-Id: Id579a1ccc1ca2d726c95cd5343f7ada4c9c8cecc
2017-07-21Use libphonenumber-platform instead of libphonenumber. am: d80393c600 am: ↵Brett Chabot
718b86b61a am: cee047bace Change-Id: I06337c661a68ad94eb835477c931efeaedacb4a1
2017-07-21Merge "Use libphonenumber-platform instead of libphonenumber. am: d80393c600 ↵Android Build Merger (Role)
am: 39053bd24c am: 66690579e9" into oc-mr1-dev-plus-aosp
2017-07-21Use libphonenumber-platform instead of libphonenumber. am: d80393c600Brett Chabot
am: 718b86b61a Change-Id: Icc0e7ba25bf9acb300c1c64f801287d1418705a5
2017-07-21Use libphonenumber-platform instead of libphonenumber. am: d80393c600 am: ↵Brett Chabot
39053bd24c am: 5c7eed7f31 Change-Id: I5af02a22622d6b3b36da77783c7df7a99102e8dd
2017-07-21Use libphonenumber-platform instead of libphonenumber. am: d80393c600 am: ↵Brett Chabot
39053bd24c am: 66690579e9 Change-Id: I5a2b9a999841cdf41b57a01341fde216f2c4b4d7
2017-07-21Use libphonenumber-platform instead of libphonenumber. am: d80393c600Brett Chabot
am: 39053bd24c Change-Id: I1f853f91ba5fb2f62ed13299430ce2ca401d58ec
2017-07-21Use libphonenumber-platform instead of libphonenumber. am: d80393c600oreo-mr1-devBrett Chabot
am: 39053bd24c Change-Id: I9eadb9990974bfe3f6b1e27728cbd04505474efe
2017-07-21Use libphonenumber-platform instead of libphonenumber.Brett Chabot
am: d80393c600 Change-Id: I745427e72fbb37f02ed61b3745fb8259a016ee78
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 04:37:43 +0000