summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-04Merge "Set dist_group: "android" for external/apache-http ↵android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
java_sdk_libraries" am: f176328d3a Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1701526 Change-Id: I9431ddd4d2acaa782bc066248a311d55489a71e7
2021-06-04Merge "Set dist_group: "android" for external/apache-http java_sdk_libraries"Treehugger Robot
2021-06-01Set dist_group: "android" for external/apache-http java_sdk_librariesColin Cross
dist_group replaces owner and the default is going to change, set it to the current default "android" for external/apache-http java_sdk_libraries. Bug: 186723288 Test: m checkbuild Change-Id: I745a89015e20510bfbe63ae0930523f86bf96f1b
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http" am: 547e8a0103android-s-beta-2android-s-beta-1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1588915 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I07406d713dc0de0992b0f3b37980d66853cbd570
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/apache-httpBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iad980bb9c1e24745f564d550083bc37229552f62
2020-06-25Merge "Fix ReferencesHidden issues in apache http" am: 55b5ba17af am: ↵Treehugger Robot
bd2a970763 am: 57aa3fda81 am: 3a340db0c8 Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243 Change-Id: Ie9c6061bdb8a6f5b9b4bb7ba6ada9ebebff89c7c
2020-06-25Merge "Fix ReferencesHidden issues in apache http" am: 55b5ba17af am: ↵Treehugger Robot
bd2a970763 am: 57aa3fda81 Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243 Change-Id: I14d4b7642abd8b3f678179f74ac626ff0199f0a2
2020-06-25Merge "Fix ReferencesHidden issues in apache http" am: 55b5ba17af am: bd2a970763Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243 Change-Id: I035dba2a99a0944e23a07c295cb1b8f9fbbe5992
2020-06-25Merge "Fix ReferencesHidden issues in apache http" am: 55b5ba17afTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243 Change-Id: I31da5bc83ddc25dd416bad909841f4dfdb1140de
2020-06-25Merge "Fix ReferencesHidden issues in apache http"android-r-beta-3android-r-beta-2Treehugger Robot
2020-06-24Fix ReferencesHidden issues in apache httpAurimas Liutikas
We had RequestQueue had several public APIs that used hidden Connection and Request classes. This made these impossible to call for developers and in fact stubs would not even compile without a metalava workaround for this. This CL remove the disabling of ReferencesHidden as ignoring ReferencesHidden leads to pulling in hidden classes into API surfaces which is always a bug. Removing hiding here so this option to suppress can be removed completely. Test: make -j -> passes Change-Id: I8e02af533be5cd0eccad0d9eed0a85c9b1b9b3e8
2020-05-12[automerger skipped] Add lint-baseline.txt am: 426077d091 -s ours am: ↵Paul Duffin
b9c93abb3e -s ours am: 4e878869ac -s ours am skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history Change-Id: Ifae2921805aa87ab4722c13ef2bfbebc0eb4e28d
2020-05-12[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 am: ↵Paul Duffin
3ed8712e12 -s ours am skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history Change-Id: Id11ee70db0ad6989e979b4bcb7e698c5e01473ae
2020-05-12[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 -s ↵Paul Duffin
ours am: 6e5deb6344 -s ours am skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 35794f3807 is in history Change-Id: I5725fa9597ca8da244d38bc4c2110e8879d7a8bc
2020-05-12Add lint-baseline.txt am: 426077d091 am: 1d6c204608android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releasePaul Duffin
Change-Id: I4c014c9aade2da92206a9f8939153bb2b0c8b5dc
2020-05-12[automerger skipped] Add lint-baseline.txt am: 426077d091 -s ours am: ↵Paul Duffin
b9c93abb3e -s ours am skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 426077d091 is in history Change-Id: Ied5d2b80a636f0070ca149e803dc492868488465
2020-05-12[automerger skipped] Add lint-baseline.txt am: 426077d091 am: 1d6c204608 -s oursPaul Duffin
am skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 35794f3807 is in history Change-Id: I9332974d12fe1a7c6a9f2badbb7cee8870b01b63
2020-05-12[automerger skipped] Add lint-baseline.txt am: 426077d091 -s oursPaul Duffin
am skip reason: Change-Id I1009af980a99beab5859474435a80e27288d6df1 with SHA-1 35794f3807 is in history Change-Id: I04e600911c4ba3590d4cf5d3f6a469edd8fd110d
2020-05-12Add lint-baseline.txt am: 426077d091android-11.0.0_r16android11-d1-b-releasePaul Duffin
Change-Id: Ic04554922023f101547cd45623b3f3591cba9f31
2020-05-11Add lint-baseline.txtandroid11-devPaul Duffin
In preparation for enabling API lint checking on java_sdk_library add a lint-baseline.txt containing all the existing issues. The API is old and has been deprecated so there is little to no chance that any issues found will be fixed. Bug: 156126315 Test: m checkapi Merged-In: I1009af980a99beab5859474435a80e27288d6df1 Change-Id: I1009af980a99beab5859474435a80e27288d6df1 (cherry picked from commit 35794f3807f34c38e702c9485f8adf294c6aa363)
2020-05-11Merge "Add lint-baseline.txt" am: bd050a696b am: d176cfc822 am: 4acd5ba178 ↵Treehugger Robot
am: 44c2e1f977 Change-Id: Ieaabe65b32c682f9b1fafce73a94838eb289223e
2020-05-11Merge "Add lint-baseline.txt" am: bd050a696b am: d176cfc822 am: 4acd5ba178Treehugger Robot
Change-Id: Ie9a59006e33456db4e6896006e4f9944f763cd64
2020-05-11Merge "Add lint-baseline.txt" am: bd050a696b am: d176cfc822Treehugger Robot
Change-Id: I669979fbaec480973814e36efdfe7f4388b59843
2020-05-11Merge "Add lint-baseline.txt" am: bd050a696bTreehugger Robot
Change-Id: I97fb4a9e27dd0fd49e6d334608c94cca8b1a33f0
2020-05-11Merge "Add lint-baseline.txt"Treehugger Robot
2020-05-10Add lint-baseline.txtPaul Duffin
In preparation for enabling API lint checking on java_sdk_library add a lint-baseline.txt containing all the existing issues. The API is old and has been deprecated so there is little to no chance that any issues found will be fixed. Bug: 156126315 Test: m checkapi Change-Id: I1009af980a99beab5859474435a80e27288d6df1
2020-04-29Merge "Add METADATA to apache-http: Apache2=NOTICE" am: 8369056b59 am: ↵Treehugger Robot
dc675ca795 am: de098f44a7 am: 075235473f Change-Id: I06315447c9444963ab9aec102b7d2688165080ab
2020-04-29Merge "Add METADATA to apache-http: Apache2=NOTICE" am: 8369056b59 am: ↵Treehugger Robot
dc675ca795 am: de098f44a7 Change-Id: Ica5dd227a1aab3b0f900d560b8872c05146fac16
2020-04-29Merge "Add METADATA to apache-http: Apache2=NOTICE" am: 8369056b59 am: ↵Treehugger Robot
dc675ca795 Change-Id: I8324727a36d7d2c8145fc4bd5865da5fb2a2821f
2020-04-29Merge "Add METADATA to apache-http: Apache2=NOTICE" am: 8369056b59Treehugger Robot
Change-Id: Iceb9e9ccd8709e674fd6a08e07329cda306b9fee
2020-04-29Merge "Add METADATA to apache-http: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to apache-http: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I3fb594a742d4d5b4510b0b6d253508ecb799eb53
2019-10-30Merge "Build API stub with less number of source files" am: e4ec72bee6 am: ↵Jiyong Park
f0bc40ffae am: d176d36489 Change-Id: I67de7ba7cca3b52666299bb3dffe5bf27b5b31f0
2019-10-30Merge "Build API stub with less number of source files" am: e4ec72bee6android-r-preview-4android-r-preview-3android-r-preview-2Jiyong Park
am: f0bc40ffae Change-Id: I56a8be4ecfa0913025ace704a861bc3ef1cb264b
2019-10-30Merge "Build API stub with less number of source files"android-r-preview-1Jiyong Park
am: e4ec72bee6 Change-Id: Ia4d527ce80183ba6f53b1c363f4185d0628b7e75
2019-10-31Merge "Build API stub with less number of source files"Jiyong Park
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7e518e4fab am: f0fcbccb52 -s ours am skip reason: subject contains skip directive Change-Id: Ieb9e5f4f844d481e08f24dc3178e0726068818e9
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 7e518e4fab Change-Id: Ib976f8d84124c90813ed95e409be20092b3502d9
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ib46dbc7e9bc041503d46e1b52fb66f6116bbabbb
2019-10-30Build API stub with less number of source filesJiyong Park
The metalava fix 09094fc5e566a380b7aa1a4c3948ac66cebc0aba allows us to not include source files having class definitions that are referenced by private constructors of the API classes. Removing the now uncessary source files from the input list so that metalava can run faster. Bug: 141149570 Test: m Change-Id: I8d26acb3c6993fa0cf11e7b826a0804ec24b9cb8
2019-09-15Merge "Use filegroup" am: f3ffd568ef am: c4b33b7a21 am: 6afa5d637cJiyong Park
am: 0020ce6af2 Change-Id: Ifa0b065202dda7f46e0477c52ee12da237337122
2019-09-15Merge "Use filegroup" am: f3ffd568ef am: c4b33b7a21Jiyong Park
am: 6afa5d637c Change-Id: I3d6c00be60c1951326df94dc8f3a6f377bee9fe3
2019-09-15Merge "Use filegroup" am: f3ffd568efJiyong Park
am: c4b33b7a21 Change-Id: I4e97bf43baeb6b2b456e2fbd09e1456e860f1d15
2019-09-15Merge "Use filegroup"Jiyong Park
am: f3ffd568ef Change-Id: I8bd2047137a1821cc7cb7894da83e3a49ae4ea85
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-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: 0869bc39ad -s ours am: 99713c39c7 am: cccc1fd5b1 am: 0dd7408bd0 -s ours am skip reason: subject contains skip directive Change-Id: I73122856ef2c488510a6ebbd0a72f9b114f776d2
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: 0869bc39ad -s ours am: 99713c39c7 am: cccc1fd5b1 Change-Id: I89e72502f7891dcd66481d19cceb0f162837ed7b
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: 0869bc39ad -s ours am: 99713c39c7 Change-Id: Ia8c4077171e5da841ee89d7153fc2b4c52c938e9