Commit Graph

296 Commits

Author SHA1 Message Date
Patrick Rohr
7b40e0ccd9 cronet import: do not jarjar J.cronet_tests_N
Cronet tests do not use a jarjar prefix, so do not jarjar their J/N
implementation.

Test: atest NetHttpTests
Bug: 278639767
(cherry picked from https://android-review.googlesource.com/q/commit:311feaff8b4a66b0c8a7bc5ed72f916d666c683e)
Merged-In: Ie4b8bfa13ecbbca014e22d653fa0d39a5554c10e
Change-Id: Ie4b8bfa13ecbbca014e22d653fa0d39a5554c10e
2023-05-26 19:47:43 +00:00
Patrick Rohr
ea96671c8b cronet tests: remove most of NetHttpTestsLibPreJarJar
Since cronet_java_tests (previously cronet_aml_javatests_sources) is now
an android_library directly in external/cronet (to support "mm" in that
folder), the dependencies can be removed.

A form of android_library is still required to wrap cronet_java_tests,
so the AndroidManifest (in this folder) is forwarded properly to the
common coverage test target.

Test: TH
Bug: 278639767
(cherry picked from https://android-review.googlesource.com/q/commit:cc2e2dcb4411e8ae07cede2da27bf5bd6e5505c5)
Merged-In: I25c6371c64e6cfcbb48e9e3f2976d47279791f21
Change-Id: I25c6371c64e6cfcbb48e9e3f2976d47279791f21
2023-05-26 19:47:30 +00:00
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
Treehugger Robot
fc4d6ffd72 Merge "Stop checking for QUIC success in CTS tests" am: af37953664 am: 2a6dbacb3a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2554970

Change-Id: I9d4af6ec5094d456bb72c96fe65e843d9be2f74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 13:30:05 +00:00
Treehugger Robot
2a6dbacb3a Merge "Stop checking for QUIC success in CTS tests" am: af37953664
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2554970

Change-Id: I4fa2338cea94497ceb15ff74c474cd421e0a0fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 12:51:09 +00:00
Stefano Duo
50767f4260 Stop checking for QUIC success in CTS tests
These CTS tests make use of a non-hermetic server. This means that:
* Test failures are not reproducible
* Test run are affected by the enviroment they run in (e.g., network
  configuration of the device running the tests)
Ideally we would have a local QUIC test server, but setting that up is
non-trivial. So, for the time being (while I come up with a QUIC test
server setup), simply enable QUIC and test that things keep working.

Bug: 274369142
Change-Id: Icc8b04c1671189b77f7d8995b721fb52afea371d
2023-04-21 14:06:30 +01: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
4d9c99f19d Merge "Cronet: enable CronetInputStreamTests" am: f500c2ef69
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2537650

Change-Id: Ie5ff192b355d863e75ff2e1aff716e8b27e81699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 10:57:18 +00:00
Chidera Olibie
f500c2ef69 Merge "Cronet: enable CronetInputStreamTests" 2023-04-17 10:46:14 +00: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
9c03bf16a7 Cronet: enable CronetInputStreamTests
This test needs Truth library which is part of the CronetTestJavaDefaults target
to work.

Test: atest NetHttpCoverageTests
Bug: 267353182
Change-Id: Ic3f084651af91be71832936c4fc0fdd241159198
2023-04-17 08:48:02 +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
8b5ad25877 Merge "[Cronet] Add framework-connectivity-t dependency for tests" am: de078f0ba0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2513519

Change-Id: I7e710f6e0256d5fc277771153f9e8d0100741677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:28:26 +00:00
Chidera Olibie
2023a04ca0 Merge "[Cronet] Add test dependency on framework-connectivity" am: 0fb87665b5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2511118

Change-Id: Idb34467f1a3a4ea7c7b4d4978220e24b157f6d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:27:51 +00:00
Chidera Olibie
c1a08b1473 Merge "[Cronet] Setup QuicTestServer" am: 53b12e3d51
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2513520

Change-Id: I572e9be6d8876c624ff280ade8bfea040b5c343a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:26:51 +00:00
Dan Stahr
1a19bfb5db Merge "Migrate CTS test users of UploadDataProvider to a single canonical impl." am: 045147a632
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2488381

Change-Id: I97acb0b53c623277893990a1e395f07444b0793b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:26:07 +00:00
Chidera Olibie
de078f0ba0 Merge "[Cronet] Add framework-connectivity-t dependency for tests" 2023-03-30 14:11:24 +00:00
Chidera Olibie
0fb87665b5 Merge "[Cronet] Add test dependency on framework-connectivity" 2023-03-30 13:24:45 +00:00
Chidera Olibie
53b12e3d51 Merge "[Cronet] Setup QuicTestServer" 2023-03-30 10:22:24 +00:00
Dan Stahr
045147a632 Merge "Migrate CTS test users of UploadDataProvider to a single canonical impl." 2023-03-30 07:48:09 +00:00
Chidera Olibie
f6498e7be2 [Cronet] Add framework-connectivity-t dependency for tests
This is needed for android.net.TrafficStats dependency

Test: atest NetHttpCoverageTests
Bug: 267353182
Change-Id: Ic426a2c7844e432c6444eee56515de58b8eccb92
2023-03-29 22:47:51 +00:00
Chidera Olibie
9252a1add9 [Cronet] Setup QuicTestServer
Test: atest NetHttpCoverageTests
Bug: 267353182
Change-Id: I8b4702554aa002dd516f601a2e4260d858b55e83
2023-03-29 21:06:49 +00:00
Chidera Olibie
ea825f5312 [Cronet] Add test dependency on framework-connectivity
This is needed to access android.net.Network apis

Test: atest NetHttpCoverageTests
Bug: 267353182
Change-Id: Iabf6bfbf0c6720193e59055b4a2c52aae47a9acb
2023-03-29 20:35:57 +00:00
Chidera Olibie
a64147c3e6 [Cronet] Do not jarjar MockUrlRequestJobFactory am: 9d9e9a0c77
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2513415

Change-Id: I277c14942898d31e416b445405734fab93cac888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 16:58:36 +00:00
Dan Stahr
f6c1417b9a Migrate CTS test users of UploadDataProvider to a single canonical impl.
As agreed previously we should only have a single implementation of an
upload data provider in tests, unless the details of interactions
between the provider and Cronet internals are tested.

Test: atest CtsNetHttpTestCases
Change-Id: I00ea3fab56a23ae58e9a07db61c1cabf58c566fc
2023-03-29 15:44:03 +01:00
Chidera Olibie
9d9e9a0c77 [Cronet] Do not jarjar MockUrlRequestJobFactory
This is a test util class used by cronet_tests.

Test: atest NetHttpCoverageTests
Bug: 267353182
Change-Id: I75978f687169ebcd2930d7c7f35a4fdefbbefda1
2023-03-29 13:07:47 +00:00
Chidera Olibie
18c011e026 Merge "[Cronet] Move OWNERS file to parent tests directory" am: dd813e185e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2508435

Change-Id: I41767496a29a6728bbe4c9e841c7907d9ec79a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27 17:35:37 +00:00
Chidera Olibie
4264d1489b [Cronet] Move OWNERS file to parent tests directory
This file was added when there was only Cronet/tests/cts directory.
We now have move directories inside Cronet/tests hence the move

Test: m
Change-Id: Ib9b4af307f7085844060b4aed3b7c153a64ff962
2023-03-26 22:43:57 +00:00
Patrick Rohr
2c7e6b7298 Merge changes I833bff2a,I87c60690 am: 37f9b2888c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2507201

Change-Id: I4b50bf404f21e2e3af0a14b1d01b1afddae672fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 16:27:18 +00:00
Patrick Rohr
37f9b2888c Merge changes I833bff2a,I87c60690
* changes:
  cronet import: set -e -x in cronet_import.sh
  cronet import: set gclient --delete_unversioned_trees
2023-03-24 15:58:48 +00:00
Patrick Rohr
38e3cd8ee9 cronet import: set -e -x in cronet_import.sh
To better surface errors in the import script.

Test: run script
Change-Id: I833bff2aebd9a89f2cccfe3b6271db86f1bd6dab
2023-03-24 06:56:22 -07:00
Patrick Rohr
538dd3e875 cronet import: set gclient --delete_unversioned_trees
This option deletes gclient dependencies that were remove upstream, so
it makes sense to always set this flag for the import (since the import
directoy is reused to speed up the process).

This change also fixes setup_folder_origin to run in a subshell to
contain the directory change it performs.

Test: none
Change-Id: I87c60690be81843c3947acc0251967372ed4c34a
2023-03-24 06:55:49 -07: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
8d4702a1f0 Merge "Fix symbol not found error for hidden apis used by MTS" 2023-03-24 07:48:32 +00:00
Chidera Olibie
c8b35d7cee Merge "Add xml config to allow cleartext traffic on some domains." am: f818992720
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2506236

Change-Id: I8296dbcced3e543e7562d03d63312b09feaa1e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 17:57:24 +00:00
Chidera Olibie
f818992720 Merge "Add xml config to allow cleartext traffic on some domains." 2023-03-23 17:21:30 +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
Chidera Olibie
e02c571a71 Add xml config to allow cleartext traffic on some domains.
Cronet automatically prevents cleartext(http) traffic but we
need to allowlist the hosts used for testing.

Test: atest NetHttpCoverageTests
Bug: 267353182
Change-Id: Ie4ee41fac40ce80d0d76ec2e388c248d7366d334
2023-03-23 15:00:44 +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
Chidera Olibie
d4745130b0 Setup NativeTestServer am: 5b95954882
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2498880

Change-Id: Ia4da719532c92040016d4b2e041a3cba7bb4cfe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:18:10 +00:00
Chidera Olibie
5b95954882 Setup NativeTestServer
this adds the classes dependent on the nativetestserverThis adds the classes dependent on the nativetestserver.

This setup depends on the cronet's platform implementation.
However, the tests jnilib is not prefixed and
because of that:
- We don't jarjar the base classes
- Don't jar the test classes
since the .so file needs the unjarjared versions.

Test: atest NetHttpTestServer
Bug: 267353182
Change-Id: Id5cfc8f842df4b13cef6f56dbaa6b9563c3989de
2023-03-22 14:36:08 +00:00
Chidera Olibie
ea9d591c38 [Cronet] Add test jni lib am: 4a755a7a99
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2498162

Change-Id: I20f7bf83a1c07ab23b9e916f0dd35252a31ad4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 13:25:20 +00:00
Chidera Olibie
4a755a7a99 [Cronet] Add test jni lib
This contains the test specific native classes

Test: atest NetHttpCoverageTest
Bug: 267353182
Change-Id: I2ce745418225c35e5b96e477334990a16be7246d
2023-03-21 22:57:16 +00:00