Commit Graph

272 Commits

Author SHA1 Message Date
Patrick Rohr
49ca266409 cronet: delete option to disable cronet in tm-mainline-prod
With the release cut of the July train and the recent automerger
cutover, tm-mainline-prod is now officially an abandoned branch.

This change deletes (most) infrastructure that was put in place to
disable cronet on tm-mainline-prod.

Test: builds
Bug: 278639767
(cherry picked from https://android-review.googlesource.com/q/commit:2e3e2955b8cf7ba181788140dd62b2dd20e7b600)
Merged-In: I078f2114b736a634f08d8f704c19beb2224ef645
Change-Id: I078f2114b736a634f08d8f704c19beb2224ef645
2023-05-26 19:44:22 +00:00
Motomu Utsumi
43007b14df Merge "Move cronet to framework-connectivity" am: 8b02a2682a am: ceb9f59803
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535863

Change-Id: I42bfc86f2f004faddf8ce71ace0ce7c3feb1c895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 07:32:33 +00:00
Motomu Utsumi
ceb9f59803 Merge "Move cronet to framework-connectivity" am: 8b02a2682a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535863

Change-Id: I0d22e595a4df67e3cf7c4300714b8e6bf736703d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 06:47:45 +00:00
Motomu Utsumi
73e2e87d56 Move cronet to framework-connectivity
aosp/2384137 added cronet to framework-tethering.
But framework-connectivity is a better place to put cronet since
cronet does not work on R devices (b/270049141) and
framework-tethering is R+, framework-connectivity is S+.

Followup CLs will move some modules (e.g. CronetJavaPrejarjarDefaults)
that use the branch dependent soong variables to framework/Android.bp

Test: TH
Bug: 278070640
Change-Id: I6bc10116759fb9e083c02147908e53022dab740a
2023-04-19 11:32:12 +09:00
Chidera Olibie
e27a0aa07e Merge "Revert "Fix symbol not found error for hidden apis used by MTS"" am: 02918132de
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535699

Change-Id: I12c0a24fc42e8530e6722426fd4ffeb5488ecef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 09:39:33 +00:00
Chidera Olibie
ef0074143d Revert "Fix symbol not found error for hidden apis used by MTS"
This reverts commit 5f44ed3e7e.

Reason for revert: The symbol not found error was a transient build failure.

Change-Id: Iada1a0bc9c2282286c1e3b972de42e6387c901d6
2023-04-13 09:38:39 +00:00
Chidera Olibie
bfe0445299 Merge "Fix symbol not found error for hidden apis used by MTS" am: 8d4702a1f0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2505055

Change-Id: I2fd0071d0689db59fa81f29cddfe6fa6c6ea4b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 08:24:42 +00:00
Chidera Olibie
5f44ed3e7e Fix symbol not found error for hidden apis used by MTS
This fails to build on git_master when
depending on `sdk_version:module-current` and
`libs:["framework-tethering-pre-jarjar"].

AIUI, some builds use sdk prebuilts that have compiled out
some of the hidden apis. And thus fails with symbol not found.

So we depend on the impl version of frame-tethering so we always
have access to these hidden apis for MTS.

Test: atestNetHttpCoverageTests
Change-Id: Id68a9051b9f8566f9ca42142669150a6db8b0925
2023-03-23 15:53:11 +00:00
Mohannad Farrag
45d81bf4dc Revert^2 "gn2bp: Remove soong_namespace" am: 9c6801f81b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2505960

Change-Id: I0572cf0b1ceb56ef1a2186d73c17ecfac0e9b3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 15:42:10 +00:00
Mohannad Farrag
f6c6d27601 Revert "gn2bp: Remove soong_namespace" am: 8484ec4dcd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2505958

Change-Id: If94589a125c316679b5524240446596ff88b6328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 12:53:53 +00:00
Mohannad Farrag
02790d8b53 gn2bp: Remove soong_namespace am: 16ba062336
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2502135

Change-Id: Ic75283ac1d606d3e9305822b729e7791497a0588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 12:53:33 +00:00
Mohannad Farrag
9c6801f81b Revert^2 "gn2bp: Remove soong_namespace"
8484ec4dcd

Change-Id: I490c09179ea6a20ca5fba83c314b552d360be688
2023-03-23 12:47:47 +00:00
Mohannad Farrag
8484ec4dcd Revert "gn2bp: Remove soong_namespace"
Revert submission 2502135-remove_soong_namespace

Reason for revert: Missing line needs to be added

Reverted changes: /q/submissionid:2502135-remove_soong_namespace

Change-Id: I780a21cf7031e04eb368fda4f93ed16ea032ca8d
2023-03-23 12:36:48 +00:00
Mohannad Farrag
16ba062336 gn2bp: Remove soong_namespace
* This was causing the infra to ignore the modules and masking build errors.

Test: TH
Change-Id: Ic5aa3557353488d5370f4d9c4240954820bfe52b
2023-03-23 12:14:04 +00:00
Stefano Duo
a5e1029101 Merge "Reland "Bundle Cronet's boringssl"" 2023-03-20 13:10:30 +00:00
Stefano Duo
ea2617fd91 Merge "Reland "Bundle Cronet's boringssl"" into tm-mainline-prod 2023-03-20 10:16:42 +00:00
Motomu Utsumi
ef03027e61 Merge "cronet: Update APIs naming" am: f4ea712ce4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2495437

Change-Id: Idf379603363c71ee5e8240b4cbfd1948cf1a5431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:18:24 +00:00
Stefano Duo
43d89f659f Reland "Bundle Cronet's boringssl"
This relands commit 2cd4ac8725

Merged-In: I903369dbad37b663a39e80149e25b0634386df6d
Change-Id: I018121bf4d02ccc59c89de39e3d1598deb9cf67b
Bug: 274094720
2023-03-17 13:46:25 +00:00
Stefano Duo
9f940b7bf5 Reland "Bundle Cronet's boringssl"
This relands commit 2cd4ac8725

Merged-In: Iee63b9f53866d1f44440fed1e632549dd6b296f9
Change-Id: I903369dbad37b663a39e80149e25b0634386df6d
Bug: 274094720
2023-03-17 13:44:21 +00:00
Motomu Utsumi
2441e4aea6 cronet: Update APIs naming
Bug: 265674359
Bug: 273937039
Test: TH
Change-Id: I5fc149396511effdfabd462eba80d1a010ee205a
2023-03-17 09:04:56 +00:00
Dan Stahr
35e1256321 Merge "cronet: Fix AutoBoxing API linter issue" am: 9ed7a339a1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2487297

Change-Id: Ic8b1bd9de78e5eedca3cb801310107d8375ece14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 15:34:31 +00:00
Dan Stahr
9ed7a339a1 Merge "cronet: Fix AutoBoxing API linter issue" 2023-03-16 15:03:55 +00:00
Anton Hansson
2b246a30df Merge "Use filegroup defaults for framework sources" am: 41ad986490
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2489555

Change-Id: Ib228177586d24d210a1abf808af2557d929141c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 09:27:51 +00:00
Motomu Utsumi
5cdd07aa26 cronet: Fix AutoBoxing API linter issue
Bug: 265674359
Test: TH
Change-Id: Id2489a2337ff4d0fd0c30929f9e56d8d027dbbc6
2023-03-15 13:54:17 +00:00
Anton Hansson
57f3d69fd5 Use filegroup defaults for framework sources
There's now a shared defaults module for this kind of filegroup. Use
that and remove the previously duplicated prop.

Bug: 271816210
Test: m
Change-Id: Ia4547984a73179fdfc98c427482dd10246f9722c
2023-03-15 10:36:52 +00:00
Treehugger Robot
3f7bd80351 Merge "Revert "Bundle Cronet's boringssl"" am: 853ef56fb6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2487884

Change-Id: I9e7867451e0275a36752da2e6b5bd2878926c6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:58:22 +00:00
Treehugger Robot
853ef56fb6 Merge "Revert "Bundle Cronet's boringssl"" 2023-03-15 00:31:21 +00:00
Patrick Rohr
77c084d1f6 Revert "Bundle Cronet's boringssl"
This reverts commit 2cd4ac8725.

Reason for revert: b/273575026

Change-Id: I5b9886465b8a0f71af469d303a39f670a9b0cb68
2023-03-14 22:45:06 +00:00
Treehugger Robot
c3cdcf4fff Merge "Cronet API: make UrlRequest.Callback an interface." am: 944d6a3235
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2482136

Change-Id: I6de8a4e03395c21634f6db17458dbcb6ffeaa912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 16:17:37 +00:00
Treehugger Robot
944d6a3235 Merge "Cronet API: make UrlRequest.Callback an interface." 2023-03-14 15:42:28 +00:00
Dan Stahr
fcfe8c7d8e Cronet API: make UrlRequest.Callback an interface.
For consistency with other Callback classes, and not to force class
hierarchy on users. The historical "callback completeness" issue can be
mnitigate using interface defaults.

Test: atest CtsNetHttpTestCases
Change-Id: Ibf2aaf4396ab9defdeb4e3882cea6b1b2dbd36ee
Merged-In: Id8fcc13567da8878e848f3c6668d865e77b48146
2023-03-14 05:57:19 +00:00
Stefano Duo
6851b2e701 Bundle Cronet's boringssl am: 2cd4ac8725
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2402008

Change-Id: Ibb4b689fc04833cbe8601fa635eb1c7f7042df58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 18:29:12 +00:00
Stefano Duo
2cd4ac8725 Bundle Cronet's boringssl
Test: m && atest CtsNetHttpTestCases
Change-Id: I3c28a52d60128cf4324eda436c1f6e9fa463108e
2023-03-13 13:28:35 +00:00
Dan Stahr
a212683ac7 Merge "cronet: re-enable lint" am: 3f0a0db65d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2480388

Change-Id: Ie117592b26f30eb31f2c9317350cae3958423e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 14:27:58 +00:00
Dan Stahr
248fedeac4 Merge "cronet: Hide old newUrlRequestBuilder" am: fafc4731ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2474709

Change-Id: Ia9434dbb330859b253dc96f1318c478c4173ef7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 14:27:38 +00:00
Motomu Utsumi
d4a1c63c5d cronet: re-enable lint
Bug: 265674359
Test: TH
Change-Id: I867a66518db0eb9fe446aa28e07d4678f0e3af94
2023-03-10 19:01:18 +09:00
Motomu Utsumi
d229268989 cronet: Hide old newUrlRequestBuilder
Bug: 272009719
Bug: 265674359
Test: TH
Change-Id: If98ea3c45d9e181773f9d5877462d4d3c6097302
2023-03-10 13:38:08 +09:00
Motomu Utsumi
cecbe3e5ff Merge "cronet: Make BidirectionalStream.Callback interface" am: 04de61f9e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2473652

Change-Id: I59542502bee6eea65d9887ac51f89104e877b6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 16:36:15 +00:00
Motomu Utsumi
04de61f9e9 Merge "cronet: Make BidirectionalStream.Callback interface" 2023-03-09 16:19:07 +00:00
Treehugger Robot
d466421408 Merge changes from topics "setter_getter_fix", "use_header_block" am: ba0f26fb86
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2475248

Change-Id: I6fa1ad23b106b93235e9103d2a1c2726e0ddb8b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 15:41:11 +00:00
Treehugger Robot
ba0f26fb86 Merge changes from topics "setter_getter_fix", "use_header_block"
* changes:
  cronet: Use HeaderBlock for getHeaders API
  cronet: Address Setter/Getter related API linter issues
2023-03-09 15:03:34 +00:00
Dan Stahr
ee4666f493 Merge "Expose the getter for idle connection timeout." am: 78cfe3336b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2465877

Change-Id: I50287ccd17b2f90e82b1c36b67284ad98b83fa29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 12:08:30 +00:00
Dan Stahr
78cfe3336b Merge "Expose the getter for idle connection timeout." 2023-03-09 11:33:18 +00:00
Dan Stahr
f63b5df622 Expose the getter for idle connection timeout.
Test: m
Bug: 271423645
API-Coverage-Bug: 251012627
Change-Id: I10862786e83e79ced1c4afd9328d6a158bae7232
2023-03-09 11:32:11 +00:00
Motomu Utsumi
d41fa7b77c cronet: Make BidirectionalStream.Callback interface
Bug: 271423645
Bug: 265674359
Test: TH
Change-Id: I0efb1ad4719a62b1e7ad2c96af0660e212dbb966
2023-03-09 18:33:55 +09:00
Motomu Utsumi
444192ad69 cronet: Use HeaderBlock for getHeaders API
Bug: 265674359
API-Coverage-Bug: 251012627
Test: TH
Change-Id: I03bfafdc6c855f38145eb9d35c1f0ac6934d903f
2023-03-09 18:33:55 +09:00
Motomu Utsumi
00b4a97224 cronet: Address Setter/Getter related API linter issues
Bug: 271423645
Bug: 265674359
Test: TH

Change-Id: Id1628dd7af48a8e079636924b66368db0eb2ec4e
2023-03-09 18:33:52 +09:00
Dan Stahr
ae0d775d01 Merge "cronet: Fix remaining MissingNullability API linter issue" am: a0076a08b2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2468862

Change-Id: Ic71d8dae3ad31582771a0e6bbfe8a40b3920ec07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 15:47:41 +00:00
Dan Stahr
63853d468e Merge "cronet: Fix some MissingNullability API lineter issues" am: 8725ce2d0e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2412092

Change-Id: I6a3ccf7a9a33ea96c99e3447e13ef8d2a914d830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 15:47:17 +00:00
Motomu Utsumi
41b5e83be0 cronet: Fix remaining MissingNullability API linter issue
Bug: 265674359
Test: TH
Change-Id: I7e498d12469a974aa5b4f1d94223e6254e072c29
2023-03-08 11:39:51 +09:00