summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-15Merge "Use filegroup"ndk-sysroot-r21Treehugger Robot
2019-09-13Use filegroupJiyong Park
Use filegroup to specify sources files with base directory via 'path' property. This allows the build system to filter Java source files by their packages. Bug: 140764681 Test: m Change-Id: I1af9c94c6b77a672604b8efe73881212666e2c25
2019-08-14DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I3e8544cea1304f2734b92efe7c66d663f29c3781
2019-07-19Merge "Convert use of Time.format() to an alternative"Neil Fuller
am: 60ac57777a Change-Id: Iada742d6409d47be3aca1e55bed375707157a680
2019-07-19Merge "Convert use of Time.format() to an alternative"Neil Fuller
2019-07-17Convert use of Time.format() to an alternativeNeil Fuller
Convert use of Time.format() to an alternative. This avoids future Y2038 issues associated with Time. The code has been changed to use GregorianCalendar which has lenient rounding behavior when values are out of range (similar to android.text.format.Time). This is unlike LocalDateTime, which throws exceptions. There are no tests for this code. Bug: 16550209 Test: build only Change-Id: I43e016e7ed80f81887708c4a0f0123ce4baaf4b8
2019-07-03Merge "Fix include syntax on libcore/OWNERS file" am: 1e64a2fd73Neil Fuller
am: 26746ff117 Change-Id: I87264d8b7986689c36aa31e8f2718c1c0bfb4f73
2019-07-03Merge "Update OWNERS to reference libcore's OWNERS file" am: 2c8acbcbf7Neil Fuller
am: c33f449831 Change-Id: Ifc23d570d379693b38f198eeea9e919e8ce9f72e
2019-07-03Merge "Fix include syntax on libcore/OWNERS file"Neil Fuller
am: 1e64a2fd73 Change-Id: I495fde559a34a27cdbc453e37c3a82f90a51c839
2019-07-03Merge "Update OWNERS to reference libcore's OWNERS file"Neil Fuller
am: 2c8acbcbf7 Change-Id: I47f5b550197177bb8dcea5bcf76f4e4032ce669f
2019-07-03Merge "Fix include syntax on libcore/OWNERS file"android-o-mr1-iot-release-1.0.14Neil Fuller
2019-07-03Fix include syntax on libcore/OWNERS fileNeil Fuller
The syntax requires the project to be specified as a prefix. Change-Id: I9b7bea65d51651a116a78c877da615905c249ddb Exempt-From-Owner-Approval: Fixes OWNERS Test: None
2019-07-03Merge "Update OWNERS to reference libcore's OWNERS file"Neil Fuller
2019-07-02Update OWNERS to reference libcore's OWNERS fileNeil Fuller
Update OWNERS to reference libcore's OWNERS file Test: ls ../../libcore/OWNERS Change-Id: I50527e3cf14d396cfe0435910c42afe725a43688
2019-06-05Merge "Switch to exporting the current.txt as a filegroup" am: 45bb19fa4aPaul Duffin
am: 0eafc8d30b Change-Id: Ib9da35851ebf690a8a83106d7503f091fa2a43a0
2019-06-05Merge "Switch to exporting the current.txt as a filegroup"Paul Duffin
am: 45bb19fa4a Change-Id: I593d080baaf1b2356fef90d874ccf069902cc9cd
2019-06-05Merge "Switch to exporting the current.txt as a filegroup"android-o-mr1-iot-release-1.0.13Paul Duffin
2019-06-04Switch to exporting the current.txt as a filegroupPaul Duffin
This is needed as the cts/tests/signature build files expect the file to be copied in cts/tests/signature/api. Bug: 122332514 Test: make checkbuild Change-Id: I3340bc3896698cb794e019e6d44c67f54e7234c2
2019-06-03Merge "Export the api/current.txt file for use by cts/tests/signature tests" ↵Paul Duffin
am: e6bcc3313d am: 3b1ee44d8b Change-Id: I79ce18e66903be87d6032dfad3cc58cf19665460
2019-06-03Merge "Export the api/current.txt file for use by cts/tests/signature tests"Paul Duffin
am: e6bcc3313d Change-Id: Ie881354453ff9f790edee86e98de8cb5d588daec
2019-06-03Merge "Export the api/current.txt file for use by cts/tests/signature tests"Treehugger Robot
2019-05-30Export the api/current.txt file for use by cts/tests/signature testsPaul Duffin
Bug: 122332514 Test: atest -p cts/tests/signature Change-Id: I78b8a098af8fd3c5aa6b9b04c10c131f56975788
2019-02-27Merge "Use public APIs instead of Conscrypt ones" am: efe309e03d am: a4e0d3bea1android-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-releaseAdam Vartanian
am: 44f70c3769 Change-Id: Ie45222c8aab74d0591250c42ab8aa16e66305be7
2019-02-27Merge "Use public APIs instead of Conscrypt ones" am: efe309e03dAdam Vartanian
am: a4e0d3bea1 Change-Id: I58650fb6ff72b6cc8129890dcc7a831d66a567fe
2019-02-27Merge "Use public APIs instead of Conscrypt ones"Adam Vartanian
am: efe309e03d Change-Id: Ica26cfc21702834a71021a5c0f993df38705abf1
2019-02-27Merge "Use public APIs instead of Conscrypt ones"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 Robot
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 744329796f Change-Id: Ib36087c002c661550499274e47ad1089648c249a
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I7399382ec1978a1d3c12ec851982cf418bd4fd00
2019-02-22Use public APIs instead of Conscrypt onesAdam Vartanian
Use the equivalent public APIs on SSLContext instead of reaching into OpenSSLContextImpl, except for the one place where a Conscrypt-specific API is needed. Bug: 123738844 Bug: 119752589 Test: cts -m CtsLibcoreTestCases Change-Id: Idcf258b980b4c37fbe1166b4189454d6a5c35c83
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Ie75163fd6931e11e25ebf0467687a484af9a66aa
2019-02-14Merge "Remove duplicate classes from org.apache.http.legacy.stubs" am: ↵Paul Duffin
1e147ad9d0 am: 746d3440c8 am: fe8af22495 Change-Id: I26d6ba224a99fb96349ad5fe058f42be1901ddfa
2019-02-14Merge "Remove duplicate classes from org.apache.http.legacy.stubs" am: ↵Paul Duffin
1e147ad9d0 am: 746d3440c8 Change-Id: I0b6670eaa4dacd2483463ed0c50e992af98b66cb
2019-02-14Merge "Remove duplicate classes from org.apache.http.legacy.stubs"Paul Duffin
am: 1e147ad9d0 Change-Id: I248ef1f486a201657c3e03190827774c3f4d9ceb
2019-02-14Merge "Remove duplicate classes from org.apache.http.legacy.stubs"Treehugger Robot
2019-02-12Remove duplicate classes from org.apache.http.legacy.stubsPaul Duffin
Previously, the org.apache.http.legacy.stubs library contained classes that were also provided by android.jar stubs library. That caused problems for app developers, e.g, bug 118826718. This change ensures that the org.apache.http.legacy.stubs library no longer overlaps with the android.jar stubs library by subtracting the API specification for the android.jar from the API specification for this. This could potentially cause build problems if someone is building against the org.apache.http.legacy.stubs but not against android.jar stubs. However, that is very unlikely and easy to fix. Binary compatibility is not affected by this. Bug: 119021844 Test: make org.apache.http.legacy.stubs and check classes to ensure that they do not contain classes provided by android.jar Change-Id: I0d45f7fae44ef71a9f5ea97f49e99784ce30f033
2019-02-12Merge "Reformat Android.bp file using bpfmt" am: 7203ad7f47 am: e89e79a49aPaul Duffin
am: d4e0f3f188 Change-Id: I313af0d85a30b88f7d24f1372ca4e749c634b593
2019-02-12Merge "Reformat Android.bp file using bpfmt" am: 7203ad7f47Paul Duffin
am: e89e79a49a Change-Id: Ie8ce6d8e9cbc4b9a176dd4c357ac94702a1cdb91
2019-02-12Merge "Reformat Android.bp file using bpfmt"Paul Duffin
am: 7203ad7f47 Change-Id: I68e5ea4a7903a09a9939ee601bb683cdf839001b
2019-02-12Merge "Reformat Android.bp file using bpfmt"Paul Duffin
2019-02-11Reformat Android.bp file using bpfmtPaul Duffin
Test: make checkbuild Change-Id: I034d52a69675f6c93c383089ba68011ee42f0be8
2019-02-06Merge "Add TEST_MAPPING for api specifications" am: ac2549f7b7 am: fff7ec6ebbPaul Duffin
am: 1da9aacf79 Change-Id: I31d9ae02b3ec2aafc7dadb0bace43a9553cb72e4
2019-02-06Merge "Add TEST_MAPPING for api specifications" am: ac2549f7b7Paul Duffin
am: fff7ec6ebb Change-Id: Ic6d6534d456a06fd8c4626c8a1efc1f860b9028d
2019-02-06Merge "Add TEST_MAPPING for api specifications"Paul Duffin
am: ac2549f7b7 Change-Id: Idca05558f4fe4f8254c7e71c000a9fee2ab326ff
2019-02-06Merge "Add TEST_MAPPING for api specifications"Paul Duffin
2019-02-05Add TEST_MAPPING for api specificationsPaul Duffin
Changes to the api directory will run the tests which make use of the API specification. Bug: 123254057 Test: atest Change-Id: I56e207cd40e8aade9bff3de094240ce457b9a403
2019-01-21[automerger skipped] Merge "Update signature files to the new format" am: ↵Tor Norbye
a6c3d576e3 am: 1922932041 am: b2ffef0d68 -s ours am skip reason: change_id I2172319e3d580eb4b1ffc43616e5595dba20f026 with SHA1 11f217c5de is in history Change-Id: I85627d0e11e5b5816b60ff08219c544de2986467
2019-01-21Merge "Update signature files to the new format" am: a6c3d576e3Tor Norbye
am: 1922932041 Change-Id: I2f30078a3b49ee682ddf00591687c6e9c375bd5c
2019-01-20Merge "Update signature files to the new format"Tor Norbye
am: a6c3d576e3 Change-Id: I5de2e646caaacfdaf649bf080e38f87b2f38dcbf
2019-01-20Merge "Update signature files to the new format"Tor Norbye
2019-01-11Update signature files to the new formatTor Norbye
The new format is described in tools/metalava/FORMAT.md. Change-Id: I91820fa3c0de39ac95b523d7d7fafd7fb7ecc50a Fixes: 116589402 Switch signature files over to the v2 format Fixes: 112626813 Drop "synchronized" modifier from the signature format Fixes: 122358225 Omit overriding methods that only differ in final [...] Fixes: 73088715 API Review: Need doclava to output nullability Fixes: 79739773 API Review: Metalava enforcing constants are constant Exempt-From-Owner-Approval: Large-scale tooling change Test: make sdk, make update-api, make checkapi Merged-In: I2172319e3d580eb4b1ffc43616e5595dba20f026
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 23:11:13 +0000