diff options
| author | Motomu Utsumi <motomuman@google.com> | 2024-06-06 18:24:45 +0900 |
|---|---|---|
| committer | Motomu Utsumi <motomuman@google.com> | 2024-06-07 12:41:03 +0900 |
| commit | 06a0b4b629bc96e8e8aada3134f8b930c206c9cf (patch) | |
| tree | 3751c18ff4cd1cc717c616c964adb696d3ceb829 | |
| parent | b5abaad98f3382dad676cae70243a6ff0659b2b0 (diff) | |
| download | cronet-upstream-staging.tar.gz | |
Cronet 123.0.6312.40: Remove nist-pkitsupstream-staging
nist-pkits was in net/third_party but this is removed in 123.0.6312.40
Test: build
Bug: 342969117
Change-Id: I0924cfe817166a781556d3955c4d388fe9b67cca
| -rw-r--r-- | Android.extras.bp | 1 | ||||
| -rw-r--r-- | android/tools/import/copy.bara.sky | 2 | ||||
| -rw-r--r-- | test_runner/AndroidNetTest.xml | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/Android.extras.bp b/Android.extras.bp index 17209e890..37bba068a 100644 --- a/Android.extras.bp +++ b/Android.extras.bp @@ -129,7 +129,6 @@ filegroup { name: "net_unittests_data", srcs: [ "net/data/**/*", - "net/third_party/nist-pkits/**/*", "net/third_party/quiche/src/quiche/common/platform/api/testdir/**/*", "third_party/anonymous_tokens/src/anonymous_tokens/testdata/**/*", ], diff --git a/android/tools/import/copy.bara.sky b/android/tools/import/copy.bara.sky index b9c3a3bf1..ad8e5611f 100644 --- a/android/tools/import/copy.bara.sky +++ b/android/tools/import/copy.bara.sky @@ -77,8 +77,6 @@ cronet_origin_files = glob( # of libc++[abi] "buildtools/third_party/libc++/**", "buildtools/third_party/libc++abi/**", - # Note: Only used for tests. - "net/third_party/nist-pkits/**", "net/third_party/quiche/**", "net/third_party/uri_template/**", "third_party/abseil-cpp/**", diff --git a/test_runner/AndroidNetTest.xml b/test_runner/AndroidNetTest.xml index ea2ca782e..be314a351 100644 --- a/test_runner/AndroidNetTest.xml +++ b/test_runner/AndroidNetTest.xml @@ -34,7 +34,6 @@ <!-- Push the testing data to the specified directory before running tests --> <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> <option name="push-file" key="testdir" value="/storage/emulated/0/chromium_tests_root/net/third_party/quiche/src/quiche/common/platform/api/testdir/" /> - <option name="push-file" key="nist-pkits" value="/storage/emulated/0/chromium_tests_root/net/third_party/nist-pkits/" /> <option name="push-file" key="data" value="/storage/emulated/0/chromium_tests_root/net/data/" /> <option name="push-file" key="anonymous_tokens" value="/storage/emulated/0/chromium_tests_root/third_party/anonymous_tokens/" /> </target_preparer> |