Merge "Adding keepalive metrics protos in the Connectivity module"
diff --git a/Cronet/tests/cts/Android.bp b/Cronet/tests/cts/Android.bp
index d969b54..7b440cd 100644
--- a/Cronet/tests/cts/Android.bp
+++ b/Cronet/tests/cts/Android.bp
@@ -64,6 +64,7 @@
"junit",
"hamcrest-library",
"kotlin-test",
+ "mockito-target",
],
libs: [
"android.test.base",
diff --git a/Cronet/tests/cts/src/android/net/http/cts/ConnectionMigrationOptionsTest.kt b/Cronet/tests/cts/src/android/net/http/cts/ConnectionMigrationOptionsTest.kt
index 77cb30e..219db61 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/ConnectionMigrationOptionsTest.kt
+++ b/Cronet/tests/cts/src/android/net/http/cts/ConnectionMigrationOptionsTest.kt
@@ -32,37 +32,37 @@
val options =
ConnectionMigrationOptions.Builder().build()
- assertEquals(MIGRATION_OPTION_UNSPECIFIED, options.allowNonDefaultNetworkUsageEnabled)
- assertEquals(MIGRATION_OPTION_UNSPECIFIED, options.defaultNetworkMigrationEnabled)
- assertEquals(MIGRATION_OPTION_UNSPECIFIED, options.pathDegradationMigrationEnabled)
+ assertEquals(MIGRATION_OPTION_UNSPECIFIED, options.allowNonDefaultNetworkUsage)
+ assertEquals(MIGRATION_OPTION_UNSPECIFIED, options.defaultNetworkMigration)
+ assertEquals(MIGRATION_OPTION_UNSPECIFIED, options.pathDegradationMigration)
}
@Test
fun testConnectionMigrationOptions_enableDefaultNetworkMigration_returnSetValue() {
val options =
ConnectionMigrationOptions.Builder()
- .setDefaultNetworkMigrationEnabled(MIGRATION_OPTION_ENABLED)
+ .setDefaultNetworkMigration(MIGRATION_OPTION_ENABLED)
.build()
- assertEquals(MIGRATION_OPTION_ENABLED, options.defaultNetworkMigrationEnabled)
+ assertEquals(MIGRATION_OPTION_ENABLED, options.defaultNetworkMigration)
}
@Test
fun testConnectionMigrationOptions_enablePathDegradationMigration_returnSetValue() {
val options =
ConnectionMigrationOptions.Builder()
- .setPathDegradationMigrationEnabled(MIGRATION_OPTION_ENABLED)
+ .setPathDegradationMigration(MIGRATION_OPTION_ENABLED)
.build()
- assertEquals(MIGRATION_OPTION_ENABLED, options.pathDegradationMigrationEnabled)
+ assertEquals(MIGRATION_OPTION_ENABLED, options.pathDegradationMigration)
}
@Test
fun testConnectionMigrationOptions_allowNonDefaultNetworkUsage_returnSetValue() {
val options =
ConnectionMigrationOptions.Builder()
- .setAllowNonDefaultNetworkUsageEnabled(MIGRATION_OPTION_ENABLED).build()
+ .setAllowNonDefaultNetworkUsage(MIGRATION_OPTION_ENABLED).build()
- assertEquals(MIGRATION_OPTION_ENABLED, options.allowNonDefaultNetworkUsageEnabled)
+ assertEquals(MIGRATION_OPTION_ENABLED, options.allowNonDefaultNetworkUsage)
}
}
diff --git a/Cronet/tests/cts/src/android/net/http/cts/DnsOptionsTest.kt b/Cronet/tests/cts/src/android/net/http/cts/DnsOptionsTest.kt
index 7b17ca6..6f4a979 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/DnsOptionsTest.kt
+++ b/Cronet/tests/cts/src/android/net/http/cts/DnsOptionsTest.kt
@@ -34,22 +34,22 @@
fun testDnsOptions_defaultValues() {
val options = DnsOptions.Builder().build()
- assertEquals(DNS_OPTION_UNSPECIFIED, options.persistHostCacheEnabled)
+ assertEquals(DNS_OPTION_UNSPECIFIED, options.persistHostCache)
assertNull(options.persistHostCachePeriod)
- assertEquals(DNS_OPTION_UNSPECIFIED, options.staleDnsEnabled)
+ assertEquals(DNS_OPTION_UNSPECIFIED, options.staleDns)
assertNull(options.staleDnsOptions)
- assertEquals(DNS_OPTION_UNSPECIFIED, options.useHttpStackDnsResolverEnabled)
+ assertEquals(DNS_OPTION_UNSPECIFIED, options.useHttpStackDnsResolver)
assertEquals(DNS_OPTION_UNSPECIFIED,
- options.preestablishConnectionsToStaleDnsResultsEnabled)
+ options.preestablishConnectionsToStaleDnsResults)
}
@Test
fun testDnsOptions_persistHostCache_returnSetValue() {
val options = DnsOptions.Builder()
- .setPersistHostCacheEnabled(DNS_OPTION_ENABLED)
+ .setPersistHostCache(DNS_OPTION_ENABLED)
.build()
- assertEquals(DNS_OPTION_ENABLED, options.persistHostCacheEnabled)
+ assertEquals(DNS_OPTION_ENABLED, options.persistHostCache)
}
@Test
@@ -63,47 +63,62 @@
@Test
fun testDnsOptions_enableStaleDns_returnSetValue() {
val options = DnsOptions.Builder()
- .setStaleDnsEnabled(DNS_OPTION_ENABLED)
+ .setStaleDns(DNS_OPTION_ENABLED)
.build()
- assertEquals(DNS_OPTION_ENABLED, options.staleDnsEnabled)
+ assertEquals(DNS_OPTION_ENABLED, options.staleDns)
}
@Test
fun testDnsOptions_useHttpStackDnsResolver_returnsSetValue() {
val options = DnsOptions.Builder()
- .setUseHttpStackDnsResolverEnabled(DNS_OPTION_ENABLED)
+ .setUseHttpStackDnsResolver(DNS_OPTION_ENABLED)
.build()
- assertEquals(DNS_OPTION_ENABLED, options.useHttpStackDnsResolverEnabled)
+ assertEquals(DNS_OPTION_ENABLED, options.useHttpStackDnsResolver)
}
@Test
fun testDnsOptions_preestablishConnectionsToStaleDnsResults_returnsSetValue() {
val options = DnsOptions.Builder()
- .setPreestablishConnectionsToStaleDnsResultsEnabled(DNS_OPTION_ENABLED)
+ .setPreestablishConnectionsToStaleDnsResults(DNS_OPTION_ENABLED)
.build()
assertEquals(DNS_OPTION_ENABLED,
- options.preestablishConnectionsToStaleDnsResultsEnabled)
+ options.preestablishConnectionsToStaleDnsResults)
+ }
+
+ @Test
+ fun testDnsOptions_setStaleDnsOptions_returnsSetValues() {
+ val staleOptions = DnsOptions.StaleDnsOptions.Builder()
+ .setAllowCrossNetworkUsage(DNS_OPTION_ENABLED)
+ .setFreshLookupTimeout(Duration.ofMillis(1234))
+ .build()
+ val options = DnsOptions.Builder()
+ .setStaleDns(DNS_OPTION_ENABLED)
+ .setStaleDnsOptions(staleOptions)
+ .build()
+
+ assertEquals(DNS_OPTION_ENABLED, options.staleDns)
+ assertEquals(staleOptions, options.staleDnsOptions)
}
@Test
fun testStaleDnsOptions_defaultValues() {
val options = DnsOptions.StaleDnsOptions.Builder().build()
- assertEquals(DNS_OPTION_UNSPECIFIED, options.allowCrossNetworkUsageEnabled)
+ assertEquals(DNS_OPTION_UNSPECIFIED, options.allowCrossNetworkUsage)
assertNull(options.freshLookupTimeout)
assertNull(options.maxExpiredDelay)
- assertEquals(DNS_OPTION_UNSPECIFIED, options.useStaleOnNameNotResolvedEnabled)
+ assertEquals(DNS_OPTION_UNSPECIFIED, options.useStaleOnNameNotResolved)
}
@Test
fun testStaleDnsOptions_allowCrossNetworkUsage_returnsSetValue() {
val options = DnsOptions.StaleDnsOptions.Builder()
- .setAllowCrossNetworkUsageEnabled(DNS_OPTION_ENABLED).build()
+ .setAllowCrossNetworkUsage(DNS_OPTION_ENABLED).build()
- assertEquals(DNS_OPTION_ENABLED, options.allowCrossNetworkUsageEnabled)
+ assertEquals(DNS_OPTION_ENABLED, options.allowCrossNetworkUsage)
}
@Test
@@ -118,10 +133,10 @@
@Test
fun testStaleDnsOptions_useStaleOnNameNotResolved_returnsSetValue() {
val options = DnsOptions.StaleDnsOptions.Builder()
- .setUseStaleOnNameNotResolvedEnabled(DNS_OPTION_ENABLED)
+ .setUseStaleOnNameNotResolved(DNS_OPTION_ENABLED)
.build()
- assertEquals(DNS_OPTION_ENABLED, options.useStaleOnNameNotResolvedEnabled)
+ assertEquals(DNS_OPTION_ENABLED, options.useStaleOnNameNotResolved)
}
@Test
diff --git a/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java b/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java
index d247201..c561ee7 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java
+++ b/Cronet/tests/cts/src/android/net/http/cts/HttpEngineTest.java
@@ -29,6 +29,9 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
+import android.net.Network;
+import android.net.http.ConnectionMigrationOptions;
+import android.net.http.DnsOptions;
import android.net.http.HttpEngine;
import android.net.http.UrlRequest;
import android.net.http.UrlResponseInfo;
@@ -43,6 +46,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mockito;
@RunWith(AndroidJUnit4.class)
public class HttpEngineTest {
@@ -51,6 +55,7 @@
private HttpEngine.Builder mEngineBuilder;
private TestUrlRequestCallback mCallback;
+ private HttpCtsTestServer mTestServer;
private UrlRequest mRequest;
private HttpEngine mEngine;
private Context mContext;
@@ -61,6 +66,7 @@
skipIfNoInternetConnection(mContext);
mEngineBuilder = new HttpEngine.Builder(mContext);
mCallback = new TestUrlRequestCallback();
+ mTestServer = new HttpCtsTestServer(mContext);
}
@After
@@ -72,6 +78,9 @@
if (mEngine != null) {
mEngine.shutdown();
}
+ if (mTestServer != null) {
+ mTestServer.shutdown();
+ }
}
private boolean isQuic(String negotiatedProtocol) {
@@ -96,8 +105,9 @@
@Test
public void testHttpEngine_EnableHttpCache() {
- // We need a server which sets cache-control != no-cache.
- String url = "https://www.example.com";
+ String url = mTestServer.getCacheableTestDownloadUrl(
+ /* downloadId */ "cacheable-download",
+ /* numBytes */ 10);
mEngine =
mEngineBuilder
.setStoragePath(mContext.getApplicationInfo().dataDir)
@@ -109,9 +119,7 @@
mEngine.newUrlRequestBuilder(url, mCallback.getExecutor(), mCallback);
mRequest = builder.build();
mRequest.start();
- // This tests uses a non-hermetic server. Instead of asserting, assume the next callback.
- // This way, if the request were to fail, the test would just be skipped instead of failing.
- mCallback.assumeCallback(ResponseStep.ON_SUCCEEDED);
+ mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
UrlResponseInfo info = mCallback.mResponseInfo;
assumeOKStatusCode(info);
assertFalse(info.wasCached());
@@ -120,7 +128,7 @@
builder = mEngine.newUrlRequestBuilder(url, mCallback.getExecutor(), mCallback);
mRequest = builder.build();
mRequest.start();
- mCallback.assumeCallback(ResponseStep.ON_SUCCEEDED);
+ mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
info = mCallback.mResponseInfo;
assertOKStatusCode(info);
assertTrue(info.wasCached());
@@ -144,11 +152,12 @@
@Test
public void testHttpEngine_EnablePublicKeyPinningBypassForLocalTrustAnchors() {
+ String url = mTestServer.getSuccessUrl();
// For known hosts, requests should succeed whether we're bypassing the local trust anchor
// or not.
mEngine = mEngineBuilder.setEnablePublicKeyPinningBypassForLocalTrustAnchors(false).build();
UrlRequest.Builder builder =
- mEngine.newUrlRequestBuilder(URL, mCallback.getExecutor(), mCallback);
+ mEngine.newUrlRequestBuilder(url, mCallback.getExecutor(), mCallback);
mRequest = builder.build();
mRequest.start();
mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
@@ -156,7 +165,7 @@
mEngine.shutdown();
mEngine = mEngineBuilder.setEnablePublicKeyPinningBypassForLocalTrustAnchors(true).build();
mCallback = new TestUrlRequestCallback();
- builder = mEngine.newUrlRequestBuilder(URL, mCallback.getExecutor(), mCallback);
+ builder = mEngine.newUrlRequestBuilder(url, mCallback.getExecutor(), mCallback);
mRequest = builder.build();
mRequest.start();
mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
@@ -202,6 +211,7 @@
@Test
public void testHttpEngine_GetDefaultUserAgent() throws Exception {
assertThat(mEngineBuilder.getDefaultUserAgent(), containsString("AndroidHttpClient"));
+ assertThat(mEngineBuilder.getDefaultUserAgent()).contains(HttpEngine.getVersionString());
}
@Test
@@ -253,4 +263,80 @@
.replaceFirst(".*<title>", "")
.replaceFirst("</title>.*", "");
}
+
+ @Test
+ public void testHttpEngine_bindToNetwork() throws Exception {
+ // Create a fake Android.net.Network. Since that network doesn't exist, binding to
+ // that should end up in a failed request.
+ Network mockNetwork = Mockito.mock(Network.class);
+ Mockito.when(mockNetwork.getNetworkHandle()).thenReturn(123L);
+ String url = mTestServer.getSuccessUrl();
+
+ mEngine = mEngineBuilder.build();
+ mEngine.bindToNetwork(mockNetwork);
+ UrlRequest.Builder builder =
+ mEngine.newUrlRequestBuilder(url, mCallback.getExecutor(), mCallback);
+ mRequest = builder.build();
+ mRequest.start();
+
+ mCallback.expectCallback(ResponseStep.ON_FAILED);
+ }
+
+ @Test
+ public void testHttpEngine_unbindFromNetwork() throws Exception {
+ // Create a fake Android.net.Network. Since that network doesn't exist, binding to
+ // that should end up in a failed request.
+ Network mockNetwork = Mockito.mock(Network.class);
+ Mockito.when(mockNetwork.getNetworkHandle()).thenReturn(123L);
+ String url = mTestServer.getSuccessUrl();
+
+ mEngine = mEngineBuilder.build();
+ // Bind to the fake network but then unbind. This should result in a successful
+ // request.
+ mEngine.bindToNetwork(mockNetwork);
+ mEngine.bindToNetwork(null);
+ UrlRequest.Builder builder =
+ mEngine.newUrlRequestBuilder(url, mCallback.getExecutor(), mCallback);
+ mRequest = builder.build();
+ mRequest.start();
+
+ mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
+ UrlResponseInfo info = mCallback.mResponseInfo;
+ assertOKStatusCode(info);
+ }
+
+ @Test
+ public void testHttpEngine_setConnectionMigrationOptions_requestSucceeds() {
+ ConnectionMigrationOptions options = new ConnectionMigrationOptions.Builder().build();
+ mEngine = mEngineBuilder.setConnectionMigrationOptions(options).build();
+ UrlRequest.Builder builder =
+ mEngine.newUrlRequestBuilder(
+ mTestServer.getSuccessUrl(), mCallback.getExecutor(), mCallback);
+ mRequest = builder.build();
+ mRequest.start();
+
+ mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
+ UrlResponseInfo info = mCallback.mResponseInfo;
+ assertOKStatusCode(info);
+ }
+
+ @Test
+ public void testHttpEngine_setDnsOptions_requestSucceeds() {
+ DnsOptions options = new DnsOptions.Builder().build();
+ mEngine = mEngineBuilder.setDnsOptions(options).build();
+ UrlRequest.Builder builder =
+ mEngine.newUrlRequestBuilder(
+ mTestServer.getSuccessUrl(), mCallback.getExecutor(), mCallback);
+ mRequest = builder.build();
+ mRequest.start();
+
+ mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
+ UrlResponseInfo info = mCallback.mResponseInfo;
+ assertOKStatusCode(info);
+ }
+
+ @Test
+ public void getVersionString_notEmpty() {
+ assertThat(HttpEngine.getVersionString()).isNotEmpty();
+ }
}
diff --git a/Cronet/tests/cts/src/android/net/http/cts/QuicExceptionTest.kt b/Cronet/tests/cts/src/android/net/http/cts/QuicExceptionTest.kt
new file mode 100644
index 0000000..4b7aa14
--- /dev/null
+++ b/Cronet/tests/cts/src/android/net/http/cts/QuicExceptionTest.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.http.cts
+
+import android.net.http.QuicException
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class QuicExceptionTest {
+
+ @Test
+ fun testQuicException_returnsInputParameters() {
+ val message = "failed"
+ val cause = Throwable("thrown")
+ val quicException =
+ object : QuicException(message, cause) {
+ override fun getErrorCode() = 0
+ override fun isImmediatelyRetryable() = false
+ }
+
+ assertEquals(message, quicException.message)
+ assertEquals(cause, quicException.cause)
+ }
+
+ // TODO: add test for QuicException triggered from HttpEngine
+}
diff --git a/Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt b/Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt
index 5f9b7d4..5f1979f 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt
+++ b/Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt
@@ -18,6 +18,10 @@
import android.net.http.QuicOptions
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat
+import java.time.Duration
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
@@ -28,9 +32,11 @@
val quicOptions = QuicOptions.Builder().build()
assertThat(quicOptions.allowedQuicHosts).isEmpty()
assertThat(quicOptions.handshakeUserAgent).isNull()
- // TODO(danstahr): idleConnectionTimeout getter should be public
- // assertThat(quicOptions.idleConnectionTimeout).isNull()
- assertThat(quicOptions.inMemoryServerConfigsCacheSize).isNull()
+ assertThat(quicOptions.idleConnectionTimeout).isNull()
+ assertFalse(quicOptions.hasInMemoryServerConfigsCacheSize())
+ assertFailsWith(IllegalStateException::class) {
+ quicOptions.inMemoryServerConfigsCacheSize
+ }
}
@Test
@@ -46,8 +52,6 @@
.inOrder()
}
- // TODO(danstahr): idleConnectionTimeout getter should be public
- /*
@Test
fun testQuicOptions_idleConnectionTimeout_returnsSetValue() {
val timeout = Duration.ofMinutes(10)
@@ -57,13 +61,13 @@
assertThat(quicOptions.idleConnectionTimeout)
.isEqualTo(timeout)
}
- */
@Test
fun testQuicOptions_inMemoryServerConfigsCacheSize_returnsSetValue() {
val quicOptions = QuicOptions.Builder()
.setInMemoryServerConfigsCacheSize(42)
.build()
+ assertTrue(quicOptions.hasInMemoryServerConfigsCacheSize())
assertThat(quicOptions.inMemoryServerConfigsCacheSize)
.isEqualTo(42)
}
diff --git a/Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java b/Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java
index a364e29..e4949d3 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java
+++ b/Cronet/tests/cts/src/android/net/http/cts/UrlRequestTest.java
@@ -29,6 +29,7 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
+import android.net.http.HeaderBlock;
import android.net.http.HttpEngine;
import android.net.http.HttpException;
import android.net.http.InlineExecutionProhibitedException;
@@ -43,7 +44,10 @@
import android.net.http.cts.util.TestUrlRequestCallback;
import android.net.http.cts.util.TestUrlRequestCallback.ResponseStep;
import android.net.http.cts.util.UploadDataProviders;
+import android.webkit.cts.CtsTestServer;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -57,11 +61,16 @@
import java.net.URLEncoder;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
@RunWith(AndroidJUnit4.class)
public class UrlRequestTest {
@@ -286,6 +295,24 @@
}
@Test
+ public void testUrlRequest_redirects() throws Exception {
+ int expectedNumRedirects = 5;
+ String url =
+ mTestServer.getRedirectingAssetUrl("html/hello_world.html", expectedNumRedirects);
+
+ UrlRequest request = createUrlRequestBuilder(url).build();
+ request.start();
+
+ mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
+ UrlResponseInfo info = mCallback.mResponseInfo;
+ assertOKStatusCode(info);
+ assertThat(mCallback.mResponseAsString).contains("hello world");
+ assertThat(info.getUrlChain()).hasSize(expectedNumRedirects + 1);
+ assertThat(info.getUrlChain().get(0)).isEqualTo(url);
+ assertThat(info.getUrlChain().get(expectedNumRedirects)).isEqualTo(info.getUrl());
+ }
+
+ @Test
public void testUrlRequestPost_withRedirect() throws Exception {
String body = Strings.repeat(
"Hello, this is a really interesting body, so write this 100 times.", 100);
@@ -310,7 +337,51 @@
assertThat(mCallback.mResponseAsString).isEqualTo(body);
}
- private static class StubUrlRequestCallback extends UrlRequest.Callback {
+ @Test
+ public void testUrlRequest_customHeaders() throws Exception {
+ UrlRequest.Builder builder = createUrlRequestBuilder(mTestServer.getEchoHeadersUrl());
+
+ List<Map.Entry<String, String>> expectedHeaders = Arrays.asList(
+ Map.entry("Authorization", "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="),
+ Map.entry("Max-Forwards", "10"),
+ Map.entry("X-Client-Data", "random custom header content"));
+
+ for (Map.Entry<String, String> header : expectedHeaders) {
+ builder.addHeader(header.getKey(), header.getValue());
+ }
+
+ builder.build().start();
+ mCallback.expectCallback(ResponseStep.ON_SUCCEEDED);
+
+ assertOKStatusCode(mCallback.mResponseInfo);
+
+ List<Map.Entry<String, String>> echoedHeaders =
+ extractEchoedHeaders(mCallback.mResponseInfo.getHeaders());
+
+ // The implementation might decide to add more headers like accepted encodings it handles
+ // internally so the server is likely to see more headers than explicitly set
+ // by the developer.
+ assertThat(echoedHeaders)
+ .containsAtLeastElementsIn(expectedHeaders);
+ }
+
+ private static List<Map.Entry<String, String>> extractEchoedHeaders(HeaderBlock headers) {
+ return headers.getAsList()
+ .stream()
+ .flatMap(input -> {
+ if (input.getKey().startsWith(CtsTestServer.ECHOED_RESPONSE_HEADER_PREFIX)) {
+ String strippedKey =
+ input.getKey().substring(
+ CtsTestServer.ECHOED_RESPONSE_HEADER_PREFIX.length());
+ return Stream.of(Map.entry(strippedKey, input.getValue()));
+ } else {
+ return Stream.empty();
+ }
+ })
+ .collect(Collectors.toList());
+ }
+
+ private static class StubUrlRequestCallback implements UrlRequest.Callback {
@Override
public void onRedirectReceived(
@@ -338,6 +409,11 @@
public void onFailed(UrlRequest request, UrlResponseInfo info, HttpException error) {
throw new UnsupportedOperationException(error);
}
+
+ @Override
+ public void onCanceled(@NonNull UrlRequest request, @Nullable UrlResponseInfo info) {
+ throw new UnsupportedOperationException();
+ }
}
private static class InMemoryUploadDataProvider extends UploadDataProvider {
diff --git a/Cronet/tests/cts/src/android/net/http/cts/util/TestUrlRequestCallback.java b/Cronet/tests/cts/src/android/net/http/cts/util/TestUrlRequestCallback.java
index efbcff6..28443b7 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/util/TestUrlRequestCallback.java
+++ b/Cronet/tests/cts/src/android/net/http/cts/util/TestUrlRequestCallback.java
@@ -50,7 +50,7 @@
* method to block thread until the request completes on another thread.
* Allows us to cancel, block request or throw an exception from an arbitrary step.
*/
-public class TestUrlRequestCallback extends UrlRequest.Callback {
+public class TestUrlRequestCallback implements UrlRequest.Callback {
private static final int TIMEOUT_MS = 12_000;
public ArrayList<UrlResponseInfo> mRedirectResponseInfoList = new ArrayList<>();
public ArrayList<String> mRedirectUrlList = new ArrayList<>();
diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp
index ac71653..03d163c 100644
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@@ -19,7 +19,7 @@
android_library {
name: "NetHttpTestsLibPreJarJar",
- srcs: ["//external/cronet:cronet_aml_javatests_sources"],
+ srcs: [":cronet_aml_javatests_sources"],
sdk_version: "test_current",
min_sdk_version: "30",
static_libs: [
diff --git a/Cronet/tools/import/copy.bara.sky b/Cronet/tools/import/copy.bara.sky
index 2acf8cd..8353fd3 100644
--- a/Cronet/tools/import/copy.bara.sky
+++ b/Cronet/tools/import/copy.bara.sky
@@ -19,6 +19,7 @@
# Exclude existing *OWNERS files
"**/*OWNERS",
+ "**/.git/**",
]
cronet_origin_files = glob(
@@ -35,6 +36,8 @@
"crypto/**",
"ipc/**",
"net/**",
+ # Note: Only used for tests.
+ "testing/**",
"url/**",
"LICENSE",
],
@@ -48,6 +51,8 @@
"components/cronet/ios/**",
"components/cronet/native/**",
+ # Per aosp/2399270
+ "testing/buildbot/**",
# Exclude all third-party directories. Those are specified explicitly
# below, so no dependency can accidentally creep in.
@@ -65,14 +70,11 @@
"base/third_party/icu/**",
"base/third_party/nspr/**",
"base/third_party/superfasthash/**",
- # TODO: we should be able to remove this dependency.
- "base/third_party/symbolize/**",
"base/third_party/valgrind/**",
- "base/third_party/xdg_user_dirs/**",
- # Not present in source repo; requires gclient sync.
"buildtools/third_party/libc++/**",
- # Not present in source repo; requires gclient sync.
"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/**",
@@ -80,12 +82,21 @@
"third_party/ashmem/**",
"third_party/boringssl/**",
"third_party/brotli/**",
- # Not present in source repo; requires gclient sync.
+ # Note: Only used for tests.
+ "third_party/ced/**",
+ # Note: Only used for tests.
+ "third_party/googletest/**",
"third_party/icu/**",
"third_party/libevent/**",
+ # Note: Only used for tests.
+ "third_party/libxml/**",
+ # Note: Only used for tests.
+ "third_party/lss/**",
"third_party/metrics_proto/**",
"third_party/modp_b64/**",
"third_party/protobuf/**",
+ # Note: Only used for tests.
+ "third_party/quic_trace/**",
"third_party/zlib/**",
],
exclude = common_excludes,
@@ -94,12 +105,8 @@
core.workflow(
name = "import_cronet",
authoring = authoring.overwrite("Cronet Mainline Eng <cronet-mainline-eng+copybara@google.com>"),
- origin = git.origin(
- url = "rpc://chromium/chromium/src",
- # Source ref is set by the invoking script.
- ref = "overwritten-by-script",
- partial_fetch = True,
- ),
+ # Origin folder is specified via source_ref argument, see import_cronet.sh
+ origin = folder.origin(),
origin_files = cronet_origin_files,
destination = git.destination(
# The destination URL is set by the invoking script.
diff --git a/Cronet/tools/import/import_cronet.sh b/Cronet/tools/import/import_cronet.sh
index eb82551..d0c8deb 100755
--- a/Cronet/tools/import/import_cronet.sh
+++ b/Cronet/tools/import/import_cronet.sh
@@ -33,6 +33,8 @@
exit 1
}
+COPYBARA_FOLDER_ORIGIN="/tmp/copybara-origin"
+
#######################################
# Create upstream-import branch in external/cronet.
# Globals:
@@ -49,22 +51,59 @@
}
#######################################
+# Setup folder.origin for copybara inside /tmp
+# Globals:
+# COPYBARA_FOLDER_ORIGIN
+# Arguments:
+# new_rev, string
+#######################################
+setup_folder_origin() {
+ local _new_rev=$1
+ mkdir -p "${COPYBARA_FOLDER_ORIGIN}"
+ cd "${COPYBARA_FOLDER_ORIGIN}"
+
+ # For this to work _new_rev must be a branch or a tag.
+ git clone --depth=1 --branch "${_new_rev}" https://chromium.googlesource.com/chromium/src.git
+
+ cat <<EOF >.gclient
+solutions = [
+ {
+ "name": "src",
+ "url": "https://chromium.googlesource.com/chromium/src.git",
+ "managed": False,
+ "custom_deps": {},
+ "custom_vars": {},
+ },
+]
+target_os = ["android"]
+EOF
+ cd src
+ # Set appropriate gclient flags to speed up syncing.
+ gclient sync \
+ --no-history
+ --shallow
+}
+
+#######################################
# Runs the copybara import of Chromium
# Globals:
# ANDROID_BUILD_TOP
+# COPYBARA_FOLDER_ORIGIN
# Arguments:
-# new_rev, string
# last_rev, string or empty
# force, string or empty
#######################################
do_run_copybara() {
- local _new_rev=$1
- local _last_rev=$2
- local _force=$3
+ local _last_rev=$1
+ local _force=$2
local -a flags
flags+=(--git-destination-url="file://${ANDROID_BUILD_TOP}/external/cronet")
- flags+=(--repo-timeout 3h)
+ flags+=(--repo-timeout 3m)
+
+ # buildtools/third_party/libc++ contains an invalid symlink
+ flags+=(--folder-origin-ignore-invalid-symlinks)
+ flags+=(--git-no-verify)
if [ ! -z "${_force}" ]; then
flags+=(--force)
@@ -77,7 +116,7 @@
/google/bin/releases/copybara/public/copybara/copybara \
"${flags[@]}" \
"${ANDROID_BUILD_TOP}/packages/modules/Connectivity/Cronet/tools/import/copy.bara.sky" \
- import_cronet "${_new_rev}"
+ import_cronet "${COPYBARA_FOLDER_ORIGIN}/src"
}
while getopts $OPTSTRING opt; do
@@ -96,5 +135,6 @@
fi
setup_upstream_import_branch
-do_run_copybara "${new_rev}" "${last_rev}" "${force}"
+setup_folder_origin "${new_rev}"
+do_run_copybara "${last_rev}" "${force}"
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index ff5acf5..67206cd 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -66,19 +66,11 @@
apex_defaults {
name: "CronetInTetheringApexDefaultsEnabled",
- jni_libs: [
- "//external/cronet:cronet_aml_components_cronet_android_cronet",
- "//external/cronet/third_party/boringssl:libcrypto",
- "//external/cronet/third_party/boringssl:libssl",
- ],
+ jni_libs: ["cronet_aml_components_cronet_android_cronet"],
arch: {
riscv64: {
// TODO: remove this when there is a riscv64 libcronet
- exclude_jni_libs: [
- "//external/cronet:cronet_aml_components_cronet_android_cronet",
- "//external/cronet/third_party/boringssl:libcrypto",
- "//external/cronet/third_party/boringssl:libssl",
- ],
+ exclude_jni_libs: ["cronet_aml_components_cronet_android_cronet"],
},
},
}
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index b99c9e4..4f95bdd 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -75,12 +75,12 @@
java_defaults {
name: "CronetJavaDefaultsEnabled",
- srcs: ["//external/cronet:cronet_aml_api_sources"],
+ srcs: [":cronet_aml_api_sources"],
libs: [
"androidx.annotation_annotation",
],
impl_only_static_libs: [
- "//external/cronet:cronet_aml_java",
+ "cronet_aml_java",
],
api_dir: "cronet_enabled/api",
}
@@ -101,8 +101,8 @@
java_defaults {
name: "CronetJavaPrejarjarDefaultsEnabled",
static_libs: [
- "//external/cronet:cronet_aml_api_java",
- "//external/cronet:cronet_aml_java"
+ "cronet_aml_api_java",
+ "cronet_aml_java"
],
}
@@ -127,7 +127,7 @@
out: ["framework_tethering_jarjar_rules.txt"],
cmd: "$(location jarjar-rules-generator) " +
"$(location :framework-tethering-pre-jarjar{.jar}) " +
- "--apistubs $(location :framework-tethering.stubs.module_lib{.jar}) " +
+ "--apistubs $(location :framework-tethering.stubs.module_lib{.jar}) " +
"--prefix android.net.http.internal " +
"--excludes $(location jarjar-excludes.txt) " +
"--output $(out)",
@@ -151,6 +151,7 @@
filegroup {
name: "framework-tethering-srcs",
+ defaults: ["framework-sources-module-defaults"],
srcs: [
"src/**/*.aidl",
"src/**/*.java",
diff --git a/Tethering/common/TetheringLib/cronet_enabled/api/current.txt b/Tethering/common/TetheringLib/cronet_enabled/api/current.txt
index cf441ce..333ea1c 100644
--- a/Tethering/common/TetheringLib/cronet_enabled/api/current.txt
+++ b/Tethering/common/TetheringLib/cronet_enabled/api/current.txt
@@ -51,9 +51,9 @@
}
public class ConnectionMigrationOptions {
- method public int getAllowNonDefaultNetworkUsageEnabled();
- method public int getDefaultNetworkMigrationEnabled();
- method public int getPathDegradationMigrationEnabled();
+ method public int getAllowNonDefaultNetworkUsage();
+ method public int getDefaultNetworkMigration();
+ method public int getPathDegradationMigration();
field public static final int MIGRATION_OPTION_DISABLED = 2; // 0x2
field public static final int MIGRATION_OPTION_ENABLED = 1; // 0x1
field public static final int MIGRATION_OPTION_UNSPECIFIED = 0; // 0x0
@@ -62,18 +62,18 @@
public static final class ConnectionMigrationOptions.Builder {
ctor public ConnectionMigrationOptions.Builder();
method @NonNull public android.net.http.ConnectionMigrationOptions build();
- method @NonNull public android.net.http.ConnectionMigrationOptions.Builder setAllowNonDefaultNetworkUsageEnabled(int);
- method @NonNull public android.net.http.ConnectionMigrationOptions.Builder setDefaultNetworkMigrationEnabled(int);
- method @NonNull public android.net.http.ConnectionMigrationOptions.Builder setPathDegradationMigrationEnabled(int);
+ method @NonNull public android.net.http.ConnectionMigrationOptions.Builder setAllowNonDefaultNetworkUsage(int);
+ method @NonNull public android.net.http.ConnectionMigrationOptions.Builder setDefaultNetworkMigration(int);
+ method @NonNull public android.net.http.ConnectionMigrationOptions.Builder setPathDegradationMigration(int);
}
public final class DnsOptions {
- method public int getPersistHostCacheEnabled();
+ method public int getPersistHostCache();
method @Nullable public java.time.Duration getPersistHostCachePeriod();
- method public int getPreestablishConnectionsToStaleDnsResultsEnabled();
- method public int getStaleDnsEnabled();
+ method public int getPreestablishConnectionsToStaleDnsResults();
+ method public int getStaleDns();
method @Nullable public android.net.http.DnsOptions.StaleDnsOptions getStaleDnsOptions();
- method public int getUseHttpStackDnsResolverEnabled();
+ method public int getUseHttpStackDnsResolver();
field public static final int DNS_OPTION_DISABLED = 2; // 0x2
field public static final int DNS_OPTION_ENABLED = 1; // 0x1
field public static final int DNS_OPTION_UNSPECIFIED = 0; // 0x0
@@ -82,28 +82,28 @@
public static final class DnsOptions.Builder {
ctor public DnsOptions.Builder();
method @NonNull public android.net.http.DnsOptions build();
- method @NonNull public android.net.http.DnsOptions.Builder setPersistHostCacheEnabled(int);
+ method @NonNull public android.net.http.DnsOptions.Builder setPersistHostCache(int);
method @NonNull public android.net.http.DnsOptions.Builder setPersistHostCachePeriod(@NonNull java.time.Duration);
- method @NonNull public android.net.http.DnsOptions.Builder setPreestablishConnectionsToStaleDnsResultsEnabled(int);
- method @NonNull public android.net.http.DnsOptions.Builder setStaleDnsEnabled(int);
+ method @NonNull public android.net.http.DnsOptions.Builder setPreestablishConnectionsToStaleDnsResults(int);
+ method @NonNull public android.net.http.DnsOptions.Builder setStaleDns(int);
method @NonNull public android.net.http.DnsOptions.Builder setStaleDnsOptions(@NonNull android.net.http.DnsOptions.StaleDnsOptions);
- method @NonNull public android.net.http.DnsOptions.Builder setUseHttpStackDnsResolverEnabled(int);
+ method @NonNull public android.net.http.DnsOptions.Builder setUseHttpStackDnsResolver(int);
}
public static class DnsOptions.StaleDnsOptions {
- method public int getAllowCrossNetworkUsageEnabled();
+ method public int getAllowCrossNetworkUsage();
method @Nullable public java.time.Duration getFreshLookupTimeout();
method @Nullable public java.time.Duration getMaxExpiredDelay();
- method public int getUseStaleOnNameNotResolvedEnabled();
+ method public int getUseStaleOnNameNotResolved();
}
public static final class DnsOptions.StaleDnsOptions.Builder {
ctor public DnsOptions.StaleDnsOptions.Builder();
method @NonNull public android.net.http.DnsOptions.StaleDnsOptions build();
- method @NonNull public android.net.http.DnsOptions.StaleDnsOptions.Builder setAllowCrossNetworkUsageEnabled(int);
+ method @NonNull public android.net.http.DnsOptions.StaleDnsOptions.Builder setAllowCrossNetworkUsage(int);
method @NonNull public android.net.http.DnsOptions.StaleDnsOptions.Builder setFreshLookupTimeout(@NonNull java.time.Duration);
method @NonNull public android.net.http.DnsOptions.StaleDnsOptions.Builder setMaxExpiredDelay(@NonNull java.time.Duration);
- method @NonNull public android.net.http.DnsOptions.StaleDnsOptions.Builder setUseStaleOnNameNotResolvedEnabled(int);
+ method @NonNull public android.net.http.DnsOptions.StaleDnsOptions.Builder setUseStaleOnNameNotResolved(int);
}
public abstract class HeaderBlock {
@@ -177,7 +177,8 @@
method @NonNull public java.util.Set<java.lang.String> getAllowedQuicHosts();
method @Nullable public String getHandshakeUserAgent();
method @Nullable public java.time.Duration getIdleConnectionTimeout();
- method @Nullable public Integer getInMemoryServerConfigsCacheSize();
+ method public int getInMemoryServerConfigsCacheSize();
+ method public boolean hasInMemoryServerConfigsCacheSize();
}
public static final class QuicOptions.Builder {
@@ -241,14 +242,13 @@
method @NonNull public abstract android.net.http.UrlRequest.Builder setUploadDataProvider(@NonNull android.net.http.UploadDataProvider, @NonNull java.util.concurrent.Executor);
}
- public abstract static class UrlRequest.Callback {
- ctor public UrlRequest.Callback();
+ public static interface UrlRequest.Callback {
method public void onCanceled(@NonNull android.net.http.UrlRequest, @Nullable android.net.http.UrlResponseInfo);
- method public abstract void onFailed(@NonNull android.net.http.UrlRequest, @Nullable android.net.http.UrlResponseInfo, @NonNull android.net.http.HttpException);
- method public abstract void onReadCompleted(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo, @NonNull java.nio.ByteBuffer) throws java.lang.Exception;
- method public abstract void onRedirectReceived(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo, @NonNull String) throws java.lang.Exception;
- method public abstract void onResponseStarted(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo) throws java.lang.Exception;
- method public abstract void onSucceeded(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo);
+ method public void onFailed(@NonNull android.net.http.UrlRequest, @Nullable android.net.http.UrlResponseInfo, @NonNull android.net.http.HttpException);
+ method public void onReadCompleted(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo, @NonNull java.nio.ByteBuffer) throws java.lang.Exception;
+ method public void onRedirectReceived(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo, @NonNull String) throws java.lang.Exception;
+ method public void onResponseStarted(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo) throws java.lang.Exception;
+ method public void onSucceeded(@NonNull android.net.http.UrlRequest, @NonNull android.net.http.UrlResponseInfo);
}
public static class UrlRequest.Status {
diff --git a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
index f2cf1d0..69eb58f 100644
--- a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
+++ b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
@@ -253,6 +253,7 @@
if (mRunTests) cleanUp();
} finally {
mHandlerThread.quitSafely();
+ mHandlerThread.join();
mUiAutomation.dropShellPermissionIdentity();
}
}
diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringNotificationUpdaterTest.kt b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringNotificationUpdaterTest.kt
index 75c819b..ac3d713 100644
--- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringNotificationUpdaterTest.kt
+++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringNotificationUpdaterTest.kt
@@ -156,6 +156,7 @@
@After
fun tearDown() {
fakeTetheringThread.quitSafely()
+ fakeTetheringThread.join()
}
private fun verifyActivityPendingIntent(intent: Intent, flags: Int) {
diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/metrics/TetheringMetricsTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/metrics/TetheringMetricsTest.java
index 7fdde97..98c873d 100644
--- a/Tethering/tests/unit/src/com/android/networkstack/tethering/metrics/TetheringMetricsTest.java
+++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/metrics/TetheringMetricsTest.java
@@ -48,7 +48,6 @@
import android.stats.connectivity.ErrorCode;
import android.stats.connectivity.UpstreamType;
import android.stats.connectivity.UserType;
-import android.util.Pair;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@@ -99,86 +98,70 @@
mTetheringMetrics.sendReport(downstream);
}
- private void runDownstreamTypesTest(final Pair<Integer, DownstreamType>... testPairs)
+ private void runDownstreamTypesTest(final int type, final DownstreamType expectedResult)
throws Exception {
- for (Pair<Integer, DownstreamType> testPair : testPairs) {
- final int type = testPair.first;
- final DownstreamType expectedResult = testPair.second;
-
- mTetheringMetrics.createBuilder(type, TEST_CALLER_PKG);
- updateErrorAndSendReport(type, TETHER_ERROR_NO_ERROR);
- verifyReport(expectedResult, ErrorCode.EC_NO_ERROR, UserType.USER_UNKNOWN);
- reset(mTetheringMetrics);
- }
+ mTetheringMetrics.createBuilder(type, TEST_CALLER_PKG);
+ updateErrorAndSendReport(type, TETHER_ERROR_NO_ERROR);
+ verifyReport(expectedResult, ErrorCode.EC_NO_ERROR, UserType.USER_UNKNOWN);
+ reset(mTetheringMetrics);
}
@Test
public void testDownstreamTypes() throws Exception {
- runDownstreamTypesTest(new Pair<>(TETHERING_WIFI, DownstreamType.DS_TETHERING_WIFI),
- new Pair<>(TETHERING_WIFI_P2P, DownstreamType.DS_TETHERING_WIFI_P2P),
- new Pair<>(TETHERING_BLUETOOTH, DownstreamType.DS_TETHERING_BLUETOOTH),
- new Pair<>(TETHERING_USB, DownstreamType.DS_TETHERING_USB),
- new Pair<>(TETHERING_NCM, DownstreamType.DS_TETHERING_NCM),
- new Pair<>(TETHERING_ETHERNET, DownstreamType.DS_TETHERING_ETHERNET));
+ runDownstreamTypesTest(TETHERING_WIFI, DownstreamType.DS_TETHERING_WIFI);
+ runDownstreamTypesTest(TETHERING_WIFI_P2P, DownstreamType.DS_TETHERING_WIFI_P2P);
+ runDownstreamTypesTest(TETHERING_BLUETOOTH, DownstreamType.DS_TETHERING_BLUETOOTH);
+ runDownstreamTypesTest(TETHERING_USB, DownstreamType.DS_TETHERING_USB);
+ runDownstreamTypesTest(TETHERING_NCM, DownstreamType.DS_TETHERING_NCM);
+ runDownstreamTypesTest(TETHERING_ETHERNET, DownstreamType.DS_TETHERING_ETHERNET);
}
- private void runErrorCodesTest(final Pair<Integer, ErrorCode>... testPairs)
+ private void runErrorCodesTest(final int errorCode, final ErrorCode expectedResult)
throws Exception {
- for (Pair<Integer, ErrorCode> testPair : testPairs) {
- final int errorCode = testPair.first;
- final ErrorCode expectedResult = testPair.second;
-
- mTetheringMetrics.createBuilder(TETHERING_WIFI, TEST_CALLER_PKG);
- updateErrorAndSendReport(TETHERING_WIFI, errorCode);
- verifyReport(DownstreamType.DS_TETHERING_WIFI, expectedResult, UserType.USER_UNKNOWN);
- reset(mTetheringMetrics);
- }
+ mTetheringMetrics.createBuilder(TETHERING_WIFI, TEST_CALLER_PKG);
+ updateErrorAndSendReport(TETHERING_WIFI, errorCode);
+ verifyReport(DownstreamType.DS_TETHERING_WIFI, expectedResult, UserType.USER_UNKNOWN);
}
@Test
public void testErrorCodes() throws Exception {
- runErrorCodesTest(new Pair<>(TETHER_ERROR_NO_ERROR, ErrorCode.EC_NO_ERROR),
- new Pair<>(TETHER_ERROR_UNKNOWN_IFACE, ErrorCode.EC_UNKNOWN_IFACE),
- new Pair<>(TETHER_ERROR_SERVICE_UNAVAIL, ErrorCode.EC_SERVICE_UNAVAIL),
- new Pair<>(TETHER_ERROR_UNSUPPORTED, ErrorCode.EC_UNSUPPORTED),
- new Pair<>(TETHER_ERROR_UNAVAIL_IFACE, ErrorCode.EC_UNAVAIL_IFACE),
- new Pair<>(TETHER_ERROR_INTERNAL_ERROR, ErrorCode.EC_INTERNAL_ERROR),
- new Pair<>(TETHER_ERROR_TETHER_IFACE_ERROR, ErrorCode.EC_TETHER_IFACE_ERROR),
- new Pair<>(TETHER_ERROR_UNTETHER_IFACE_ERROR, ErrorCode.EC_UNTETHER_IFACE_ERROR),
- new Pair<>(TETHER_ERROR_ENABLE_FORWARDING_ERROR,
- ErrorCode.EC_ENABLE_FORWARDING_ERROR),
- new Pair<>(TETHER_ERROR_DISABLE_FORWARDING_ERROR,
- ErrorCode.EC_DISABLE_FORWARDING_ERROR),
- new Pair<>(TETHER_ERROR_IFACE_CFG_ERROR, ErrorCode.EC_IFACE_CFG_ERROR),
- new Pair<>(TETHER_ERROR_PROVISIONING_FAILED, ErrorCode.EC_PROVISIONING_FAILED),
- new Pair<>(TETHER_ERROR_DHCPSERVER_ERROR, ErrorCode.EC_DHCPSERVER_ERROR),
- new Pair<>(TETHER_ERROR_ENTITLEMENT_UNKNOWN, ErrorCode.EC_ENTITLEMENT_UNKNOWN),
- new Pair<>(TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION,
- ErrorCode.EC_NO_CHANGE_TETHERING_PERMISSION),
- new Pair<>(TETHER_ERROR_NO_ACCESS_TETHERING_PERMISSION,
- ErrorCode.EC_NO_ACCESS_TETHERING_PERMISSION),
- new Pair<>(TETHER_ERROR_UNKNOWN_TYPE, ErrorCode.EC_UNKNOWN_TYPE));
+ runErrorCodesTest(TETHER_ERROR_NO_ERROR, ErrorCode.EC_NO_ERROR);
+ runErrorCodesTest(TETHER_ERROR_UNKNOWN_IFACE, ErrorCode.EC_UNKNOWN_IFACE);
+ runErrorCodesTest(TETHER_ERROR_SERVICE_UNAVAIL, ErrorCode.EC_SERVICE_UNAVAIL);
+ runErrorCodesTest(TETHER_ERROR_UNSUPPORTED, ErrorCode.EC_UNSUPPORTED);
+ runErrorCodesTest(TETHER_ERROR_UNAVAIL_IFACE, ErrorCode.EC_UNAVAIL_IFACE);
+ runErrorCodesTest(TETHER_ERROR_INTERNAL_ERROR, ErrorCode.EC_INTERNAL_ERROR);
+ runErrorCodesTest(TETHER_ERROR_TETHER_IFACE_ERROR, ErrorCode.EC_TETHER_IFACE_ERROR);
+ runErrorCodesTest(TETHER_ERROR_UNTETHER_IFACE_ERROR, ErrorCode.EC_UNTETHER_IFACE_ERROR);
+ runErrorCodesTest(TETHER_ERROR_ENABLE_FORWARDING_ERROR,
+ ErrorCode.EC_ENABLE_FORWARDING_ERROR);
+ runErrorCodesTest(TETHER_ERROR_DISABLE_FORWARDING_ERROR,
+ ErrorCode.EC_DISABLE_FORWARDING_ERROR);
+ runErrorCodesTest(TETHER_ERROR_IFACE_CFG_ERROR, ErrorCode.EC_IFACE_CFG_ERROR);
+ runErrorCodesTest(TETHER_ERROR_PROVISIONING_FAILED, ErrorCode.EC_PROVISIONING_FAILED);
+ runErrorCodesTest(TETHER_ERROR_DHCPSERVER_ERROR, ErrorCode.EC_DHCPSERVER_ERROR);
+ runErrorCodesTest(TETHER_ERROR_ENTITLEMENT_UNKNOWN, ErrorCode.EC_ENTITLEMENT_UNKNOWN);
+ runErrorCodesTest(TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION,
+ ErrorCode.EC_NO_CHANGE_TETHERING_PERMISSION);
+ runErrorCodesTest(TETHER_ERROR_NO_ACCESS_TETHERING_PERMISSION,
+ ErrorCode.EC_NO_ACCESS_TETHERING_PERMISSION);
+ runErrorCodesTest(TETHER_ERROR_UNKNOWN_TYPE, ErrorCode.EC_UNKNOWN_TYPE);
}
- private void runUserTypesTest(final Pair<String, UserType>... testPairs)
+ private void runUserTypesTest(final String callerPkg, final UserType expectedResult)
throws Exception {
- for (Pair<String, UserType> testPair : testPairs) {
- final String callerPkg = testPair.first;
- final UserType expectedResult = testPair.second;
-
- mTetheringMetrics.createBuilder(TETHERING_WIFI, callerPkg);
- updateErrorAndSendReport(TETHERING_WIFI, TETHER_ERROR_NO_ERROR);
- verifyReport(DownstreamType.DS_TETHERING_WIFI, ErrorCode.EC_NO_ERROR, expectedResult);
- reset(mTetheringMetrics);
- }
+ mTetheringMetrics.createBuilder(TETHERING_WIFI, callerPkg);
+ updateErrorAndSendReport(TETHERING_WIFI, TETHER_ERROR_NO_ERROR);
+ verifyReport(DownstreamType.DS_TETHERING_WIFI, ErrorCode.EC_NO_ERROR, expectedResult);
+ reset(mTetheringMetrics);
}
@Test
public void testUserTypes() throws Exception {
- runUserTypesTest(new Pair<>(TEST_CALLER_PKG, UserType.USER_UNKNOWN),
- new Pair<>(SETTINGS_PKG, UserType.USER_SETTINGS),
- new Pair<>(SYSTEMUI_PKG, UserType.USER_SYSTEMUI),
- new Pair<>(GMS_PKG, UserType.USER_GMS));
+ runUserTypesTest(TEST_CALLER_PKG, UserType.USER_UNKNOWN);
+ runUserTypesTest(SETTINGS_PKG, UserType.USER_SETTINGS);
+ runUserTypesTest(SYSTEMUI_PKG, UserType.USER_SYSTEMUI);
+ runUserTypesTest(GMS_PKG, UserType.USER_GMS);
}
@Test
diff --git a/framework-t/Sources.bp b/framework-t/Sources.bp
index 391a562..b8eb1f6 100644
--- a/framework-t/Sources.bp
+++ b/framework-t/Sources.bp
@@ -16,15 +16,13 @@
filegroup {
name: "framework-connectivity-tiramisu-updatable-sources",
+ defaults: ["framework-sources-module-defaults"],
srcs: [
"src/**/*.java",
"src/**/*.aidl",
],
path: "src",
- visibility: [
- "//frameworks/base",
- "//packages/modules/Connectivity:__subpackages__",
- ],
+ visibility: ["//packages/modules/Connectivity:__subpackages__"],
}
cc_library_shared {
diff --git a/framework-t/src/android/net/nsd/INsdManager.aidl b/framework-t/src/android/net/nsd/INsdManager.aidl
index 89e9cdb..9d14b1a 100644
--- a/framework-t/src/android/net/nsd/INsdManager.aidl
+++ b/framework-t/src/android/net/nsd/INsdManager.aidl
@@ -26,5 +26,5 @@
* {@hide}
*/
interface INsdManager {
- INsdServiceConnector connect(INsdManagerCallback cb);
+ INsdServiceConnector connect(INsdManagerCallback cb, boolean useJavaBackend);
}
diff --git a/framework-t/src/android/net/nsd/NsdManager.java b/framework-t/src/android/net/nsd/NsdManager.java
index 36808cf..96f2f80 100644
--- a/framework-t/src/android/net/nsd/NsdManager.java
+++ b/framework-t/src/android/net/nsd/NsdManager.java
@@ -16,6 +16,7 @@
package android.net.nsd;
+import static android.net.connectivity.ConnectivityCompatChanges.ENABLE_PLATFORM_MDNS_BACKEND;
import static android.net.connectivity.ConnectivityCompatChanges.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER;
import android.annotation.IntDef;
@@ -510,7 +511,8 @@
mHandler = new ServiceHandler(t.getLooper());
try {
- mService = service.connect(new NsdCallbackImpl(mHandler));
+ mService = service.connect(new NsdCallbackImpl(mHandler), CompatChanges.isChangeEnabled(
+ ENABLE_PLATFORM_MDNS_BACKEND));
} catch (RemoteException e) {
throw new RuntimeException("Failed to connect to NsdService");
}
diff --git a/framework/Android.bp b/framework/Android.bp
index 3950dba..2d729c5 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -45,14 +45,12 @@
// TODO: use a java_library in the bootclasspath instead
filegroup {
name: "framework-connectivity-sources",
+ defaults: ["framework-sources-module-defaults"],
srcs: [
":framework-connectivity-internal-sources",
":framework-connectivity-aidl-export-sources",
],
- visibility: [
- "//frameworks/base",
- "//packages/modules/Connectivity:__subpackages__",
- ],
+ visibility: ["//packages/modules/Connectivity:__subpackages__"],
}
java_defaults {
diff --git a/framework/src/android/net/connectivity/ConnectivityCompatChanges.java b/framework/src/android/net/connectivity/ConnectivityCompatChanges.java
index 2cfda9e..dfe5867 100644
--- a/framework/src/android/net/connectivity/ConnectivityCompatChanges.java
+++ b/framework/src/android/net/connectivity/ConnectivityCompatChanges.java
@@ -73,6 +73,17 @@
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.TIRAMISU)
public static final long ENABLE_SELF_CERTIFIED_CAPABILITIES_DECLARATION = 266524688;
+ /**
+ * Apps targeting < Android 14 use a legacy NSD backend.
+ *
+ * The legacy apps use a legacy native daemon as NsdManager backend, but other apps use a
+ * platform-integrated mDNS implementation as backend.
+ *
+ * @hide
+ */
+ @ChangeId
+ @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.TIRAMISU)
+ public static final long ENABLE_PLATFORM_MDNS_BACKEND = 270306772L;
private ConnectivityCompatChanges() {
}
}
diff --git a/nearby/framework/Android.bp b/nearby/framework/Android.bp
index e223b54..f6e0995 100644
--- a/nearby/framework/Android.bp
+++ b/nearby/framework/Android.bp
@@ -32,10 +32,10 @@
filegroup {
name: "framework-nearby-sources",
+ defaults: ["framework-sources-module-defaults"],
srcs: [
":framework-nearby-java-sources",
],
- visibility: ["//frameworks/base"],
}
// Build of only framework-nearby (not as part of connectivity) for
diff --git a/nearby/halfsheet/src/com/android/nearby/halfsheet/HalfSheetActivity.java b/nearby/halfsheet/src/com/android/nearby/halfsheet/HalfSheetActivity.java
index 2a38b8a..07e5776 100644
--- a/nearby/halfsheet/src/com/android/nearby/halfsheet/HalfSheetActivity.java
+++ b/nearby/halfsheet/src/com/android/nearby/halfsheet/HalfSheetActivity.java
@@ -16,6 +16,8 @@
package com.android.nearby.halfsheet;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+
import static com.android.nearby.halfsheet.fragment.DevicePairingFragment.APP_LAUNCH_FRAGMENT_TYPE;
import static com.android.server.nearby.common.bluetooth.fastpair.FastPairConstants.EXTRA_MODEL_ID;
import static com.android.server.nearby.common.fastpair.service.UserActionHandlerBase.EXTRA_MAC_ADDRESS;
@@ -226,7 +228,8 @@
EXTRA_HALF_SHEET_IS_RETROACTIVE,
getIntent().getBooleanExtra(EXTRA_HALF_SHEET_IS_RETROACTIVE,
false))
- .putExtra(EXTRA_MAC_ADDRESS, mScanFastPairStoreItem.getAddress()));
+ .putExtra(EXTRA_MAC_ADDRESS, mScanFastPairStoreItem.getAddress()),
+ ACCESS_FINE_LOCATION);
}
}
diff --git a/nearby/halfsheet/src/com/android/nearby/halfsheet/utils/BroadcastUtils.java b/nearby/halfsheet/src/com/android/nearby/halfsheet/utils/BroadcastUtils.java
index 467997c..2f1e90a 100644
--- a/nearby/halfsheet/src/com/android/nearby/halfsheet/utils/BroadcastUtils.java
+++ b/nearby/halfsheet/src/com/android/nearby/halfsheet/utils/BroadcastUtils.java
@@ -31,6 +31,13 @@
context.sendBroadcast(intent);
}
+ /**
+ * Helps send a broadcast with specified receiver permission.
+ */
+ public static void sendBroadcast(Context context, Intent intent, String receiverPermission) {
+ context.sendBroadcast(intent, receiverPermission);
+ }
+
private BroadcastUtils() {
}
}
diff --git a/nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp b/nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp
index 284d5c2..ec0392c 100644
--- a/nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp
+++ b/nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp
@@ -35,4 +35,5 @@
// timeout in seconds.
timeout: 36000,
},
-}
\ No newline at end of file
+ upstream: true,
+}
diff --git a/nearby/tests/robotests/Android.bp b/nearby/tests/robotests/Android.bp
index 56c0107..70fa0c3 100644
--- a/nearby/tests/robotests/Android.bp
+++ b/nearby/tests/robotests/Android.bp
@@ -42,15 +42,14 @@
"androidx.lifecycle_lifecycle-runtime",
"androidx.mediarouter_mediarouter-nodeps",
"error_prone_annotations",
- "mockito-robolectric-prebuilt",
"service-nearby-pre-jarjar",
"truth-prebuilt",
"robolectric_android-all-stub",
- "Robolectric_all-target",
],
test_options: {
// timeout in seconds.
timeout: 36000,
},
+ upstream: true,
}
diff --git a/service-t/native/libs/libnetworkstats/Android.bp b/service-t/native/libs/libnetworkstats/Android.bp
index f2c569f..f40d388 100644
--- a/service-t/native/libs/libnetworkstats/Android.bp
+++ b/service-t/native/libs/libnetworkstats/Android.bp
@@ -62,6 +62,7 @@
header_libs: ["bpf_connectivity_headers"],
srcs: [
"BpfNetworkStatsTest.cpp",
+ "NetworkTraceHandlerTest.cpp",
"NetworkTracePollerTest.cpp",
],
cflags: [
@@ -74,6 +75,8 @@
"libgmock",
"libnetworkstats",
"libperfetto_client_experimental",
+ "libprotobuf-cpp-lite",
+ "perfetto_trace_protos",
],
shared_libs: [
"libbase",
diff --git a/service-t/native/libs/libnetworkstats/NetworkTraceHandler.cpp b/service-t/native/libs/libnetworkstats/NetworkTraceHandler.cpp
index 8e70950..696a29a 100644
--- a/service-t/native/libs/libnetworkstats/NetworkTraceHandler.cpp
+++ b/service-t/native/libs/libnetworkstats/NetworkTraceHandler.cpp
@@ -34,11 +34,61 @@
namespace android {
namespace bpf {
using ::android::bpf::internal::NetworkTracePoller;
+using ::perfetto::protos::pbzero::NetworkPacketBundle;
using ::perfetto::protos::pbzero::NetworkPacketEvent;
using ::perfetto::protos::pbzero::NetworkPacketTraceConfig;
using ::perfetto::protos::pbzero::TracePacket;
using ::perfetto::protos::pbzero::TrafficDirection;
+// Bundling takes groups of packets with similar contextual fields (generally,
+// all fields except timestamp and length) and summarises them in a single trace
+// packet. For example, rather than
+//
+// {.timestampNs = 1, .uid = 1000, .tag = 123, .len = 72}
+// {.timestampNs = 2, .uid = 1000, .tag = 123, .len = 100}
+// {.timestampNs = 5, .uid = 1000, .tag = 123, .len = 456}
+//
+// The output will be something like
+// {
+// .timestamp = 1
+// .ctx = {.uid = 1000, .tag = 123}
+// .timestamp = [0, 1, 4], // delta encoded
+// .length = [72, 100, 456], // should be zipped with timestamps
+// }
+//
+// Most workloads have many packets from few contexts. Bundling greatly reduces
+// the amount of redundant information written, thus reducing the overall trace
+// size. Interning ids are similarly based on unique bundle contexts.
+
+// Based on boost::hash_combine
+template <typename T, typename... Rest>
+void HashCombine(std::size_t& seed, const T& val, const Rest&... rest) {
+ seed ^= std::hash<T>()(val) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+ (HashCombine(seed, rest), ...);
+}
+
+// Details summarises the timestamp and lengths of packets in a bundle.
+struct BundleDetails {
+ std::vector<std::pair<uint64_t, uint32_t>> time_and_len;
+ uint64_t minTs = std::numeric_limits<uint64_t>::max();
+ uint64_t maxTs = std::numeric_limits<uint64_t>::min();
+ uint32_t bytes = 0;
+};
+
+#define AGG_FIELDS(x) \
+ (x).ifindex, (x).uid, (x).tag, (x).sport, (x).dport, (x).egress, \
+ (x).ipProto, (x).tcpFlags
+
+std::size_t BundleHash::operator()(const BundleKey& a) const {
+ std::size_t seed = 0;
+ HashCombine(seed, AGG_FIELDS(a));
+ return seed;
+}
+
+bool BundleEq::operator()(const BundleKey& a, const BundleKey& b) const {
+ return std::tie(AGG_FIELDS(a)) == std::tie(AGG_FIELDS(b));
+}
+
// static
void NetworkTraceHandler::RegisterDataSource() {
ALOGD("Registering Perfetto data source");
@@ -57,11 +107,16 @@
}
// static
-NetworkTracePoller NetworkTraceHandler::sPoller([](const PacketTrace& pkt) {
- NetworkTraceHandler::Trace([pkt](NetworkTraceHandler::TraceContext ctx) {
- NetworkTraceHandler::Fill(pkt, *ctx.NewTracePacket());
- });
-});
+NetworkTracePoller NetworkTraceHandler::sPoller(
+ [](const std::vector<PacketTrace>& packets) {
+ // Trace calls the provided callback for each active session. The context
+ // gets a reference to the NetworkTraceHandler instance associated with
+ // the session and delegates writing. The corresponding handler will write
+ // with the setting specified in the trace config.
+ NetworkTraceHandler::Trace([&](NetworkTraceHandler::TraceContext ctx) {
+ ctx.GetDataSourceLocked()->Write(packets, ctx);
+ });
+ });
void NetworkTraceHandler::OnSetup(const SetupArgs& args) {
const std::string& raw = args.config->network_packet_trace_config_raw();
@@ -72,6 +127,12 @@
ALOGI("poll_ms is missing or below the 100ms minimum. Increasing to 100ms");
mPollMs = 100;
}
+
+ mInternLimit = config.intern_limit();
+ mAggregationThreshold = config.aggregation_threshold();
+ mDropLocalPort = config.drop_local_port();
+ mDropRemotePort = config.drop_remote_port();
+ mDropTcpFlags = config.drop_tcp_flags();
}
void NetworkTraceHandler::OnStart(const StartArgs&) {
@@ -83,21 +144,98 @@
mStarted = false;
}
-// static class method
-void NetworkTraceHandler::Fill(const PacketTrace& src, TracePacket& dst) {
- dst.set_timestamp(src.timestampNs);
- auto* event = dst.set_network_packet();
+void NetworkTraceHandler::Write(const std::vector<PacketTrace>& packets,
+ NetworkTraceHandler::TraceContext& ctx) {
+ // TODO: remove this fallback once Perfetto stable has support for bundles.
+ if (!mInternLimit && !mAggregationThreshold) {
+ for (const PacketTrace& pkt : packets) {
+ auto dst = ctx.NewTracePacket();
+ dst->set_timestamp(pkt.timestampNs);
+ auto* event = dst->set_network_packet();
+ event->set_length(pkt.length);
+ Fill(pkt, event);
+ }
+ return;
+ }
+
+ uint64_t minTs = std::numeric_limits<uint64_t>::max();
+ std::unordered_map<BundleKey, BundleDetails, BundleHash, BundleEq> bundles;
+ for (const PacketTrace& pkt : packets) {
+ BundleKey key = pkt;
+
+ // Dropping fields should remove them from the output and remove them from
+ // the aggregation key. In order to do the latter without changing the hash
+ // function, set the dropped fields to zero.
+ if (mDropTcpFlags) key.tcpFlags = 0;
+ if (mDropLocalPort) (key.egress ? key.sport : key.dport) = 0;
+ if (mDropRemotePort) (key.egress ? key.dport : key.sport) = 0;
+
+ minTs = std::min(minTs, pkt.timestampNs);
+
+ BundleDetails& bundle = bundles[key];
+ bundle.time_and_len.emplace_back(pkt.timestampNs, pkt.length);
+ bundle.minTs = std::min(bundle.minTs, pkt.timestampNs);
+ bundle.maxTs = std::max(bundle.maxTs, pkt.timestampNs);
+ bundle.bytes += pkt.length;
+ }
+
+ // If state was cleared, emit a separate packet to indicate it. This uses the
+ // overall minTs so it is sorted before any packets that follow.
+ NetworkTraceState* incr_state = ctx.GetIncrementalState();
+ if (!bundles.empty() && mInternLimit && incr_state->cleared) {
+ auto clear = ctx.NewTracePacket();
+ clear->set_sequence_flags(TracePacket::SEQ_INCREMENTAL_STATE_CLEARED);
+ clear->set_timestamp(minTs);
+ incr_state->cleared = false;
+ }
+
+ for (const auto& kv : bundles) {
+ const BundleKey& key = kv.first;
+ const BundleDetails& details = kv.second;
+
+ auto dst = ctx.NewTracePacket();
+ dst->set_sequence_flags(TracePacket::SEQ_NEEDS_INCREMENTAL_STATE);
+ dst->set_timestamp(details.minTs);
+
+ auto* event = FillWithInterning(incr_state, key, dst.get());
+
+ int count = details.time_and_len.size();
+ if (!mAggregationThreshold || count < mAggregationThreshold) {
+ protozero::PackedVarInt offsets;
+ protozero::PackedVarInt lengths;
+ for (const auto& kv : details.time_and_len) {
+ offsets.Append(kv.first - details.minTs);
+ lengths.Append(kv.second);
+ }
+
+ event->set_packet_timestamps(offsets);
+ event->set_packet_lengths(lengths);
+ } else {
+ event->set_total_duration(details.maxTs - details.minTs);
+ event->set_total_length(details.bytes);
+ event->set_total_packets(count);
+ }
+ }
+}
+
+void NetworkTraceHandler::Fill(const PacketTrace& src,
+ NetworkPacketEvent* event) {
event->set_direction(src.egress ? TrafficDirection::DIR_EGRESS
: TrafficDirection::DIR_INGRESS);
- event->set_length(src.length);
event->set_uid(src.uid);
event->set_tag(src.tag);
- event->set_local_port(src.egress ? ntohs(src.sport) : ntohs(src.dport));
- event->set_remote_port(src.egress ? ntohs(src.dport) : ntohs(src.sport));
+ if (!mDropLocalPort) {
+ event->set_local_port(ntohs(src.egress ? src.sport : src.dport));
+ }
+ if (!mDropRemotePort) {
+ event->set_remote_port(ntohs(src.egress ? src.dport : src.sport));
+ }
+ if (!mDropTcpFlags) {
+ event->set_tcp_flags(src.tcpFlags);
+ }
event->set_ip_proto(src.ipProto);
- event->set_tcp_flags(src.tcpFlags);
char ifname[IF_NAMESIZE] = {};
if (if_indextoname(src.ifindex, ifname) == ifname) {
@@ -107,5 +245,39 @@
}
}
+NetworkPacketBundle* NetworkTraceHandler::FillWithInterning(
+ NetworkTraceState* state, const BundleKey& key, TracePacket* dst) {
+ uint64_t iid = 0;
+ bool found = false;
+
+ if (state->iids.size() < mInternLimit) {
+ auto [iter, success] = state->iids.try_emplace(key, state->iids.size() + 1);
+ iid = iter->second;
+ found = true;
+
+ if (success) {
+ // If we successfully empaced, record the newly interned data.
+ auto* packet_context = dst->set_interned_data()->add_packet_context();
+ Fill(key, packet_context->set_ctx());
+ packet_context->set_iid(iid);
+ }
+ } else {
+ auto iter = state->iids.find(key);
+ if (iter != state->iids.end()) {
+ iid = iter->second;
+ found = true;
+ }
+ }
+
+ auto* event = dst->set_network_packet_bundle();
+ if (found) {
+ event->set_iid(iid);
+ } else {
+ Fill(key, event->set_ctx());
+ }
+
+ return event;
+}
+
} // namespace bpf
} // namespace android
diff --git a/service-t/native/libs/libnetworkstats/NetworkTraceHandlerTest.cpp b/service-t/native/libs/libnetworkstats/NetworkTraceHandlerTest.cpp
new file mode 100644
index 0000000..c9eb183
--- /dev/null
+++ b/service-t/native/libs/libnetworkstats/NetworkTraceHandlerTest.cpp
@@ -0,0 +1,394 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <vector>
+
+#include "netdbpf/NetworkTraceHandler.h"
+#include "protos/perfetto/config/android/network_trace_config.gen.h"
+#include "protos/perfetto/trace/android/network_trace.pb.h"
+#include "protos/perfetto/trace/trace.pb.h"
+#include "protos/perfetto/trace/trace_packet.pb.h"
+
+namespace android {
+namespace bpf {
+using ::perfetto::protos::NetworkPacketEvent;
+using ::perfetto::protos::NetworkPacketTraceConfig;
+using ::perfetto::protos::Trace;
+using ::perfetto::protos::TracePacket;
+using ::perfetto::protos::TrafficDirection;
+
+// This handler makes OnStart and OnStop a no-op so that tracing is not really
+// started on the device.
+class HandlerForTest : public NetworkTraceHandler {
+ public:
+ void OnStart(const StartArgs&) override {}
+ void OnStop(const StopArgs&) override {}
+};
+
+class NetworkTraceHandlerTest : public testing::Test {
+ protected:
+ // Starts a tracing session with the handler under test.
+ std::unique_ptr<perfetto::TracingSession> StartTracing(
+ NetworkPacketTraceConfig settings) {
+ perfetto::TracingInitArgs args;
+ args.backends = perfetto::kInProcessBackend;
+ perfetto::Tracing::Initialize(args);
+
+ perfetto::DataSourceDescriptor dsd;
+ dsd.set_name("test.network_packets");
+ HandlerForTest::Register(dsd);
+
+ perfetto::TraceConfig cfg;
+ cfg.add_buffers()->set_size_kb(1024);
+ auto* config = cfg.add_data_sources()->mutable_config();
+ config->set_name("test.network_packets");
+ config->set_network_packet_trace_config_raw(settings.SerializeAsString());
+
+ auto session = perfetto::Tracing::NewTrace(perfetto::kInProcessBackend);
+ session->Setup(cfg);
+ session->StartBlocking();
+ return session;
+ }
+
+ // Stops the trace session and reports all relevant trace packets.
+ bool StopTracing(perfetto::TracingSession* session,
+ std::vector<TracePacket>* output) {
+ session->StopBlocking();
+
+ Trace trace;
+ std::vector<char> raw_trace = session->ReadTraceBlocking();
+ if (!trace.ParseFromArray(raw_trace.data(), raw_trace.size())) {
+ ADD_FAILURE() << "trace.ParseFromArray failed";
+ return false;
+ }
+
+ // This is a real trace and includes irrelevant trace packets such as trace
+ // metadata. The following strips the results to just the packets we want.
+ for (const auto& pkt : trace.packet()) {
+ if (pkt.has_network_packet() || pkt.has_network_packet_bundle()) {
+ output->emplace_back(pkt);
+ }
+ }
+
+ return true;
+ }
+
+ // This runs a trace with a single call to Write.
+ bool TraceAndSortPackets(const std::vector<PacketTrace>& input,
+ std::vector<TracePacket>* output,
+ NetworkPacketTraceConfig config = {}) {
+ auto session = StartTracing(config);
+ HandlerForTest::Trace([&](HandlerForTest::TraceContext ctx) {
+ ctx.GetDataSourceLocked()->Write(input, ctx);
+ ctx.Flush();
+ });
+
+ if (!StopTracing(session.get(), output)) {
+ return false;
+ }
+
+ // Sort to provide deterministic ordering regardless of Perfetto internals
+ // or implementation-defined (e.g. hash map) reshuffling.
+ std::sort(output->begin(), output->end(),
+ [](const TracePacket& a, const TracePacket& b) {
+ return a.timestamp() < b.timestamp();
+ });
+
+ return true;
+ }
+};
+
+TEST_F(NetworkTraceHandlerTest, WriteBasicFields) {
+ std::vector<PacketTrace> input = {
+ PacketTrace{
+ .timestampNs = 1000,
+ .length = 100,
+ .uid = 10,
+ .tag = 123,
+ .ipProto = 6,
+ .tcpFlags = 1,
+ },
+ };
+
+ std::vector<TracePacket> events;
+ ASSERT_TRUE(TraceAndSortPackets(input, &events));
+
+ ASSERT_EQ(events.size(), 1);
+ EXPECT_THAT(events[0].timestamp(), 1000);
+ EXPECT_THAT(events[0].network_packet().uid(), 10);
+ EXPECT_THAT(events[0].network_packet().tag(), 123);
+ EXPECT_THAT(events[0].network_packet().ip_proto(), 6);
+ EXPECT_THAT(events[0].network_packet().tcp_flags(), 1);
+ EXPECT_THAT(events[0].network_packet().length(), 100);
+}
+
+TEST_F(NetworkTraceHandlerTest, WriteDirectionAndPorts) {
+ std::vector<PacketTrace> input = {
+ PacketTrace{
+ .timestampNs = 1,
+ .sport = htons(8080),
+ .dport = htons(443),
+ .egress = true,
+ },
+ PacketTrace{
+ .timestampNs = 2,
+ .sport = htons(443),
+ .dport = htons(8080),
+ .egress = false,
+ },
+ };
+
+ std::vector<TracePacket> events;
+ ASSERT_TRUE(TraceAndSortPackets(input, &events));
+
+ ASSERT_EQ(events.size(), 2);
+ EXPECT_THAT(events[0].network_packet().local_port(), 8080);
+ EXPECT_THAT(events[0].network_packet().remote_port(), 443);
+ EXPECT_THAT(events[0].network_packet().direction(),
+ TrafficDirection::DIR_EGRESS);
+ EXPECT_THAT(events[1].network_packet().local_port(), 8080);
+ EXPECT_THAT(events[1].network_packet().remote_port(), 443);
+ EXPECT_THAT(events[1].network_packet().direction(),
+ TrafficDirection::DIR_INGRESS);
+}
+
+TEST_F(NetworkTraceHandlerTest, BasicBundling) {
+ // TODO: remove this once bundling becomes default. Until then, set arbitrary
+ // aggregation threshold to enable bundling.
+ NetworkPacketTraceConfig config;
+ config.set_aggregation_threshold(10);
+
+ std::vector<PacketTrace> input = {
+ PacketTrace{.uid = 123, .timestampNs = 2, .length = 200},
+ PacketTrace{.uid = 123, .timestampNs = 1, .length = 100},
+ PacketTrace{.uid = 123, .timestampNs = 4, .length = 300},
+
+ PacketTrace{.uid = 456, .timestampNs = 2, .length = 400},
+ PacketTrace{.uid = 456, .timestampNs = 4, .length = 100},
+ };
+
+ std::vector<TracePacket> events;
+ ASSERT_TRUE(TraceAndSortPackets(input, &events, config));
+
+ ASSERT_EQ(events.size(), 2);
+
+ EXPECT_THAT(events[0].timestamp(), 1);
+ EXPECT_THAT(events[0].network_packet_bundle().ctx().uid(), 123);
+ EXPECT_THAT(events[0].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(200, 100, 300));
+ EXPECT_THAT(events[0].network_packet_bundle().packet_timestamps(),
+ testing::ElementsAre(1, 0, 3));
+
+ EXPECT_THAT(events[1].timestamp(), 2);
+ EXPECT_THAT(events[1].network_packet_bundle().ctx().uid(), 456);
+ EXPECT_THAT(events[1].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(400, 100));
+ EXPECT_THAT(events[1].network_packet_bundle().packet_timestamps(),
+ testing::ElementsAre(0, 2));
+}
+
+TEST_F(NetworkTraceHandlerTest, AggregationThreshold) {
+ // With an aggregation threshold of 3, the set of packets with uid=123 will
+ // be aggregated (3>=3) whereas packets with uid=456 get per-packet info.
+ NetworkPacketTraceConfig config;
+ config.set_aggregation_threshold(3);
+
+ std::vector<PacketTrace> input = {
+ PacketTrace{.uid = 123, .timestampNs = 2, .length = 200},
+ PacketTrace{.uid = 123, .timestampNs = 1, .length = 100},
+ PacketTrace{.uid = 123, .timestampNs = 4, .length = 300},
+
+ PacketTrace{.uid = 456, .timestampNs = 2, .length = 400},
+ PacketTrace{.uid = 456, .timestampNs = 4, .length = 100},
+ };
+
+ std::vector<TracePacket> events;
+ ASSERT_TRUE(TraceAndSortPackets(input, &events, config));
+
+ ASSERT_EQ(events.size(), 2);
+
+ EXPECT_EQ(events[0].timestamp(), 1);
+ EXPECT_EQ(events[0].network_packet_bundle().ctx().uid(), 123);
+ EXPECT_EQ(events[0].network_packet_bundle().total_duration(), 3);
+ EXPECT_EQ(events[0].network_packet_bundle().total_packets(), 3);
+ EXPECT_EQ(events[0].network_packet_bundle().total_length(), 600);
+
+ EXPECT_EQ(events[1].timestamp(), 2);
+ EXPECT_EQ(events[1].network_packet_bundle().ctx().uid(), 456);
+ EXPECT_THAT(events[1].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(400, 100));
+ EXPECT_THAT(events[1].network_packet_bundle().packet_timestamps(),
+ testing::ElementsAre(0, 2));
+}
+
+TEST_F(NetworkTraceHandlerTest, DropLocalPort) {
+ NetworkPacketTraceConfig config;
+ config.set_drop_local_port(true);
+ config.set_aggregation_threshold(10);
+
+ __be16 a = htons(10000);
+ __be16 b = htons(10001);
+ std::vector<PacketTrace> input = {
+ // Recall that local is `src` for egress and `dst` for ingress.
+ PacketTrace{.timestampNs = 1, .length = 2, .egress = true, .sport = a},
+ PacketTrace{.timestampNs = 2, .length = 4, .egress = false, .dport = a},
+ PacketTrace{.timestampNs = 3, .length = 6, .egress = true, .sport = b},
+ PacketTrace{.timestampNs = 4, .length = 8, .egress = false, .dport = b},
+ };
+
+ std::vector<TracePacket> events;
+ ASSERT_TRUE(TraceAndSortPackets(input, &events, config));
+ ASSERT_EQ(events.size(), 2);
+
+ // Despite having different local ports, drop and bundle by remaining fields.
+ EXPECT_EQ(events[0].network_packet_bundle().ctx().direction(),
+ TrafficDirection::DIR_EGRESS);
+ EXPECT_THAT(events[0].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(2, 6));
+
+ EXPECT_EQ(events[1].network_packet_bundle().ctx().direction(),
+ TrafficDirection::DIR_INGRESS);
+ EXPECT_THAT(events[1].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(4, 8));
+
+ // Local port shouldn't be in output.
+ EXPECT_FALSE(events[0].network_packet_bundle().ctx().has_local_port());
+ EXPECT_FALSE(events[1].network_packet_bundle().ctx().has_local_port());
+}
+
+TEST_F(NetworkTraceHandlerTest, DropRemotePort) {
+ NetworkPacketTraceConfig config;
+ config.set_drop_remote_port(true);
+ config.set_aggregation_threshold(10);
+
+ __be16 a = htons(443);
+ __be16 b = htons(80);
+ std::vector<PacketTrace> input = {
+ // Recall that remote is `dst` for egress and `src` for ingress.
+ PacketTrace{.timestampNs = 1, .length = 2, .egress = true, .dport = a},
+ PacketTrace{.timestampNs = 2, .length = 4, .egress = false, .sport = a},
+ PacketTrace{.timestampNs = 3, .length = 6, .egress = true, .dport = b},
+ PacketTrace{.timestampNs = 4, .length = 8, .egress = false, .sport = b},
+ };
+
+ std::vector<TracePacket> events;
+ ASSERT_TRUE(TraceAndSortPackets(input, &events, config));
+ ASSERT_EQ(events.size(), 2);
+
+ // Despite having different remote ports, drop and bundle by remaining fields.
+ EXPECT_EQ(events[0].network_packet_bundle().ctx().direction(),
+ TrafficDirection::DIR_EGRESS);
+ EXPECT_THAT(events[0].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(2, 6));
+
+ EXPECT_EQ(events[1].network_packet_bundle().ctx().direction(),
+ TrafficDirection::DIR_INGRESS);
+ EXPECT_THAT(events[1].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(4, 8));
+
+ // Remote port shouldn't be in output.
+ EXPECT_FALSE(events[0].network_packet_bundle().ctx().has_remote_port());
+ EXPECT_FALSE(events[1].network_packet_bundle().ctx().has_remote_port());
+}
+
+TEST_F(NetworkTraceHandlerTest, DropTcpFlags) {
+ NetworkPacketTraceConfig config;
+ config.set_drop_tcp_flags(true);
+ config.set_aggregation_threshold(10);
+
+ std::vector<PacketTrace> input = {
+ PacketTrace{.timestampNs = 1, .uid = 123, .length = 1, .tcpFlags = 1},
+ PacketTrace{.timestampNs = 2, .uid = 123, .length = 2, .tcpFlags = 2},
+ PacketTrace{.timestampNs = 3, .uid = 456, .length = 3, .tcpFlags = 1},
+ PacketTrace{.timestampNs = 4, .uid = 456, .length = 4, .tcpFlags = 2},
+ };
+
+ std::vector<TracePacket> events;
+ ASSERT_TRUE(TraceAndSortPackets(input, &events, config));
+
+ ASSERT_EQ(events.size(), 2);
+
+ // Despite having different tcp flags, drop and bundle by remaining fields.
+ EXPECT_EQ(events[0].network_packet_bundle().ctx().uid(), 123);
+ EXPECT_THAT(events[0].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(1, 2));
+
+ EXPECT_EQ(events[1].network_packet_bundle().ctx().uid(), 456);
+ EXPECT_THAT(events[1].network_packet_bundle().packet_lengths(),
+ testing::ElementsAre(3, 4));
+
+ // Tcp flags shouldn't be in output.
+ EXPECT_FALSE(events[0].network_packet_bundle().ctx().has_tcp_flags());
+ EXPECT_FALSE(events[1].network_packet_bundle().ctx().has_tcp_flags());
+}
+
+TEST_F(NetworkTraceHandlerTest, Interning) {
+ NetworkPacketTraceConfig config;
+ config.set_intern_limit(2);
+
+ // The test writes 4 packets coming from three sources (uids). With an intern
+ // limit of 2, the first two sources should be interned. This test splits this
+ // into individual writes since internally an unordered map is used and would
+ // otherwise non-deterministically choose what to intern (this is fine for
+ // real use, but not good for test assertions).
+ std::vector<std::vector<PacketTrace>> inputs = {
+ {PacketTrace{.timestampNs = 1, .uid = 123}},
+ {PacketTrace{.timestampNs = 2, .uid = 456}},
+ {PacketTrace{.timestampNs = 3, .uid = 789}},
+ {PacketTrace{.timestampNs = 4, .uid = 123}},
+ };
+
+ auto session = StartTracing(config);
+
+ HandlerForTest::Trace([&](HandlerForTest::TraceContext ctx) {
+ ctx.GetDataSourceLocked()->Write(inputs[0], ctx);
+ ctx.GetDataSourceLocked()->Write(inputs[1], ctx);
+ ctx.GetDataSourceLocked()->Write(inputs[2], ctx);
+ ctx.GetDataSourceLocked()->Write(inputs[3], ctx);
+ ctx.Flush();
+ });
+
+ std::vector<TracePacket> events;
+ ASSERT_TRUE(StopTracing(session.get(), &events));
+
+ ASSERT_EQ(events.size(), 4);
+
+ // First time seen, emit new interned data, bundle uses iid instead of ctx.
+ EXPECT_EQ(events[0].network_packet_bundle().iid(), 1);
+ ASSERT_EQ(events[0].interned_data().packet_context().size(), 1);
+ EXPECT_EQ(events[0].interned_data().packet_context(0).iid(), 1);
+ EXPECT_EQ(events[0].interned_data().packet_context(0).ctx().uid(), 123);
+
+ // First time seen, emit new interned data, bundle uses iid instead of ctx.
+ EXPECT_EQ(events[1].network_packet_bundle().iid(), 2);
+ ASSERT_EQ(events[1].interned_data().packet_context().size(), 1);
+ EXPECT_EQ(events[1].interned_data().packet_context(0).iid(), 2);
+ EXPECT_EQ(events[1].interned_data().packet_context(0).ctx().uid(), 456);
+
+ // Not enough room in intern table (limit 2), inline the context.
+ EXPECT_EQ(events[2].network_packet_bundle().ctx().uid(), 789);
+ EXPECT_EQ(events[2].interned_data().packet_context().size(), 0);
+
+ // Second time seen, no need to re-emit interned data, only record iid.
+ EXPECT_EQ(events[3].network_packet_bundle().iid(), 1);
+ EXPECT_EQ(events[3].interned_data().packet_context().size(), 0);
+}
+
+} // namespace bpf
+} // namespace android
diff --git a/service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp b/service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp
index 34dbf9e..3abb49a 100644
--- a/service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp
+++ b/service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp
@@ -116,12 +116,16 @@
return false;
}
- base::Result<int> ret = mRingBuffer->ConsumeAll(mCallback);
+ std::vector<PacketTrace> packets;
+ base::Result<int> ret = mRingBuffer->ConsumeAll(
+ [&](const PacketTrace& pkt) { packets.push_back(pkt); });
if (!ret.ok()) {
ALOGW("Failed to poll ringbuf: %s", ret.error().message().c_str());
return false;
}
+ mCallback(packets);
+
return true;
}
diff --git a/service-t/native/libs/libnetworkstats/NetworkTracePollerTest.cpp b/service-t/native/libs/libnetworkstats/NetworkTracePollerTest.cpp
index 28ec208..725cec1 100644
--- a/service-t/native/libs/libnetworkstats/NetworkTracePollerTest.cpp
+++ b/service-t/native/libs/libnetworkstats/NetworkTracePollerTest.cpp
@@ -100,7 +100,7 @@
};
TEST_F(NetworkTracePollerTest, PollWhileInactive) {
- NetworkTracePoller handler([&](const PacketTrace& pkt) {});
+ NetworkTracePoller handler([&](const std::vector<PacketTrace>& pkt) {});
// One succeed after start and before stop.
EXPECT_FALSE(handler.ConsumeAll());
@@ -113,7 +113,7 @@
TEST_F(NetworkTracePollerTest, ConcurrentSessions) {
// Simulate two concurrent sessions (two starts followed by two stops). Check
// that tracing is stopped only after both sessions finish.
- NetworkTracePoller handler([&](const PacketTrace& pkt) {});
+ NetworkTracePoller handler([&](const std::vector<PacketTrace>& pkt) {});
ASSERT_TRUE(handler.Start(kNeverPoll));
EXPECT_TRUE(handler.ConsumeAll());
@@ -135,10 +135,12 @@
// Record all packets with the bound address and current uid. This callback is
// involked only within ConsumeAll, at which point the port should have
// already been filled in and all packets have been processed.
- NetworkTracePoller handler([&](const PacketTrace& pkt) {
- if (pkt.sport != server_port && pkt.dport != server_port) return;
- if (pkt.uid != getuid()) return;
- packets.push_back(pkt);
+ NetworkTracePoller handler([&](const std::vector<PacketTrace>& pkts) {
+ for (const PacketTrace& pkt : pkts) {
+ if (pkt.sport != server_port && pkt.dport != server_port) return;
+ if (pkt.uid != getuid()) return;
+ packets.push_back(pkt);
+ }
});
ASSERT_TRUE(handler.Start(kNeverPoll));
diff --git a/service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTraceHandler.h b/service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTraceHandler.h
index 1266237..80871c6 100644
--- a/service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTraceHandler.h
+++ b/service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTraceHandler.h
@@ -30,10 +30,39 @@
namespace android {
namespace bpf {
+// BundleKeys are PacketTraces where timestamp and length are ignored.
+using BundleKey = PacketTrace;
+
+// BundleKeys are hashed using all fields except timestamp/length.
+struct BundleHash {
+ std::size_t operator()(const BundleKey& a) const;
+};
+
+// BundleKeys are equal if all fields except timestamp/length are equal.
+struct BundleEq {
+ bool operator()(const BundleKey& a, const BundleKey& b) const;
+};
+
+// Track the bundles we've interned and their corresponding intern id (iid). We
+// use IncrementalState (rather than state in the Handler) so that we stay in
+// sync with Perfetto's periodic state clearing (which helps recover from packet
+// loss). When state is cleared, the state object is replaced with a new default
+// constructed instance.
+struct NetworkTraceState {
+ bool cleared;
+ std::unordered_map<BundleKey, uint64_t, BundleHash, BundleEq> iids;
+};
+
+// Inject our custom incremental state type using type traits.
+struct NetworkTraceTraits : public perfetto::DefaultDataSourceTraits {
+ using IncrementalStateType = NetworkTraceState;
+};
+
// NetworkTraceHandler implements the android.network_packets data source. This
// class is registered with Perfetto and is instantiated when tracing starts and
// destroyed when tracing ends. There is one instance per trace session.
-class NetworkTraceHandler : public perfetto::DataSource<NetworkTraceHandler> {
+class NetworkTraceHandler
+ : public perfetto::DataSource<NetworkTraceHandler, NetworkTraceTraits> {
public:
// Registers this DataSource.
static void RegisterDataSource();
@@ -46,14 +75,31 @@
void OnStart(const StartArgs&) override;
void OnStop(const StopArgs&) override;
+ // Writes the packets as Perfetto TracePackets, creating packets as needed
+ // using the provided callback (which allows easy testing).
+ void Write(const std::vector<PacketTrace>& packets,
+ NetworkTraceHandler::TraceContext& ctx);
+
private:
// Convert a PacketTrace into a Perfetto trace packet.
- static void Fill(const PacketTrace& src,
- ::perfetto::protos::pbzero::TracePacket& dst);
+ void Fill(const PacketTrace& src,
+ ::perfetto::protos::pbzero::NetworkPacketEvent* event);
+
+ // Fills in contextual information either inline or via interning.
+ ::perfetto::protos::pbzero::NetworkPacketBundle* FillWithInterning(
+ NetworkTraceState* state, const BundleKey& key,
+ ::perfetto::protos::pbzero::TracePacket* dst);
static internal::NetworkTracePoller sPoller;
- uint32_t mPollMs;
bool mStarted;
+
+ // Values from config, see proto for details.
+ uint32_t mPollMs;
+ uint32_t mInternLimit;
+ uint32_t mAggregationThreshold;
+ bool mDropLocalPort;
+ bool mDropRemotePort;
+ bool mDropTcpFlags;
};
} // namespace bpf
diff --git a/service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTracePoller.h b/service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTracePoller.h
index b0189a7..adde51e 100644
--- a/service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTracePoller.h
+++ b/service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTracePoller.h
@@ -38,9 +38,10 @@
// it is not meant to be used elsewhere.
class NetworkTracePoller {
public:
+ using EventSink = std::function<void(const std::vector<PacketTrace>&)>;
+
// Testonly: initialize with a callback capable of intercepting data.
- NetworkTracePoller(std::function<void(const PacketTrace&)> callback)
- : mCallback(std::move(callback)) {}
+ NetworkTracePoller(EventSink callback) : mCallback(std::move(callback)) {}
// Starts tracing with the given poll interval.
bool Start(uint32_t pollMs) EXCLUDES(mMutex);
@@ -67,7 +68,7 @@
uint32_t mPollMs GUARDED_BY(mMutex);
// The function to process PacketTrace, typically a Perfetto sink.
- std::function<void(const PacketTrace&)> mCallback GUARDED_BY(mMutex);
+ EventSink mCallback GUARDED_BY(mMutex);
// The BPF ring buffer handle.
std::unique_ptr<BpfRingbuf<PacketTrace>> mRingBuffer GUARDED_BY(mMutex);
diff --git a/service-t/src/com/android/server/NsdService.java b/service-t/src/com/android/server/NsdService.java
index c92e9a9..cbe6691 100644
--- a/service-t/src/com/android/server/NsdService.java
+++ b/service-t/src/com/android/server/NsdService.java
@@ -53,7 +53,6 @@
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
-import android.util.Pair;
import android.util.SparseArray;
import com.android.internal.annotations.VisibleForTesting;
@@ -397,13 +396,12 @@
final int clientId = msg.arg2;
switch (msg.what) {
case NsdManager.REGISTER_CLIENT:
- final Pair<NsdServiceConnector, INsdManagerCallback> arg =
- (Pair<NsdServiceConnector, INsdManagerCallback>) msg.obj;
- final INsdManagerCallback cb = arg.second;
+ final ConnectorArgs arg = (ConnectorArgs) msg.obj;
+ final INsdManagerCallback cb = arg.callback;
try {
- cb.asBinder().linkToDeath(arg.first, 0);
- cInfo = new ClientInfo(cb);
- mClients.put(arg.first, cInfo);
+ cb.asBinder().linkToDeath(arg.connector, 0);
+ cInfo = new ClientInfo(cb, arg.useJavaBackend);
+ mClients.put(arg.connector, cInfo);
} catch (RemoteException e) {
Log.w(TAG, "Client " + clientId + " has already died");
}
@@ -608,7 +606,8 @@
final NsdServiceInfo info = args.serviceInfo;
id = getUniqueId();
final String serviceType = constructServiceType(info.getServiceType());
- if (mDeps.isMdnsDiscoveryManagerEnabled(mContext)
+ if (clientInfo.mUseJavaBackend
+ || mDeps.isMdnsDiscoveryManagerEnabled(mContext)
|| useDiscoveryManagerForType(serviceType)) {
if (serviceType == null) {
clientInfo.onDiscoverServicesFailed(clientId,
@@ -702,7 +701,8 @@
final NsdServiceInfo serviceInfo = args.serviceInfo;
final String serviceType = serviceInfo.getServiceType();
final String registerServiceType = constructServiceType(serviceType);
- if (mDeps.isMdnsAdvertiserEnabled(mContext)
+ if (clientInfo.mUseJavaBackend
+ || mDeps.isMdnsAdvertiserEnabled(mContext)
|| useAdvertiserForType(registerServiceType)) {
if (registerServiceType == null) {
Log.e(TAG, "Invalid service type: " + serviceType);
@@ -782,7 +782,8 @@
final NsdServiceInfo info = args.serviceInfo;
id = getUniqueId();
final String serviceType = constructServiceType(info.getServiceType());
- if (mDeps.isMdnsDiscoveryManagerEnabled(mContext)
+ if (clientInfo.mUseJavaBackend
+ || mDeps.isMdnsDiscoveryManagerEnabled(mContext)
|| useDiscoveryManagerForType(serviceType)) {
if (serviceType == null) {
clientInfo.onResolveServiceFailed(clientId,
@@ -1532,12 +1533,27 @@
}
}
+ private static class ConnectorArgs {
+ @NonNull public final NsdServiceConnector connector;
+ @NonNull public final INsdManagerCallback callback;
+ public final boolean useJavaBackend;
+
+ ConnectorArgs(@NonNull NsdServiceConnector connector, @NonNull INsdManagerCallback callback,
+ boolean useJavaBackend) {
+ this.connector = connector;
+ this.callback = callback;
+ this.useJavaBackend = useJavaBackend;
+ }
+ }
+
@Override
- public INsdServiceConnector connect(INsdManagerCallback cb) {
+ public INsdServiceConnector connect(INsdManagerCallback cb, boolean useJavaBackend) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.INTERNET, "NsdService");
+ if (DBG) Log.d(TAG, "New client connect. useJavaBackend=" + useJavaBackend);
final INsdServiceConnector connector = new NsdServiceConnector();
mNsdStateMachine.sendMessage(mNsdStateMachine.obtainMessage(
- NsdManager.REGISTER_CLIENT, new Pair<>(connector, cb)));
+ NsdManager.REGISTER_CLIENT,
+ new ConnectorArgs((NsdServiceConnector) connector, cb, useJavaBackend)));
return connector;
}
@@ -1793,9 +1809,12 @@
// The target SDK of this client < Build.VERSION_CODES.S
private boolean mIsPreSClient = false;
+ // The flag of using java backend if the client's target SDK >= U
+ private final boolean mUseJavaBackend;
- private ClientInfo(INsdManagerCallback cb) {
+ private ClientInfo(INsdManagerCallback cb, boolean useJavaBackend) {
mCb = cb;
+ mUseJavaBackend = useJavaBackend;
if (DBG) Log.d(TAG, "New client");
}
diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsResponse.java b/service-t/src/com/android/server/connectivity/mdns/MdnsResponse.java
index be2555b..e0100f6 100644
--- a/service-t/src/com/android/server/connectivity/mdns/MdnsResponse.java
+++ b/service-t/src/com/android/server/connectivity/mdns/MdnsResponse.java
@@ -81,6 +81,21 @@
return a == null || a.getTtl() == b.getTtl();
}
+ private <T extends MdnsRecord> boolean addOrReplaceRecord(@NonNull T record,
+ @NonNull List<T> recordsList) {
+ final int existing = recordsList.indexOf(record);
+ if (existing >= 0) {
+ if (recordsAreSame(record, recordsList.get(existing))) {
+ return false;
+ }
+ final MdnsRecord existedRecord = recordsList.remove(existing);
+ records.remove(existedRecord);
+ }
+ recordsList.add(record);
+ records.add(record);
+ return true;
+ }
+
/**
* Adds a pointer record.
*
@@ -92,17 +107,7 @@
throw new IllegalArgumentException(
"Pointer records for different service names cannot be added");
}
- final int existing = pointerRecords.indexOf(pointerRecord);
- if (existing >= 0) {
- if (recordsAreSame(pointerRecord, pointerRecords.get(existing))) {
- return false;
- }
- final MdnsRecord record = pointerRecords.remove(existing);
- records.remove(record);
- }
- pointerRecords.add(pointerRecord);
- records.add(pointerRecord);
- return true;
+ return addOrReplaceRecord(pointerRecord, pointerRecords);
}
/** Gets the pointer records. */
@@ -207,17 +212,7 @@
/** Add the IPv4 address record. */
public synchronized boolean addInet4AddressRecord(
@NonNull MdnsInetAddressRecord newInet4AddressRecord) {
- final int existing = inet4AddressRecords.indexOf(newInet4AddressRecord);
- if (existing >= 0) {
- if (recordsAreSame(newInet4AddressRecord, inet4AddressRecords.get(existing))) {
- return false;
- }
- final MdnsRecord record = inet4AddressRecords.remove(existing);
- records.remove(record);
- }
- inet4AddressRecords.add(newInet4AddressRecord);
- records.add(newInet4AddressRecord);
- return true;
+ return addOrReplaceRecord(newInet4AddressRecord, inet4AddressRecords);
}
/** Gets the IPv4 address records. */
@@ -248,17 +243,7 @@
/** Sets the IPv6 address records. */
public synchronized boolean addInet6AddressRecord(
@NonNull MdnsInetAddressRecord newInet6AddressRecord) {
- final int existing = inet6AddressRecords.indexOf(newInet6AddressRecord);
- if (existing >= 0) {
- if (recordsAreSame(newInet6AddressRecord, inet6AddressRecords.get(existing))) {
- return false;
- }
- final MdnsRecord record = inet6AddressRecords.remove(existing);
- records.remove(record);
- }
- inet6AddressRecords.add(newInet6AddressRecord);
- records.add(newInet6AddressRecord);
- return true;
+ return addOrReplaceRecord(newInet6AddressRecord, inet6AddressRecords);
}
/**
diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsResponseDecoder.java b/service-t/src/com/android/server/connectivity/mdns/MdnsResponseDecoder.java
index 0151202..129db7e 100644
--- a/service-t/src/com/android/server/connectivity/mdns/MdnsResponseDecoder.java
+++ b/service-t/src/com/android/server/connectivity/mdns/MdnsResponseDecoder.java
@@ -220,9 +220,10 @@
// This bit, the cache-flush bit, tells neighboring hosts
// that this is not a shared record type. Instead of merging this new
// record additively into the cache in addition to any previous records with
- // the same name, rrtype, and rrclass, all old records with that name,
- // rrtype, and rrclass that were received more than one second ago are
- // declared invalid, and marked to expire from the cache in one second.
+ // the same name, rrtype, and rrclass.
+ // TODO: All old records with that name, rrtype, and rrclass that were
+ // received more than one second ago are declared invalid, and marked
+ // to expire from the cache in one second.
if (inetRecord.getCacheFlush()) {
response.clearInet4AddressRecords();
response.clearInet6AddressRecords();
@@ -236,9 +237,10 @@
// This bit, the cache-flush bit, tells neighboring hosts
// that this is not a shared record type. Instead of merging this new
// record additively into the cache in addition to any previous records with
- // the same name, rrtype, and rrclass, all old records with that name,
- // rrtype, and rrclass that were received more than one second ago are
- // declared invalid, and marked to expire from the cache in one second.
+ // the same name, rrtype, and rrclass.
+ // TODO: All old records with that name, rrtype, and rrclass that were
+ // received more than one second ago are declared invalid, and marked
+ // to expire from the cache in one second.
if (inetRecord.getCacheFlush()) {
response.clearInet4AddressRecords();
response.clearInet6AddressRecords();
diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index dae45f3..062d272 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -182,12 +182,19 @@
throwIOException(env, "packet socket failed", errno);
return -1;
}
- int on = 1;
+ const int on = 1;
+ // enable tpacket_auxdata cmsg delivery, which includes L2 header length
if (setsockopt(sock, SOL_PACKET, PACKET_AUXDATA, &on, sizeof(on))) {
throwIOException(env, "packet socket auxdata enablement failed", errno);
close(sock);
return -1;
}
+ // needed for virtio_net_hdr prepending, which includes checksum metadata
+ if (setsockopt(sock, SOL_PACKET, PACKET_VNET_HDR, &on, sizeof(on))) {
+ throwIOException(env, "packet socket vnet_hdr enablement failed", errno);
+ close(sock);
+ return -1;
+ }
return sock;
}
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index e969cd6..2af30dd 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -10734,6 +10734,18 @@
callback));
}
+ private boolean hasUnderlyingTestNetworks(NetworkCapabilities nc) {
+ final List<Network> underlyingNetworks = nc.getUnderlyingNetworks();
+ if (underlyingNetworks == null) return false;
+
+ for (Network network : underlyingNetworks) {
+ if (getNetworkCapabilitiesInternal(network).hasTransport(TRANSPORT_TEST)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
@Override
public void simulateDataStall(int detectionMethod, long timestampMillis,
@NonNull Network network, @NonNull PersistableBundle extras) {
@@ -10744,14 +10756,18 @@
android.Manifest.permission.MANAGE_TEST_NETWORKS,
android.Manifest.permission.NETWORK_STACK);
final NetworkCapabilities nc = getNetworkCapabilitiesInternal(network);
- if (!nc.hasTransport(TRANSPORT_TEST)) {
- throw new SecurityException("Data Stall simulation is only possible for test networks");
+ if (!nc.hasTransport(TRANSPORT_TEST) && !hasUnderlyingTestNetworks(nc)) {
+ throw new SecurityException(
+ "Data Stall simulation is only possible for test networks or networks built on"
+ + " top of test networks");
}
final NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network);
- if (nai == null || nai.creatorUid != mDeps.getCallingUid()) {
- throw new SecurityException("Data Stall simulation is only possible for network "
- + "creators");
+ if (nai == null
+ || (nai.creatorUid != mDeps.getCallingUid()
+ && nai.creatorUid != Process.SYSTEM_UID)) {
+ throw new SecurityException(
+ "Data Stall simulation is only possible for network " + "creators");
}
// Instead of passing the data stall directly to the ConnectivityDiagnostics handler, treat
diff --git a/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java b/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
index 9f9b496..6b7222a 100644
--- a/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
+++ b/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
@@ -88,7 +88,6 @@
public class AutomaticOnOffKeepaliveTracker {
private static final String TAG = "AutomaticOnOffKeepaliveTracker";
private static final int[] ADDRESS_FAMILIES = new int[] {AF_INET6, AF_INET};
- private static final String EXTRA_BINDER_TOKEN = "token";
private static final long DEFAULT_TCP_POLLING_INTERVAL_MS = 120_000L;
private static final long LOW_TCP_POLLING_INTERVAL_MS = 1_000L;
private static final String AUTOMATIC_ON_OFF_KEEPALIVE_VERSION =
diff --git a/tests/common/java/android/net/NetworkProviderTest.kt b/tests/common/java/android/net/NetworkProviderTest.kt
index c0e7f61..fcbb0dd 100644
--- a/tests/common/java/android/net/NetworkProviderTest.kt
+++ b/tests/common/java/android/net/NetworkProviderTest.kt
@@ -79,6 +79,7 @@
@After
fun tearDown() {
mHandlerThread.quitSafely()
+ mHandlerThread.join()
instrumentation.getUiAutomation().dropShellPermissionIdentity()
}
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyVpnService.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyVpnService.java
index 449454e..fe522a0 100644
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyVpnService.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyVpnService.java
@@ -32,6 +32,7 @@
import com.android.networkstack.apishim.VpnServiceBuilderShimImpl;
import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
import com.android.networkstack.apishim.common.VpnServiceBuilderShim;
+import com.android.testutils.PacketReflector;
import java.io.IOException;
import java.net.InetAddress;
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/PacketReflector.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/PacketReflector.java
deleted file mode 100644
index 124c2c3..0000000
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/PacketReflector.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.cts.net.hostside;
-
-import static android.system.OsConstants.ICMP6_ECHO_REPLY;
-import static android.system.OsConstants.ICMP6_ECHO_REQUEST;
-import static android.system.OsConstants.ICMP_ECHO;
-import static android.system.OsConstants.ICMP_ECHOREPLY;
-
-import android.system.ErrnoException;
-import android.system.Os;
-import android.util.Log;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-public class PacketReflector extends Thread {
-
- private static int IPV4_HEADER_LENGTH = 20;
- private static int IPV6_HEADER_LENGTH = 40;
-
- private static int IPV4_ADDR_OFFSET = 12;
- private static int IPV6_ADDR_OFFSET = 8;
- private static int IPV4_ADDR_LENGTH = 4;
- private static int IPV6_ADDR_LENGTH = 16;
-
- private static int IPV4_PROTO_OFFSET = 9;
- private static int IPV6_PROTO_OFFSET = 6;
-
- private static final byte IPPROTO_ICMP = 1;
- private static final byte IPPROTO_TCP = 6;
- private static final byte IPPROTO_UDP = 17;
- private static final byte IPPROTO_ICMPV6 = 58;
-
- private static int ICMP_HEADER_LENGTH = 8;
- private static int TCP_HEADER_LENGTH = 20;
- private static int UDP_HEADER_LENGTH = 8;
-
- private static final byte ICMP_ECHO = 8;
- private static final byte ICMP_ECHOREPLY = 0;
-
- private static String TAG = "PacketReflector";
-
- private FileDescriptor mFd;
- private byte[] mBuf;
-
- public PacketReflector(FileDescriptor fd, int mtu) {
- super("PacketReflector");
- mFd = fd;
- mBuf = new byte[mtu];
- }
-
- private static void swapBytes(byte[] buf, int pos1, int pos2, int len) {
- for (int i = 0; i < len; i++) {
- byte b = buf[pos1 + i];
- buf[pos1 + i] = buf[pos2 + i];
- buf[pos2 + i] = b;
- }
- }
-
- private static void swapAddresses(byte[] buf, int version) {
- int addrPos, addrLen;
- switch(version) {
- case 4:
- addrPos = IPV4_ADDR_OFFSET;
- addrLen = IPV4_ADDR_LENGTH;
- break;
- case 6:
- addrPos = IPV6_ADDR_OFFSET;
- addrLen = IPV6_ADDR_LENGTH;
- break;
- default:
- throw new IllegalArgumentException();
- }
- swapBytes(buf, addrPos, addrPos + addrLen, addrLen);
- }
-
- // Reflect TCP packets: swap the source and destination addresses, but don't change the ports.
- // This is used by the test to "connect to itself" through the VPN.
- private void processTcpPacket(byte[] buf, int version, int len, int hdrLen) {
- if (len < hdrLen + TCP_HEADER_LENGTH) {
- return;
- }
-
- // Swap src and dst IP addresses.
- swapAddresses(buf, version);
-
- // Send the packet back.
- writePacket(buf, len);
- }
-
- // Echo UDP packets: swap source and destination addresses, and source and destination ports.
- // This is used by the test to check that the bytes it sends are echoed back.
- private void processUdpPacket(byte[] buf, int version, int len, int hdrLen) {
- if (len < hdrLen + UDP_HEADER_LENGTH) {
- return;
- }
-
- // Swap src and dst IP addresses.
- swapAddresses(buf, version);
-
- // Swap dst and src ports.
- int portOffset = hdrLen;
- swapBytes(buf, portOffset, portOffset + 2, 2);
-
- // Send the packet back.
- writePacket(buf, len);
- }
-
- private void processIcmpPacket(byte[] buf, int version, int len, int hdrLen) {
- if (len < hdrLen + ICMP_HEADER_LENGTH) {
- return;
- }
-
- byte type = buf[hdrLen];
- if (!(version == 4 && type == ICMP_ECHO) &&
- !(version == 6 && type == (byte) ICMP6_ECHO_REQUEST)) {
- return;
- }
-
- // Save the ping packet we received.
- byte[] request = buf.clone();
-
- // Swap src and dst IP addresses, and send the packet back.
- // This effectively pings the device to see if it replies.
- swapAddresses(buf, version);
- writePacket(buf, len);
-
- // The device should have replied, and buf should now contain a ping response.
- int received = readPacket(buf);
- if (received != len) {
- Log.i(TAG, "Reflecting ping did not result in ping response: " +
- "read=" + received + " expected=" + len);
- return;
- }
-
- byte replyType = buf[hdrLen];
- if ((type == ICMP_ECHO && replyType != ICMP_ECHOREPLY)
- || (type == (byte) ICMP6_ECHO_REQUEST && replyType != (byte) ICMP6_ECHO_REPLY)) {
- Log.i(TAG, "Received unexpected ICMP reply: original " + type
- + ", reply " + replyType);
- return;
- }
-
- // Compare the response we got with the original packet.
- // The only thing that should have changed are addresses, type and checksum.
- // Overwrite them with the received bytes and see if the packet is otherwise identical.
- request[hdrLen] = buf[hdrLen]; // Type
- request[hdrLen + 2] = buf[hdrLen + 2]; // Checksum byte 1.
- request[hdrLen + 3] = buf[hdrLen + 3]; // Checksum byte 2.
-
- // Since Linux kernel 4.2, net.ipv6.auto_flowlabels is set by default, and therefore
- // the request and reply may have different IPv6 flow label: ignore that as well.
- if (version == 6) {
- request[1] = (byte)(request[1] & 0xf0 | buf[1] & 0x0f);
- request[2] = buf[2];
- request[3] = buf[3];
- }
-
- for (int i = 0; i < len; i++) {
- if (buf[i] != request[i]) {
- Log.i(TAG, "Received non-matching packet when expecting ping response.");
- return;
- }
- }
-
- // Now swap the addresses again and reflect the packet. This sends a ping reply.
- swapAddresses(buf, version);
- writePacket(buf, len);
- }
-
- private void writePacket(byte[] buf, int len) {
- try {
- Os.write(mFd, buf, 0, len);
- } catch (ErrnoException|IOException e) {
- Log.e(TAG, "Error writing packet: " + e.getMessage());
- }
- }
-
- private int readPacket(byte[] buf) {
- int len;
- try {
- len = Os.read(mFd, buf, 0, buf.length);
- } catch (ErrnoException|IOException e) {
- Log.e(TAG, "Error reading packet: " + e.getMessage());
- len = -1;
- }
- return len;
- }
-
- // Reads one packet from our mFd, and possibly writes the packet back.
- private void processPacket() {
- int len = readPacket(mBuf);
- if (len < 1) {
- return;
- }
-
- int version = mBuf[0] >> 4;
- int addrPos, protoPos, hdrLen, addrLen;
- if (version == 4) {
- hdrLen = IPV4_HEADER_LENGTH;
- protoPos = IPV4_PROTO_OFFSET;
- addrPos = IPV4_ADDR_OFFSET;
- addrLen = IPV4_ADDR_LENGTH;
- } else if (version == 6) {
- hdrLen = IPV6_HEADER_LENGTH;
- protoPos = IPV6_PROTO_OFFSET;
- addrPos = IPV6_ADDR_OFFSET;
- addrLen = IPV6_ADDR_LENGTH;
- } else {
- return;
- }
-
- if (len < hdrLen) {
- return;
- }
-
- byte proto = mBuf[protoPos];
- switch (proto) {
- case IPPROTO_ICMP:
- case IPPROTO_ICMPV6:
- processIcmpPacket(mBuf, version, len, hdrLen);
- break;
- case IPPROTO_TCP:
- processTcpPacket(mBuf, version, len, hdrLen);
- break;
- case IPPROTO_UDP:
- processUdpPacket(mBuf, version, len, hdrLen);
- break;
- }
- }
-
- public void run() {
- Log.i(TAG, "PacketReflector starting fd=" + mFd + " valid=" + mFd.valid());
- while (!interrupted() && mFd.valid()) {
- processPacket();
- }
- Log.i(TAG, "PacketReflector exiting fd=" + mFd + " valid=" + mFd.valid());
- }
-}
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 1bed83d..774176f 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2708,6 +2708,7 @@
// Cannot use @IgnoreUpTo(Build.VERSION_CODES.R) because this test also requires API 31
// shims, and @IgnoreUpTo does not check that.
assumeTrue(TestUtils.shouldTestSApis());
+ assumeTrue(mPackageManager.hasSystemFeature(FEATURE_WIFI));
final TestNetworkTracker tnt = callWithShellPermissionIdentity(
() -> initTestNetwork(mContext, TEST_LINKADDR, NETWORK_CALLBACK_TIMEOUT_MS));
@@ -2721,7 +2722,8 @@
OemNetworkPreferences.OEM_NETWORK_PREFERENCE_TEST_ONLY);
registerTestOemNetworkPreferenceCallbacks(defaultCallback, systemDefaultCallback);
waitForAvailable(defaultCallback, tnt.getNetwork());
- waitForAvailable(systemDefaultCallback, wifiNetwork);
+ systemDefaultCallback.eventuallyExpect(CallbackEntry.AVAILABLE,
+ NETWORK_CALLBACK_TIMEOUT_MS, cb -> wifiNetwork.equals(cb.getNetwork()));
}, /* cleanup */ () -> {
runWithShellPermissionIdentity(tnt::teardown);
defaultCallback.expect(CallbackEntry.LOST, tnt, NETWORK_CALLBACK_TIMEOUT_MS);
diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
index f578ff3..b535a8f 100644
--- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
+++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
@@ -191,6 +191,7 @@
callbacksToCleanUp.forEach { mCM.unregisterNetworkCallback(it) }
qosTestSocket?.close()
mHandlerThread.quitSafely()
+ mHandlerThread.join()
instrumentation.getUiAutomation().dropShellPermissionIdentity()
}
diff --git a/tests/cts/net/src/android/net/cts/NetworkScoreTest.kt b/tests/cts/net/src/android/net/cts/NetworkScoreTest.kt
index eb41d71..fcfecad 100644
--- a/tests/cts/net/src/android/net/cts/NetworkScoreTest.kt
+++ b/tests/cts/net/src/android/net/cts/NetworkScoreTest.kt
@@ -90,6 +90,7 @@
mCm.unregisterNetworkCallback(agentCleanUpCb)
mHandlerThread.quitSafely()
+ mHandlerThread.join()
callbacksToCleanUp.forEach { mCm.unregisterNetworkCallback(it) }
}
diff --git a/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt b/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt
index 8e98dba..621af23 100644
--- a/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt
+++ b/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt
@@ -146,6 +146,7 @@
httpServer.stop()
handlerThread.threadHandler.post { reader.stop() }
handlerThread.quitSafely()
+ handlerThread.join()
iface.fileDescriptor.close()
}
diff --git a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
index 6fd2321..db4f937 100644
--- a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
@@ -432,6 +432,7 @@
}
handlerThread.waitForIdle(TIMEOUT_MS)
handlerThread.quitSafely()
+ handlerThread.join()
}
@Test
diff --git a/tests/unit/java/android/net/nsd/NsdManagerTest.java b/tests/unit/java/android/net/nsd/NsdManagerTest.java
index da65b62..0965193 100644
--- a/tests/unit/java/android/net/nsd/NsdManagerTest.java
+++ b/tests/unit/java/android/net/nsd/NsdManagerTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -73,11 +74,11 @@
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- doReturn(mServiceConn).when(mService).connect(any());
+ doReturn(mServiceConn).when(mService).connect(any(), anyBoolean());
mManager = new NsdManager(mContext, mService);
final ArgumentCaptor<INsdManagerCallback> cbCaptor = ArgumentCaptor.forClass(
INsdManagerCallback.class);
- verify(mService).connect(cbCaptor.capture());
+ verify(mService).connect(cbCaptor.capture(), anyBoolean());
mCallback = cbCaptor.getValue();
}
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index c1c6a8a..6c89c38 100755
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -2219,7 +2219,9 @@
ConnectivityResources.setResourcesContextForTest(null);
mCsHandlerThread.quitSafely();
+ mCsHandlerThread.join();
mAlarmManagerThread.quitSafely();
+ mAlarmManagerThread.join();
}
private void mockDefaultPackages() throws Exception {
@@ -10126,6 +10128,7 @@
b2.expectBroadcast();
VMSHandlerThread.quitSafely();
+ VMSHandlerThread.join();
}
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
@@ -16974,6 +16977,7 @@
} finally {
cellFactory.terminate();
handlerThread.quitSafely();
+ handlerThread.join();
}
}
diff --git a/tests/unit/java/com/android/server/NsdServiceTest.java b/tests/unit/java/com/android/server/NsdServiceTest.java
index 0b48e08..2ed989e 100644
--- a/tests/unit/java/com/android/server/NsdServiceTest.java
+++ b/tests/unit/java/com/android/server/NsdServiceTest.java
@@ -17,6 +17,8 @@
package com.android.server;
import static android.net.InetAddresses.parseNumericAddress;
+import static android.net.connectivity.ConnectivityCompatChanges.ENABLE_PLATFORM_MDNS_BACKEND;
+import static android.net.connectivity.ConnectivityCompatChanges.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER;
import static android.net.nsd.NsdManager.FAILURE_BAD_PARAMETERS;
import static android.net.nsd.NsdManager.FAILURE_INTERNAL_ERROR;
import static android.net.nsd.NsdManager.FAILURE_OPERATION_NOT_RUNNING;
@@ -54,7 +56,6 @@
import android.content.Context;
import android.net.INetd;
import android.net.Network;
-import android.net.connectivity.ConnectivityCompatChanges;
import android.net.mdns.aidl.DiscoveryInfo;
import android.net.mdns.aidl.GetAddressInfo;
import android.net.mdns.aidl.IMDnsEventListener;
@@ -190,7 +191,9 @@
}
@Test
- @DisableCompatChanges(ConnectivityCompatChanges.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
+ @DisableCompatChanges({
+ RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER,
+ ENABLE_PLATFORM_MDNS_BACKEND})
public void testPreSClients() throws Exception {
// Pre S client connected, the daemon should be started.
connectClient(mService);
@@ -217,7 +220,8 @@
}
@Test
- @EnableCompatChanges(ConnectivityCompatChanges.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
+ @EnableCompatChanges(RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testNoDaemonStartedWhenClientsConnect() throws Exception {
// Creating an NsdManager will not cause daemon startup.
connectClient(mService);
@@ -251,7 +255,8 @@
}
@Test
- @EnableCompatChanges(ConnectivityCompatChanges.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
+ @EnableCompatChanges(RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testClientRequestsAreGCedAtDisconnection() throws Exception {
final NsdManager client = connectClient(mService);
final INsdManagerCallback cb1 = getCallback();
@@ -294,7 +299,8 @@
}
@Test
- @EnableCompatChanges(ConnectivityCompatChanges.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
+ @EnableCompatChanges(RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER)
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testCleanupDelayNoRequestActive() throws Exception {
final NsdManager client = connectClient(mService);
@@ -330,6 +336,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testDiscoverOnTetheringDownstream() throws Exception {
final NsdManager client = connectClient(mService);
final int interfaceIdx = 123;
@@ -420,6 +427,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testDiscoverOnBlackholeNetwork() throws Exception {
final NsdManager client = connectClient(mService);
final DiscoveryListener discListener = mock(DiscoveryListener.class);
@@ -449,6 +457,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testServiceRegistrationSuccessfulAndFailed() throws Exception {
final NsdManager client = connectClient(mService);
final NsdServiceInfo request = new NsdServiceInfo(SERVICE_NAME, SERVICE_TYPE);
@@ -495,6 +504,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testServiceDiscoveryFailed() throws Exception {
final NsdManager client = connectClient(mService);
final DiscoveryListener discListener = mock(DiscoveryListener.class);
@@ -521,6 +531,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testServiceResolutionFailed() throws Exception {
final NsdManager client = connectClient(mService);
final NsdServiceInfo request = new NsdServiceInfo(SERVICE_NAME, SERVICE_TYPE);
@@ -551,6 +562,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testGettingAddressFailed() throws Exception {
final NsdManager client = connectClient(mService);
final NsdServiceInfo request = new NsdServiceInfo(SERVICE_NAME, SERVICE_TYPE);
@@ -597,6 +609,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testNoCrashWhenProcessResolutionAfterBinderDied() throws Exception {
final NsdManager client = connectClient(mService);
final INsdManagerCallback cb = getCallback();
@@ -616,6 +629,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testStopServiceResolution() {
final NsdManager client = connectClient(mService);
final NsdServiceInfo request = new NsdServiceInfo(SERVICE_NAME, SERVICE_TYPE);
@@ -638,6 +652,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testStopResolutionFailed() {
final NsdManager client = connectClient(mService);
final NsdServiceInfo request = new NsdServiceInfo(SERVICE_NAME, SERVICE_TYPE);
@@ -662,6 +677,7 @@
}
@Test @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testStopResolutionDuringGettingAddress() throws RemoteException {
final NsdManager client = connectClient(mService);
final NsdServiceInfo request = new NsdServiceInfo(SERVICE_NAME, SERVICE_TYPE);
@@ -823,6 +839,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testMdnsDiscoveryManagerFeature() {
// Create NsdService w/o feature enabled.
final NsdManager client = connectClient(mService);
@@ -1012,6 +1029,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testMdnsAdvertiserFeatureFlagging() {
// Create NsdService w/o feature enabled.
final NsdManager client = connectClient(mService);
@@ -1047,6 +1065,7 @@
}
@Test
+ @DisableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
public void testTypeSpecificFeatureFlagging() {
doReturn("_type1._tcp:flag1,_type2._tcp:flag2").when(mDeps).getTypeAllowlistFlags();
doReturn(true).when(mDeps).isFeatureEnabled(any(),
@@ -1234,6 +1253,37 @@
assertEquals("_TEST._sub._999._tcp", constructServiceType(serviceType4));
}
+ @Test
+ @EnableCompatChanges(ENABLE_PLATFORM_MDNS_BACKEND)
+ public void testEnablePlatformMdnsBackend() {
+ final NsdManager client = connectClient(mService);
+ final NsdServiceInfo regInfo = new NsdServiceInfo("a".repeat(70), SERVICE_TYPE);
+ final Network network = new Network(999);
+ regInfo.setHostAddresses(List.of(parseNumericAddress("192.0.2.123")));
+ regInfo.setPort(12345);
+ regInfo.setAttribute("testattr", "testvalue");
+ regInfo.setNetwork(network);
+
+ // Verify the registration uses MdnsAdvertiser
+ final RegistrationListener regListener = mock(RegistrationListener.class);
+ client.registerService(regInfo, NsdManager.PROTOCOL_DNS_SD, Runnable::run, regListener);
+ waitForIdle();
+ verify(mSocketProvider).startMonitoringSockets();
+ verify(mAdvertiser).addService(anyInt(), any());
+
+ // Verify the discovery uses MdnsDiscoveryManager
+ final DiscoveryListener discListener = mock(DiscoveryListener.class);
+ client.discoverServices(SERVICE_TYPE, PROTOCOL, network, r -> r.run(), discListener);
+ waitForIdle();
+ verify(mDiscoveryManager).registerListener(anyString(), any(), any());
+
+ // Verify the discovery uses MdnsDiscoveryManager
+ final ResolveListener resolveListener = mock(ResolveListener.class);
+ client.resolveService(regInfo, r -> r.run(), resolveListener);
+ waitForIdle();
+ verify(mDiscoveryManager, times(2)).registerListener(anyString(), any(), any());
+ }
+
private void waitForIdle() {
HandlerUtils.waitForIdle(mHandler, TIMEOUT_MS);
}
@@ -1241,7 +1291,8 @@
NsdService makeService() {
final NsdService service = new NsdService(mContext, mHandler, CLEANUP_DELAY_MS, mDeps) {
@Override
- public INsdServiceConnector connect(INsdManagerCallback baseCb) {
+ public INsdServiceConnector connect(INsdManagerCallback baseCb,
+ boolean runNewMdnsBackend) {
// Wrap the callback in a transparent mock, to mock asBinder returning a
// LinkToDeathRecorder. This will allow recording the binder death recipient
// registered on the callback. Use a transparent mock and not a spy as the actual
@@ -1250,7 +1301,7 @@
AdditionalAnswers.delegatesTo(baseCb));
doReturn(new LinkToDeathRecorder()).when(cb).asBinder();
mCreatedCallbacks.add(cb);
- return super.connect(cb);
+ return super.connect(cb, runNewMdnsBackend);
}
};
return service;
diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java
index 1f965d9..79987e6 100644
--- a/tests/unit/java/com/android/server/connectivity/VpnTest.java
+++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java
@@ -35,15 +35,24 @@
import static android.net.cts.util.IkeSessionTestUtils.getTestIkeSessionParams;
import static android.net.ipsec.ike.IkeSessionConfiguration.EXTENSION_TYPE_MOBIKE;
import static android.net.ipsec.ike.IkeSessionParams.ESP_ENCAP_TYPE_AUTO;
+import static android.net.ipsec.ike.IkeSessionParams.ESP_ENCAP_TYPE_NONE;
+import static android.net.ipsec.ike.IkeSessionParams.ESP_ENCAP_TYPE_UDP;
import static android.net.ipsec.ike.IkeSessionParams.ESP_IP_VERSION_AUTO;
+import static android.net.ipsec.ike.IkeSessionParams.ESP_IP_VERSION_IPV4;
+import static android.net.ipsec.ike.IkeSessionParams.ESP_IP_VERSION_IPV6;
import static android.os.Build.VERSION_CODES.S_V2;
import static android.os.UserHandle.PER_USER_RANGE;
import static android.telephony.CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL;
import static android.telephony.CarrierConfigManager.KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT;
+import static android.telephony.CarrierConfigManager.KEY_PREFERRED_IKE_PROTOCOL_INT;
import static com.android.net.module.util.NetworkStackConstants.IPV6_MIN_MTU;
import static com.android.server.connectivity.Vpn.AUTOMATIC_KEEPALIVE_DELAY_SECONDS;
import static com.android.server.connectivity.Vpn.DEFAULT_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT;
+import static com.android.server.connectivity.Vpn.PREFERRED_IKE_PROTOCOL_AUTO;
+import static com.android.server.connectivity.Vpn.PREFERRED_IKE_PROTOCOL_IPV4_UDP;
+import static com.android.server.connectivity.Vpn.PREFERRED_IKE_PROTOCOL_IPV6_ESP;
+import static com.android.server.connectivity.Vpn.PREFERRED_IKE_PROTOCOL_IPV6_UDP;
import static com.android.testutils.Cleanup.testAndCleanup;
import static com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import static com.android.testutils.MiscAsserts.assertThrows;
@@ -277,6 +286,7 @@
private static final int IKE_NATT_KEEPALIVE_DELAY_SEC_DEFAULT = 10;
private static final int TEST_KEEPALIVE_TIMER = 800;
private static final int TEST_SUB_ID = 1234;
+ private static final String TEST_MCCMNC = "12345";
@Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mContext;
@Mock private UserManager mUserManager;
@@ -1945,43 +1955,54 @@
}
@Test
- public void testMigrateIkeSession_FromIkeTunnConnParams_AutoTimerNoTimer()
- throws Exception {
+ public void testMigrateIkeSession_FromIkeTunnConnParams_AutoTimerNoTimer() throws Exception {
doTestMigrateIkeSession_FromIkeTunnConnParams(
false /* isAutomaticIpVersionSelectionEnabled */,
true /* isAutomaticNattKeepaliveTimerEnabled */,
- TEST_KEEPALIVE_TIMEOUT_UNSET);
+ TEST_KEEPALIVE_TIMEOUT_UNSET /* keepaliveInProfile */,
+ ESP_IP_VERSION_AUTO /* ipVersionInProfile */,
+ ESP_ENCAP_TYPE_AUTO /* encapTypeInProfile */);
}
@Test
- public void testMigrateIkeSession_FromIkeTunnConnParams_AutoTimerTimerSet()
- throws Exception {
+ public void testMigrateIkeSession_FromIkeTunnConnParams_AutoTimerTimerSet() throws Exception {
doTestMigrateIkeSession_FromIkeTunnConnParams(
false /* isAutomaticIpVersionSelectionEnabled */,
true /* isAutomaticNattKeepaliveTimerEnabled */,
- TEST_KEEPALIVE_TIMER);
+ TEST_KEEPALIVE_TIMER /* keepaliveInProfile */,
+ ESP_IP_VERSION_AUTO /* ipVersionInProfile */,
+ ESP_ENCAP_TYPE_AUTO /* encapTypeInProfile */);
}
@Test
- public void testMigrateIkeSession_FromIkeTunnConnParams_AutoIp()
- throws Exception {
+ public void testMigrateIkeSession_FromIkeTunnConnParams_AutoIp() throws Exception {
doTestMigrateIkeSession_FromIkeTunnConnParams(
true /* isAutomaticIpVersionSelectionEnabled */,
false /* isAutomaticNattKeepaliveTimerEnabled */,
- TEST_KEEPALIVE_TIMEOUT_UNSET);
+ TEST_KEEPALIVE_TIMEOUT_UNSET /* keepaliveInProfile */,
+ ESP_IP_VERSION_AUTO /* ipVersionInProfile */,
+ ESP_ENCAP_TYPE_AUTO /* encapTypeInProfile */);
}
@Test
- public void testMigrateIkeSession_FromNotIkeTunnConnParams_AutoTimer()
- throws Exception {
+ public void testMigrateIkeSession_FromIkeTunnConnParams_AssignedIpProtocol() throws Exception {
+ doTestMigrateIkeSession_FromIkeTunnConnParams(
+ false /* isAutomaticIpVersionSelectionEnabled */,
+ false /* isAutomaticNattKeepaliveTimerEnabled */,
+ TEST_KEEPALIVE_TIMEOUT_UNSET /* keepaliveInProfile */,
+ ESP_IP_VERSION_IPV4 /* ipVersionInProfile */,
+ ESP_ENCAP_TYPE_UDP /* encapTypeInProfile */);
+ }
+
+ @Test
+ public void testMigrateIkeSession_FromNotIkeTunnConnParams_AutoTimer() throws Exception {
doTestMigrateIkeSession_FromNotIkeTunnConnParams(
false /* isAutomaticIpVersionSelectionEnabled */,
true /* isAutomaticNattKeepaliveTimerEnabled */);
}
@Test
- public void testMigrateIkeSession_FromNotIkeTunnConnParams_AutoIp()
- throws Exception {
+ public void testMigrateIkeSession_FromNotIkeTunnConnParams_AutoIp() throws Exception {
doTestMigrateIkeSession_FromNotIkeTunnConnParams(
true /* isAutomaticIpVersionSelectionEnabled */,
false /* isAutomaticNattKeepaliveTimerEnabled */);
@@ -2001,16 +2022,27 @@
final int expectedKeepalive = isAutomaticNattKeepaliveTimerEnabled
? AUTOMATIC_KEEPALIVE_DELAY_SECONDS
: DEFAULT_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT;
- doTestMigrateIkeSession(ikeProfile.toVpnProfile(), expectedKeepalive,
- isAutomaticIpVersionSelectionEnabled);
+ doTestMigrateIkeSession(ikeProfile.toVpnProfile(),
+ expectedKeepalive,
+ ESP_IP_VERSION_AUTO /* expectedIpVersion */,
+ ESP_ENCAP_TYPE_AUTO /* expectedEncapType */);
}
private void doTestMigrateIkeSession_FromIkeTunnConnParams(
boolean isAutomaticIpVersionSelectionEnabled,
boolean isAutomaticNattKeepaliveTimerEnabled,
- int keepaliveInProfile) throws Exception {
- final IkeSessionParams ikeSessionParams = getTestIkeSessionParams(true /* testIpv6 */,
+ int keepaliveInProfile,
+ int ipVersionInProfile,
+ int encapTypeInProfile) throws Exception {
+ // TODO: Update helper function in IkeSessionTestUtils to support building IkeSessionParams
+ // with IP version and encap type when mainline-prod branch support these two APIs.
+ final IkeSessionParams params = getTestIkeSessionParams(true /* testIpv6 */,
new IkeFqdnIdentification(TEST_IDENTITY), keepaliveInProfile);
+ final IkeSessionParams ikeSessionParams = new IkeSessionParams.Builder(params)
+ .setIpVersion(ipVersionInProfile)
+ .setEncapType(encapTypeInProfile)
+ .build();
+
final IkeTunnelConnectionParams tunnelParams =
new IkeTunnelConnectionParams(ikeSessionParams, CHILD_PARAMS);
final Ikev2VpnProfile ikeProfile = new Ikev2VpnProfile.Builder(tunnelParams)
@@ -2022,17 +2054,18 @@
final int expectedKeepalive = isAutomaticNattKeepaliveTimerEnabled
? AUTOMATIC_KEEPALIVE_DELAY_SECONDS
: ikeSessionParams.getNattKeepAliveDelaySeconds();
+ final int expectedIpVersion = isAutomaticIpVersionSelectionEnabled
+ ? ESP_IP_VERSION_AUTO
+ : ikeSessionParams.getIpVersion();
+ final int expectedEncapType = isAutomaticIpVersionSelectionEnabled
+ ? ESP_ENCAP_TYPE_AUTO
+ : ikeSessionParams.getEncapType();
doTestMigrateIkeSession(ikeProfile.toVpnProfile(), expectedKeepalive,
- isAutomaticIpVersionSelectionEnabled);
+ expectedIpVersion, expectedEncapType);
}
- private void doTestMigrateIkeSession(VpnProfile profile, int expectedKeepalive,
- boolean isAutomaticIpVersionSelectionEnabled) throws Exception {
- final int expectedIpVersion = isAutomaticIpVersionSelectionEnabled
- ? ESP_IP_VERSION_AUTO : ESP_IP_VERSION_AUTO;
- final int expectedEncapType = isAutomaticIpVersionSelectionEnabled
- ? ESP_ENCAP_TYPE_AUTO : ESP_IP_VERSION_AUTO;
-
+ private void doTestMigrateIkeSession(VpnProfile profile,
+ int expectedKeepalive, int expectedIpVersion, int expectedEncapType) throws Exception {
final PlatformVpnSnapshot vpnSnapShot =
verifySetupPlatformVpn(profile,
createIkeConfig(createIkeConnectInfo(), true /* isMobikeEnabled */),
@@ -2050,16 +2083,18 @@
vpnSnapShot.vpn.mVpnRunner.exitVpnRunner();
}
- private void mockCarrierConfig(int subId, int keepaliveTimer, int simStatus) {
+ private void mockCarrierConfig(int subId, int simStatus, int keepaliveTimer, int ikeProtocol) {
final SubscriptionInfo subscriptionInfo = mock(SubscriptionInfo.class);
doReturn(subId).when(subscriptionInfo).getSubscriptionId();
doReturn(List.of(subscriptionInfo)).when(mSubscriptionManager)
.getActiveSubscriptionInfoList();
doReturn(simStatus).when(mTmPerSub).getSimApplicationState();
+ doReturn(TEST_MCCMNC).when(mTmPerSub).getSimOperator(subId);
final PersistableBundle persistableBundle = new PersistableBundle();
persistableBundle.putInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT, keepaliveTimer);
+ persistableBundle.putInt(KEY_PREFERRED_IKE_PROTOCOL_INT, ikeProtocol);
// For CarrierConfigManager.isConfigForIdentifiedCarrier check
persistableBundle.putBoolean(KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
doReturn(persistableBundle).when(mConfigManager).getConfigForSubId(subId);
@@ -2076,26 +2111,32 @@
@Test
public void testNattKeepaliveTimerFromCarrierConfig_noSubId() throws Exception {
- doTestNattKeepaliveTimerFromCarrierConfig(new NetworkCapabilities(),
- TelephonyManager.SIM_STATE_LOADED, AUTOMATIC_KEEPALIVE_DELAY_SECONDS);
+ doTestReadCarrierConfig(new NetworkCapabilities(),
+ TelephonyManager.SIM_STATE_LOADED,
+ PREFERRED_IKE_PROTOCOL_IPV4_UDP,
+ AUTOMATIC_KEEPALIVE_DELAY_SECONDS /* expectedKeepaliveTimer */,
+ ESP_IP_VERSION_AUTO /* expectedIpVersion */,
+ ESP_ENCAP_TYPE_AUTO /* expectedEncapType */);
}
@Test
public void testNattKeepaliveTimerFromCarrierConfig_simAbsent() throws Exception {
- doTestNattKeepaliveTimerFromCarrierConfig(new NetworkCapabilities.Builder().build(),
- TelephonyManager.SIM_STATE_ABSENT, AUTOMATIC_KEEPALIVE_DELAY_SECONDS);
+ doTestReadCarrierConfig(new NetworkCapabilities.Builder().build(),
+ TelephonyManager.SIM_STATE_ABSENT,
+ PREFERRED_IKE_PROTOCOL_IPV4_UDP,
+ AUTOMATIC_KEEPALIVE_DELAY_SECONDS /* expectedKeepaliveTimer */,
+ ESP_IP_VERSION_AUTO /* expectedIpVersion */,
+ ESP_ENCAP_TYPE_AUTO /* expectedEncapType */);
}
@Test
public void testNattKeepaliveTimerFromCarrierConfig() throws Exception {
- final NetworkCapabilities nc = new NetworkCapabilities.Builder()
- .addTransportType(TRANSPORT_CELLULAR)
- .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()
- .setSubscriptionId(TEST_SUB_ID)
- .build())
- .build();
- doTestNattKeepaliveTimerFromCarrierConfig(nc,
- TelephonyManager.SIM_STATE_LOADED, TEST_KEEPALIVE_TIMER);
+ doTestReadCarrierConfig(createTestCellNc(),
+ TelephonyManager.SIM_STATE_LOADED,
+ PREFERRED_IKE_PROTOCOL_AUTO,
+ TEST_KEEPALIVE_TIMER /* expectedKeepaliveTimer */,
+ ESP_IP_VERSION_AUTO /* expectedIpVersion */,
+ ESP_ENCAP_TYPE_AUTO /* expectedEncapType */);
}
@Test
@@ -2104,17 +2145,62 @@
.addTransportType(TRANSPORT_WIFI)
.setTransportInfo(new WifiInfo.Builder().build())
.build();
- doTestNattKeepaliveTimerFromCarrierConfig(nc,
- TelephonyManager.SIM_STATE_LOADED, AUTOMATIC_KEEPALIVE_DELAY_SECONDS);
+ doTestReadCarrierConfig(nc,
+ TelephonyManager.SIM_STATE_LOADED,
+ PREFERRED_IKE_PROTOCOL_IPV4_UDP,
+ AUTOMATIC_KEEPALIVE_DELAY_SECONDS /* expectedKeepaliveTimer */,
+ ESP_IP_VERSION_AUTO /* expectedIpVersion */,
+ ESP_ENCAP_TYPE_AUTO /* expectedEncapType */);
}
- private void doTestNattKeepaliveTimerFromCarrierConfig(NetworkCapabilities nc, int simState,
- int expectedKeepaliveTimer) throws Exception {
+ @Test
+ public void testPreferredIpProtocolFromCarrierConfig_v4UDP() throws Exception {
+ doTestReadCarrierConfig(createTestCellNc(),
+ TelephonyManager.SIM_STATE_LOADED,
+ PREFERRED_IKE_PROTOCOL_IPV4_UDP,
+ TEST_KEEPALIVE_TIMER /* expectedKeepaliveTimer */,
+ ESP_IP_VERSION_IPV4 /* expectedIpVersion */,
+ ESP_ENCAP_TYPE_UDP /* expectedEncapType */);
+ }
+
+ @Test
+ public void testPreferredIpProtocolFromCarrierConfig_v6ESP() throws Exception {
+ doTestReadCarrierConfig(createTestCellNc(),
+ TelephonyManager.SIM_STATE_LOADED,
+ PREFERRED_IKE_PROTOCOL_IPV6_ESP,
+ TEST_KEEPALIVE_TIMER /* expectedKeepaliveTimer */,
+ ESP_IP_VERSION_IPV6 /* expectedIpVersion */,
+ ESP_ENCAP_TYPE_NONE /* expectedEncapType */);
+ }
+
+ @Test
+ public void testPreferredIpProtocolFromCarrierConfig_v6UDP() throws Exception {
+ doTestReadCarrierConfig(createTestCellNc(),
+ TelephonyManager.SIM_STATE_LOADED,
+ PREFERRED_IKE_PROTOCOL_IPV6_UDP,
+ TEST_KEEPALIVE_TIMER /* expectedKeepaliveTimer */,
+ ESP_IP_VERSION_IPV6 /* expectedIpVersion */,
+ ESP_ENCAP_TYPE_UDP /* expectedEncapType */);
+ }
+
+ private NetworkCapabilities createTestCellNc() {
+ return new NetworkCapabilities.Builder()
+ .addTransportType(TRANSPORT_CELLULAR)
+ .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()
+ .setSubscriptionId(TEST_SUB_ID)
+ .build())
+ .build();
+ }
+
+ private void doTestReadCarrierConfig(NetworkCapabilities nc, int simState, int preferredIpProto,
+ int expectedKeepaliveTimer, int expectedIpVersion, int expectedEncapType)
+ throws Exception {
final Ikev2VpnProfile ikeProfile =
new Ikev2VpnProfile.Builder(TEST_VPN_SERVER, TEST_VPN_IDENTITY)
.setAuthPsk(TEST_VPN_PSK)
.setBypassable(true /* isBypassable */)
.setAutomaticNattKeepaliveTimerEnabled(true)
+ .setAutomaticIpVersionSelectionEnabled(true)
.build();
final PlatformVpnSnapshot vpnSnapShot =
@@ -2131,10 +2217,10 @@
verify(mIkeSessionWrapper, never()).setNetwork(any(), anyInt(), anyInt(), anyInt());
reset(mIkeSessionWrapper);
- mockCarrierConfig(TEST_SUB_ID, TEST_KEEPALIVE_TIMER, simState);
+ mockCarrierConfig(TEST_SUB_ID, simState, TEST_KEEPALIVE_TIMER, preferredIpProto);
vpnSnapShot.nwCb.onCapabilitiesChanged(TEST_NETWORK_2, nc);
verify(mIkeSessionWrapper).setNetwork(TEST_NETWORK_2,
- ESP_IP_VERSION_AUTO, ESP_ENCAP_TYPE_AUTO, expectedKeepaliveTimer);
+ expectedIpVersion, expectedEncapType, expectedKeepaliveTimer);
reset(mExecutor);
reset(mIkeSessionWrapper);
@@ -2143,7 +2229,7 @@
listener.onCarrierConfigChanged(1 /* logicalSlotIndex */, TEST_SUB_ID,
-1 /* carrierId */, -1 /* specificCarrierId */);
verify(mIkeSessionWrapper).setNetwork(TEST_NETWORK_2,
- ESP_IP_VERSION_AUTO, ESP_ENCAP_TYPE_AUTO, expectedKeepaliveTimer);
+ expectedIpVersion, expectedEncapType, expectedKeepaliveTimer);
}
@Test
diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsAdvertiserTest.kt b/tests/unit/java/com/android/server/connectivity/mdns/MdnsAdvertiserTest.kt
index 375c150..a917361 100644
--- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsAdvertiserTest.kt
+++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsAdvertiserTest.kt
@@ -97,6 +97,7 @@
@After
fun tearDown() {
thread.quitSafely()
+ thread.join()
}
@Test
diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsAnnouncerTest.kt b/tests/unit/java/com/android/server/connectivity/mdns/MdnsAnnouncerTest.kt
index 6c3f729..7c6cb3e 100644
--- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsAnnouncerTest.kt
+++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsAnnouncerTest.kt
@@ -63,6 +63,7 @@
@After
fun tearDown() {
thread.quitSafely()
+ thread.join()
}
private class TestAnnouncementInfo(
diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiserTest.kt b/tests/unit/java/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiserTest.kt
index 2d8d8f3..0ca0835 100644
--- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiserTest.kt
+++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiserTest.kt
@@ -136,6 +136,7 @@
@After
fun tearDown() {
thread.quitSafely()
+ thread.join()
}
@Test
diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsProberTest.kt b/tests/unit/java/com/android/server/connectivity/mdns/MdnsProberTest.kt
index a2dbbc6..2b5423b 100644
--- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsProberTest.kt
+++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsProberTest.kt
@@ -68,6 +68,7 @@
@After
fun tearDown() {
thread.quitSafely()
+ thread.join()
}
private class TestProbeInfo(probeRecords: List<MdnsRecord>, private val delayMs: Long = 1L) :
diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt b/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt
index 5665091..44e0d08 100644
--- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt
+++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt
@@ -79,6 +79,7 @@
@After
fun tearDown() {
thread.quitSafely()
+ thread.join()
}
@Test
diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java
index a80c078..b0a1f18 100644
--- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java
+++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java
@@ -156,16 +156,20 @@
+ "010001000000780004C0A8018A0000000000000000000000000000"
+ "000000");
- // MDNS record for name "testhost1" with an IPv4 address of 10.1.2.3
+ // MDNS record for name "testhost1" with an IPv4 address of 10.1.2.3. Also set cache flush bit
+ // for the records changed.
private static final byte[] DATAIN_IPV4_1 = HexDump.hexStringToByteArray(
"0974657374686f73743100000180010000007800040a010203");
- // MDNS record for name "testhost1" with an IPv4 address of 10.1.2.4
+ // MDNS record for name "testhost1" with an IPv4 address of 10.1.2.4. Also set cache flush bit
+ // for the records changed.
private static final byte[] DATAIN_IPV4_2 = HexDump.hexStringToByteArray(
"0974657374686f73743100000180010000007800040a010204");
- // MDNS record w/name "testhost1" & IPv6 address of aabb:ccdd:1122:3344:a0b0:c0d0:1020:3040
+ // MDNS record w/name "testhost1" & IPv6 address of aabb:ccdd:1122:3344:a0b0:c0d0:1020:3040.
+ // Also set cache flush bit for the records changed.
private static final byte[] DATAIN_IPV6_1 = HexDump.hexStringToByteArray(
"0974657374686f73743100001c8001000000780010aabbccdd11223344a0b0c0d010203040");
- // MDNS record w/name "testhost1" & IPv6 address of aabb:ccdd:1122:3344:a0b0:c0d0:1020:3030
+ // MDNS record w/name "testhost1" & IPv6 address of aabb:ccdd:1122:3344:a0b0:c0d0:1020:3030.
+ // Also set cache flush bit for the records changed.
private static final byte[] DATAIN_IPV6_2 = HexDump.hexStringToByteArray(
"0974657374686f73743100001c8001000000780010aabbccdd11223344a0b0c0d010203030");
// MDNS record w/name "test" & PTR to foo.bar.quxx
diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java
index 3e2ea35..5d58f5d 100644
--- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java
+++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java
@@ -449,8 +449,8 @@
verifyServiceInfo(serviceInfoCaptor.getAllValues().get(0),
"service-instance-1",
SERVICE_TYPE_LABELS,
- /* ipv4Address= */ List.of(),
- /* ipv6Address= */ List.of(),
+ /* ipv4Addresses= */ List.of(),
+ /* ipv6Addresses= */ List.of(),
/* port= */ 0,
/* subTypes= */ List.of(),
Collections.emptyMap(),
diff --git a/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
index 5e7f0ff..e6aba22 100644
--- a/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
+++ b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
@@ -86,8 +86,9 @@
}
@After
- public void cleanUp() {
+ public void cleanUp() throws InterruptedException {
mHandlerThread.quitSafely();
+ mHandlerThread.join();
}
private void initMockResources() {
diff --git a/tests/unit/java/com/android/server/net/IpConfigStoreTest.java b/tests/unit/java/com/android/server/net/IpConfigStoreTest.java
index 4adc999..dcf0f75 100644
--- a/tests/unit/java/com/android/server/net/IpConfigStoreTest.java
+++ b/tests/unit/java/com/android/server/net/IpConfigStoreTest.java
@@ -36,7 +36,6 @@
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRunner;
-import com.android.testutils.HandlerUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,7 +57,7 @@
@RunWith(DevSdkIgnoreRunner.class)
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
public class IpConfigStoreTest {
- private static final int TIMEOUT_MS = 2_000;
+ private static final int TIMEOUT_MS = 5_000;
private static final int KEY_CONFIG = 17;
private static final String IFACE_1 = "eth0";
private static final String IFACE_2 = "eth1";
@@ -139,6 +138,8 @@
}
@Override
public void quitHandlerThread(HandlerThread handlerThread) {
+ // Don't join in here, quitHandlerThread runs on the
+ // handler thread itself.
testHandlerThread.quitSafely();
}
};
@@ -155,7 +156,7 @@
final DelayedDiskWrite writer = new DelayedDiskWrite(dependencies);
final IpConfigStore store = new IpConfigStore(writer);
store.writeIpConfigurations(configFile.getPath(), expectedNetworks);
- HandlerUtils.waitForIdle(testHandlerThread, TIMEOUT_MS);
+ testHandlerThread.join();
// Read IP config from the file path.
final ArrayMap<String, IpConfiguration> actualNetworks =
diff --git a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
index 8046263..04163fd 100644
--- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
+++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
@@ -539,6 +539,7 @@
mService = null;
mHandlerThread.quitSafely();
+ mHandlerThread.join();
}
private void initWifiStats(NetworkStateSnapshot snapshot) throws Exception {
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 83dd341..19901fa 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-// This file is automatically generated by gn2bp/gen_android_bp. Do not edit.
+// This file is automatically generated by gen_android_bp. Do not edit.
build = ["Android.extras.bp"]
@@ -36,6 +36,7 @@
"components/cronet/android/api/src/android/net/http/ExperimentalBidirectionalStream.java",
"components/cronet/android/api/src/android/net/http/ExperimentalHttpEngine.java",
"components/cronet/android/api/src/android/net/http/ExperimentalUrlRequest.java",
+ "components/cronet/android/api/src/android/net/http/HeaderBlock.java",
"components/cronet/android/api/src/android/net/http/HttpEngine.java",
"components/cronet/android/api/src/android/net/http/HttpException.java",
"components/cronet/android/api/src/android/net/http/IHttpEngineBuilder.java",
@@ -292,6 +293,7 @@
cc_library_static {
name: "cronet_aml_base_allocator_partition_allocator_partition_alloc",
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features",
"base/allocator/partition_allocator/address_pool_manager.cc",
"base/allocator/partition_allocator/address_pool_manager_bitmap.cc",
"base/allocator/partition_allocator/address_space_randomization.cc",
@@ -345,9 +347,6 @@
"base/allocator/partition_allocator/tagging.cc",
"base/allocator/partition_allocator/thread_cache.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features",
- ],
generated_headers: [
"cronet_aml_base_allocator_partition_allocator_chromecast_buildflags",
"cronet_aml_base_allocator_partition_allocator_chromeos_buildflags",
@@ -559,15 +558,13 @@
target: {
android_arm: {
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features__testing",
"base/allocator/partition_allocator/partition_alloc_base/files/file_path.cc",
"base/allocator/partition_allocator/partition_alloc_base/native_library.cc",
"base/allocator/partition_allocator/partition_alloc_base/native_library_posix.cc",
"base/allocator/partition_allocator/partition_alloc_base/time/time_android.cc",
"base/allocator/partition_allocator/starscan/stack/asm/arm/push_registers_asm.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -580,15 +577,13 @@
},
android_arm64: {
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features__testing",
"base/allocator/partition_allocator/partition_alloc_base/files/file_path.cc",
"base/allocator/partition_allocator/partition_alloc_base/native_library.cc",
"base/allocator/partition_allocator/partition_alloc_base/native_library_posix.cc",
"base/allocator/partition_allocator/partition_alloc_base/time/time_android.cc",
"base/allocator/partition_allocator/starscan/stack/asm/arm64/push_registers_asm.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -604,15 +599,13 @@
},
android_x86: {
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features__testing",
"base/allocator/partition_allocator/partition_alloc_base/files/file_path.cc",
"base/allocator/partition_allocator/partition_alloc_base/native_library.cc",
"base/allocator/partition_allocator/partition_alloc_base/native_library_posix.cc",
"base/allocator/partition_allocator/partition_alloc_base/time/time_android.cc",
"base/allocator/partition_allocator/starscan/stack/asm/x86/push_registers_asm.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -625,15 +618,13 @@
},
android_x86_64: {
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features__testing",
"base/allocator/partition_allocator/partition_alloc_base/files/file_path.cc",
"base/allocator/partition_allocator/partition_alloc_base/native_library.cc",
"base/allocator/partition_allocator/partition_alloc_base/native_library_posix.cc",
"base/allocator/partition_allocator/partition_alloc_base/time/time_android.cc",
"base/allocator/partition_allocator/starscan/stack/asm/x64/push_registers_asm.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -943,6 +934,56 @@
cc_library_static {
name: "cronet_aml_base_base",
srcs: [
+ ":cronet_aml_base_nodebug_assertion",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
+ ":cronet_aml_third_party_android_ndk_cpu_features",
+ ":cronet_aml_third_party_ashmem_ashmem",
"base/allocator/allocator_check.cc",
"base/allocator/allocator_extension.cc",
"base/allocator/dispatcher/dispatcher.cc",
@@ -1386,58 +1427,8 @@
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -1616,6 +1607,54 @@
cc_library_static {
name: "cronet_aml_base_base__testing",
srcs: [
+ ":cronet_aml_base_nodebug_assertion__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
"base/allocator/allocator_check.cc",
"base/allocator/allocator_extension.cc",
"base/allocator/dispatcher/dispatcher.cc",
@@ -1983,58 +2022,9 @@
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -2146,6 +2136,8 @@
},
android_arm: {
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features__testing",
+ ":cronet_aml_third_party_ashmem_ashmem__testing",
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
"base/android/android_hardware_buffer_compat.cc",
"base/android/android_image_reader_compat.cc",
@@ -2222,10 +2214,6 @@
"base/time/time_android.cc",
"base/trace_event/cfi_backtrace_android.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -2242,6 +2230,13 @@
"cronet_aml_base_logging_buildflags__testing",
"cronet_aml_build_chromeos_buildflags__testing",
],
+ export_generated_headers: [
+ "cronet_aml_base_android_runtime_jni_headers__testing",
+ "cronet_aml_base_base_jni_headers__testing",
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
ldflags: [
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
@@ -2262,6 +2257,8 @@
},
android_arm64: {
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features__testing",
+ ":cronet_aml_third_party_ashmem_ashmem__testing",
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
"base/android/android_hardware_buffer_compat.cc",
"base/android/android_image_reader_compat.cc",
@@ -2334,10 +2331,6 @@
"base/threading/platform_thread_android.cc",
"base/time/time_android.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -2356,6 +2349,13 @@
"cronet_aml_base_logging_buildflags__testing",
"cronet_aml_build_chromeos_buildflags__testing",
],
+ export_generated_headers: [
+ "cronet_aml_base_android_runtime_jni_headers__testing",
+ "cronet_aml_base_base_jni_headers__testing",
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
ldflags: [
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
@@ -2376,6 +2376,8 @@
},
android_x86: {
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features__testing",
+ ":cronet_aml_third_party_ashmem_ashmem__testing",
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
"base/android/android_hardware_buffer_compat.cc",
"base/android/android_image_reader_compat.cc",
@@ -2448,10 +2450,6 @@
"base/threading/platform_thread_android.cc",
"base/time/time_android.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -2468,6 +2466,13 @@
"cronet_aml_base_logging_buildflags__testing",
"cronet_aml_build_chromeos_buildflags__testing",
],
+ export_generated_headers: [
+ "cronet_aml_base_android_runtime_jni_headers__testing",
+ "cronet_aml_base_base_jni_headers__testing",
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
ldflags: [
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
@@ -2488,6 +2493,8 @@
},
android_x86_64: {
srcs: [
+ ":cronet_aml_third_party_android_ndk_cpu_features__testing",
+ ":cronet_aml_third_party_ashmem_ashmem__testing",
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
"base/android/android_hardware_buffer_compat.cc",
"base/android/android_image_reader_compat.cc",
@@ -2560,10 +2567,6 @@
"base/threading/platform_thread_android.cc",
"base/time/time_android.cc",
],
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -2581,6 +2584,13 @@
"cronet_aml_base_logging_buildflags__testing",
"cronet_aml_build_chromeos_buildflags__testing",
],
+ export_generated_headers: [
+ "cronet_aml_base_android_runtime_jni_headers__testing",
+ "cronet_aml_base_base_jni_headers__testing",
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
ldflags: [
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
@@ -3396,7 +3406,7 @@
cc_genrule {
name: "cronet_aml_base_build_date",
cmd: "$(location build/write_build_date_header.py) $(out) " +
- "1674644139",
+ "1678293768",
out: [
"base/generated_build_date.h",
],
@@ -3412,7 +3422,7 @@
cc_genrule {
name: "cronet_aml_base_build_date__testing",
cmd: "$(location build/write_build_date_header.py) $(out) " +
- "1674644139",
+ "1678293768",
host_supported: true,
out: [
"base/generated_build_date.h",
@@ -3735,60 +3745,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_ced_ced__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
@@ -4094,7 +4053,7 @@
}
// GN: //base:nodebug_assertion
-cc_library_static {
+cc_object {
name: "cronet_aml_base_nodebug_assertion",
srcs: [
"base/nodebug_assertion.cc",
@@ -4139,11 +4098,6 @@
"buildtools/third_party/libc++abi/trunk/include",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -4172,7 +4126,7 @@
}
// GN: //base:nodebug_assertion__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_base_nodebug_assertion__testing",
srcs: [
"base/nodebug_assertion.cc",
@@ -4213,11 +4167,6 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -4701,60 +4650,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -4858,6 +4756,55 @@
cc_library_static {
name: "cronet_aml_base_test_test_support__testing",
srcs: [
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
+ ":cronet_aml_third_party_googletest_gmock__testing",
+ ":cronet_aml_third_party_googletest_gtest__testing",
"base/task/sequence_manager/test/fake_task.cc",
"base/task/sequence_manager/test/mock_time_domain.cc",
"base/task/sequence_manager/test/mock_time_message_pump.cc",
@@ -4935,65 +4882,12 @@
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
"cronet_aml_base_i18n__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_test_test_config__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_ced_ced__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -5931,7 +5825,7 @@
}
// GN: //buildtools/third_party/libc++:libc++
-cc_library_static {
+cc_object {
name: "cronet_aml_buildtools_third_party_libc___libc__",
srcs: [
"buildtools/third_party/libc++/trunk/src/algorithm.cpp",
@@ -5977,9 +5871,6 @@
"buildtools/third_party/libc++/trunk/src/vector.cpp",
"buildtools/third_party/libc++/trunk/src/verbose_abort.cpp",
],
- static_libs: [
- "cronet_aml_buildtools_third_party_libc__abi_libc__abi",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -6015,11 +5906,6 @@
"buildtools/third_party/libc++abi/trunk/include",
],
cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
cppflags: [
"-fexceptions",
],
@@ -6083,7 +5969,7 @@
}
// GN: //buildtools/third_party/libc++:libc++__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_buildtools_third_party_libc___libc____testing",
srcs: [
"buildtools/third_party/libc++/trunk/src/algorithm.cpp",
@@ -6129,9 +6015,6 @@
"buildtools/third_party/libc++/trunk/src/vector.cpp",
"buildtools/third_party/libc++/trunk/src/verbose_abort.cpp",
],
- static_libs: [
- "cronet_aml_buildtools_third_party_libc__abi_libc__abi__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -6167,11 +6050,6 @@
"buildtools/third_party/libc++abi/trunk/include",
],
cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
cppflags: [
"-fexceptions",
],
@@ -6235,7 +6113,7 @@
}
// GN: //buildtools/third_party/libc++abi:libc++abi
-cc_library_static {
+cc_object {
name: "cronet_aml_buildtools_third_party_libc__abi_libc__abi",
srcs: [
"buildtools/third_party/libc++abi/trunk/src/abort_message.cpp",
@@ -6289,11 +6167,6 @@
"buildtools/third_party/libc++abi/trunk/include",
],
cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
cppflags: [
"-fexceptions",
],
@@ -6372,7 +6245,7 @@
}
// GN: //buildtools/third_party/libc++abi:libc++abi__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_buildtools_third_party_libc__abi_libc__abi__testing",
srcs: [
"buildtools/third_party/libc++abi/trunk/src/abort_message.cpp",
@@ -6426,11 +6299,6 @@
"buildtools/third_party/libc++abi/trunk/include",
],
cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
cppflags: [
"-fexceptions",
],
@@ -6558,6 +6426,12 @@
cc_library_shared {
name: "cronet_aml_components_cronet_android_cronet",
srcs: [
+ ":cronet_aml_buildtools_third_party_libc___libc__",
+ ":cronet_aml_buildtools_third_party_libc__abi_libc__abi",
+ ":cronet_aml_components_cronet_android_cronet_static",
+ ":cronet_aml_components_cronet_cronet_common",
+ ":cronet_aml_components_cronet_metrics_util",
+ ":cronet_aml_components_metrics_library_support",
"components/cronet/android/cronet_jni.cc",
],
shared_libs: [
@@ -6571,77 +6445,14 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_buildtools_third_party_libc___libc__",
- "cronet_aml_buildtools_third_party_libc__abi_libc__abi",
- "cronet_aml_components_cronet_android_cronet_static",
- "cronet_aml_components_cronet_cronet_common",
- "cronet_aml_components_cronet_cronet_version_header",
- "cronet_aml_components_cronet_metrics_util",
- "cronet_aml_components_metrics_library_support",
"cronet_aml_components_prefs_prefs",
"cronet_aml_crypto_crypto",
- "cronet_aml_net_dns_dns",
- "cronet_aml_net_dns_public_public",
- "cronet_aml_net_http_transport_security_state_generated_files",
"cronet_aml_net_net",
- "cronet_aml_net_net_deps",
- "cronet_aml_net_net_public_deps",
"cronet_aml_net_preload_decoder",
"cronet_aml_net_third_party_quiche_quiche",
- "cronet_aml_net_traffic_annotation_traffic_annotation",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_brotli_common",
"cronet_aml_third_party_brotli_dec",
"cronet_aml_third_party_icu_icui18n",
@@ -6651,6 +6462,30 @@
"cronet_aml_third_party_protobuf_protobuf_lite",
"cronet_aml_url_url",
],
+ generated_headers: [
+ "cronet_aml_base_debugging_buildflags",
+ "cronet_aml_base_logging_buildflags",
+ "cronet_aml_build_chromeos_buildflags",
+ "cronet_aml_components_cronet_android_buildflags",
+ "cronet_aml_components_cronet_android_cronet_jni_headers",
+ "cronet_aml_components_cronet_android_cronet_jni_registration",
+ "cronet_aml_components_cronet_cronet_buildflags",
+ "cronet_aml_components_cronet_cronet_version_header_action",
+ "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
+ "cronet_aml_url_buildflags",
+ ],
+ export_generated_headers: [
+ "cronet_aml_base_debugging_buildflags",
+ "cronet_aml_base_logging_buildflags",
+ "cronet_aml_build_chromeos_buildflags",
+ "cronet_aml_components_cronet_android_buildflags",
+ "cronet_aml_components_cronet_android_cronet_jni_headers",
+ "cronet_aml_components_cronet_android_cronet_jni_registration",
+ "cronet_aml_components_cronet_cronet_buildflags",
+ "cronet_aml_components_cronet_cronet_version_header_action",
+ "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
+ "cronet_aml_url_buildflags",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -7033,6 +6868,7 @@
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
+ "components/cronet/android/java/src/org/chromium/net/impl/HeaderBlockImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
@@ -7286,6 +7122,7 @@
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
+ "components/cronet/android/java/src/org/chromium/net/impl/HeaderBlockImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
@@ -7535,6 +7372,7 @@
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
+ "components/cronet/android/java/src/org/chromium/net/impl/HeaderBlockImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
@@ -7782,6 +7620,7 @@
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
+ "components/cronet/android/java/src/org/chromium/net/impl/HeaderBlockImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
@@ -7861,7 +7700,7 @@
}
// GN: //components/cronet/android:cronet_static
-cc_library_static {
+cc_object {
name: "cronet_aml_components_cronet_android_cronet_static",
srcs: [
"components/cronet/android/cronet_bidirectional_stream_adapter.cc",
@@ -7883,74 +7722,14 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_components_cronet_cronet_common",
- "cronet_aml_components_cronet_cronet_version_header",
- "cronet_aml_components_cronet_metrics_util",
- "cronet_aml_components_metrics_library_support",
"cronet_aml_components_prefs_prefs",
"cronet_aml_crypto_crypto",
- "cronet_aml_net_dns_dns",
- "cronet_aml_net_dns_public_public",
- "cronet_aml_net_http_transport_security_state_generated_files",
"cronet_aml_net_net",
- "cronet_aml_net_net_deps",
- "cronet_aml_net_net_public_deps",
"cronet_aml_net_preload_decoder",
"cronet_aml_net_third_party_quiche_quiche",
- "cronet_aml_net_traffic_annotation_traffic_annotation",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_brotli_common",
"cronet_aml_third_party_brotli_dec",
"cronet_aml_third_party_icu_icui18n",
@@ -7967,15 +7746,9 @@
"cronet_aml_components_cronet_android_buildflags",
"cronet_aml_components_cronet_android_cronet_jni_headers",
"cronet_aml_components_cronet_android_cronet_jni_registration",
- "cronet_aml_url_buildflags",
- ],
- export_generated_headers: [
- "cronet_aml_base_debugging_buildflags",
- "cronet_aml_base_logging_buildflags",
- "cronet_aml_build_chromeos_buildflags",
- "cronet_aml_components_cronet_android_buildflags",
- "cronet_aml_components_cronet_android_cronet_jni_headers",
- "cronet_aml_components_cronet_android_cronet_jni_registration",
+ "cronet_aml_components_cronet_cronet_buildflags",
+ "cronet_aml_components_cronet_cronet_version_header_action",
+ "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
"cronet_aml_url_buildflags",
],
defaults: [
@@ -8024,27 +7797,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -8073,7 +7825,7 @@
}
// GN: //components/cronet/android:cronet_static__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_components_cronet_android_cronet_static__testing",
srcs: [
"components/cronet/android/cronet_bidirectional_stream_adapter.cc",
@@ -8093,76 +7845,15 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_components_cronet_cronet_common__testing",
- "cronet_aml_components_cronet_cronet_version_header__testing",
- "cronet_aml_components_cronet_metrics_util__testing",
- "cronet_aml_components_metrics_library_support__testing",
"cronet_aml_components_prefs_prefs__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -8179,15 +7870,9 @@
"cronet_aml_components_cronet_android_buildflags__testing",
"cronet_aml_components_cronet_android_cronet_jni_headers__testing",
"cronet_aml_components_cronet_android_cronet_jni_registration__testing",
- "cronet_aml_url_buildflags__testing",
- ],
- export_generated_headers: [
- "cronet_aml_base_debugging_buildflags__testing",
- "cronet_aml_base_logging_buildflags__testing",
- "cronet_aml_build_chromeos_buildflags__testing",
- "cronet_aml_components_cronet_android_buildflags__testing",
- "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
- "cronet_aml_components_cronet_android_cronet_jni_registration__testing",
+ "cronet_aml_components_cronet_cronet_buildflags__testing",
+ "cronet_aml_components_cronet_cronet_version_header_action__testing",
+ "cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen_headers",
"cronet_aml_url_buildflags__testing",
],
defaults: [
@@ -8236,27 +7921,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -8288,6 +7952,15 @@
cc_library_shared {
name: "cronet_aml_components_cronet_android_cronet_unittests_android__library__testing",
srcs: [
+ ":cronet_aml_buildtools_third_party_libc___libc____testing",
+ ":cronet_aml_buildtools_third_party_libc__abi_libc__abi__testing",
+ ":cronet_aml_components_cronet_android_cronet_static__testing",
+ ":cronet_aml_components_cronet_cronet_common__testing",
+ ":cronet_aml_components_cronet_cronet_common_unittests__testing",
+ ":cronet_aml_components_cronet_metrics_util__testing",
+ ":cronet_aml_components_metrics_library_support__testing",
+ ":cronet_aml_testing_android_native_test_native_test_native_code__testing",
+ ":cronet_aml_testing_android_native_test_native_test_support__testing",
"components/cronet/run_all_unittests.cc",
],
shared_libs: [
@@ -8300,98 +7973,25 @@
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
"cronet_aml_base_i18n__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_test_test_config__testing",
"cronet_aml_base_test_test_support__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_buildtools_third_party_libc___libc____testing",
- "cronet_aml_buildtools_third_party_libc__abi_libc__abi__testing",
- "cronet_aml_components_cronet_android_cronet_static__testing",
- "cronet_aml_components_cronet_cronet_common__testing",
- "cronet_aml_components_cronet_cronet_common_unittests__testing",
- "cronet_aml_components_cronet_cronet_version_header__testing",
- "cronet_aml_components_cronet_metrics_util__testing",
- "cronet_aml_components_metrics_library_support__testing",
"cronet_aml_components_prefs_prefs__testing",
"cronet_aml_components_prefs_test_support__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_dns_test_support__testing",
"cronet_aml_net_gtest_util__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
- "cronet_aml_net_quic_test_flags_utils__testing",
- "cronet_aml_net_simple_quic_tools__testing",
"cronet_aml_net_test_support__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
"cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
- "cronet_aml_net_tools_tld_cleanup_tld_cleanup__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_testing_android_native_test_native_test_native_code__testing",
- "cronet_aml_testing_android_native_test_native_test_support__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_ced_ced__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -8402,6 +8002,32 @@
"cronet_aml_third_party_protobuf_protobuf_lite__testing",
"cronet_aml_url_url__testing",
],
+ generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_components_cronet_android_buildflags__testing",
+ "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
+ "cronet_aml_components_cronet_android_cronet_jni_registration__testing",
+ "cronet_aml_components_cronet_cronet_buildflags__testing",
+ "cronet_aml_components_cronet_cronet_version_header_action__testing",
+ "cronet_aml_testing_android_native_test_native_test_jni_headers__testing",
+ "cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
+ ],
+ export_generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_components_cronet_android_buildflags__testing",
+ "cronet_aml_components_cronet_android_cronet_jni_headers__testing",
+ "cronet_aml_components_cronet_android_cronet_jni_registration__testing",
+ "cronet_aml_components_cronet_cronet_buildflags__testing",
+ "cronet_aml_components_cronet_cronet_version_header_action__testing",
+ "cronet_aml_testing_android_native_test_native_test_jni_headers__testing",
+ "cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -8812,7 +8438,7 @@
}
// GN: //components/cronet:cronet_common
-cc_library_static {
+cc_object {
name: "cronet_aml_components_cronet_cronet_common",
srcs: [
"components/cronet/cronet_context.cc",
@@ -8834,72 +8460,14 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_components_cronet_cronet_version_header",
- "cronet_aml_components_metrics_library_support",
"cronet_aml_components_prefs_prefs",
"cronet_aml_crypto_crypto",
- "cronet_aml_net_dns_dns",
- "cronet_aml_net_dns_public_public",
- "cronet_aml_net_http_transport_security_state_generated_files",
"cronet_aml_net_net",
- "cronet_aml_net_net_deps",
- "cronet_aml_net_net_public_deps",
"cronet_aml_net_preload_decoder",
"cronet_aml_net_third_party_quiche_quiche",
- "cronet_aml_net_traffic_annotation_traffic_annotation",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_brotli_common",
"cronet_aml_third_party_brotli_dec",
"cronet_aml_third_party_icu_icui18n",
@@ -8911,9 +8479,8 @@
],
generated_headers: [
"cronet_aml_components_cronet_cronet_buildflags",
- ],
- export_generated_headers: [
- "cronet_aml_components_cronet_cronet_buildflags",
+ "cronet_aml_components_cronet_cronet_version_header_action",
+ "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
],
defaults: [
"cronet_aml_defaults",
@@ -8961,27 +8528,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -9010,7 +8556,7 @@
}
// GN: //components/cronet:cronet_common__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_components_cronet_cronet_common__testing",
srcs: [
"components/cronet/cronet_context.cc",
@@ -9030,74 +8576,15 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_components_cronet_cronet_version_header__testing",
- "cronet_aml_components_metrics_library_support__testing",
"cronet_aml_components_prefs_prefs__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -9109,9 +8596,8 @@
],
generated_headers: [
"cronet_aml_components_cronet_cronet_buildflags__testing",
- ],
- export_generated_headers: [
- "cronet_aml_components_cronet_cronet_buildflags__testing",
+ "cronet_aml_components_cronet_cronet_version_header_action__testing",
+ "cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen_headers",
],
defaults: [
"cronet_aml_defaults",
@@ -9159,27 +8645,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -9208,7 +8673,7 @@
}
// GN: //components/cronet:cronet_common_unittests__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_components_cronet_cronet_common_unittests__testing",
srcs: [
"components/cronet/host_cache_persistence_manager_unittest.cc",
@@ -9226,91 +8691,25 @@
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
"cronet_aml_base_i18n__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_test_test_config__testing",
"cronet_aml_base_test_test_support__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_components_cronet_cronet_common__testing",
- "cronet_aml_components_cronet_cronet_version_header__testing",
- "cronet_aml_components_metrics_library_support__testing",
"cronet_aml_components_prefs_prefs__testing",
"cronet_aml_components_prefs_test_support__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_dns_test_support__testing",
"cronet_aml_net_gtest_util__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
- "cronet_aml_net_quic_test_flags_utils__testing",
- "cronet_aml_net_simple_quic_tools__testing",
"cronet_aml_net_test_support__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
"cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
- "cronet_aml_net_tools_tld_cleanup_tld_cleanup__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_ced_ced__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -9321,6 +8720,11 @@
"cronet_aml_third_party_protobuf_protobuf_lite__testing",
"cronet_aml_url_url__testing",
],
+ generated_headers: [
+ "cronet_aml_components_cronet_cronet_buildflags__testing",
+ "cronet_aml_components_cronet_cronet_version_header_action__testing",
+ "cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen_headers",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -9387,181 +8791,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
- target: {
- android_arm: {
- cflags: [
- "-fstack-protector",
- ],
- },
- android_arm64: {
- cflags: [
- "-fstack-protector",
- "-mno-outline",
- "-mno-outline-atomics",
- ],
- },
- android_x86: {
- cflags: [
- "-msse3",
- ],
- },
- android_x86_64: {
- cflags: [
- "-fstack-protector",
- "-msse3",
- ],
- },
- },
-}
-
-// GN: //components/cronet:cronet_version_header
-cc_library_static {
- name: "cronet_aml_components_cronet_cronet_version_header",
- generated_headers: [
- "cronet_aml_components_cronet_cronet_version_header_action",
- ],
- export_generated_headers: [
- "cronet_aml_components_cronet_cronet_version_header_action",
- ],
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
- "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
- "-DHAVE_SYS_UIO_H",
- "-DNDEBUG",
- "-DNO_UNWIND_TABLES",
- "-DNVALGRIND",
- "-DOFFICIAL_BUILD",
- "-D_FORTIFY_SOURCE=2",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- "-Oz",
- "-fdata-sections",
- "-ffunction-sections",
- "-fno-asynchronous-unwind-tables",
- "-fno-unwind-tables",
- "-fvisibility-inlines-hidden",
- "-fvisibility=hidden",
- "-g1",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
- target: {
- android_arm: {
- cflags: [
- "-fstack-protector",
- ],
- },
- android_arm64: {
- cflags: [
- "-fstack-protector",
- "-mno-outline",
- "-mno-outline-atomics",
- ],
- },
- android_x86: {
- cflags: [
- "-msse3",
- ],
- },
- android_x86_64: {
- cflags: [
- "-fstack-protector",
- "-msse3",
- ],
- },
- },
-}
-
-// GN: //components/cronet:cronet_version_header__testing
-cc_library_static {
- name: "cronet_aml_components_cronet_cronet_version_header__testing",
- generated_headers: [
- "cronet_aml_components_cronet_cronet_version_header_action__testing",
- ],
- export_generated_headers: [
- "cronet_aml_components_cronet_cronet_version_header_action__testing",
- ],
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
- "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
- "-DHAVE_SYS_UIO_H",
- "-DNDEBUG",
- "-DNO_UNWIND_TABLES",
- "-DNVALGRIND",
- "-DOFFICIAL_BUILD",
- "-D_FORTIFY_SOURCE=2",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- "-Oz",
- "-fdata-sections",
- "-ffunction-sections",
- "-fno-asynchronous-unwind-tables",
- "-fno-unwind-tables",
- "-fvisibility-inlines-hidden",
- "-fvisibility=hidden",
- "-g1",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -9642,7 +8871,7 @@
}
// GN: //components/cronet:metrics_util
-cc_library_static {
+cc_object {
name: "cronet_aml_components_cronet_metrics_util",
srcs: [
"components/cronet/metrics_util.cc",
@@ -9657,58 +8886,8 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -9752,27 +8931,6 @@
"third_party/boringssl/src/include/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -9801,7 +8959,7 @@
}
// GN: //components/cronet:metrics_util__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_components_cronet_metrics_util__testing",
srcs: [
"components/cronet/metrics_util.cc",
@@ -9814,60 +8972,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -9911,27 +9018,6 @@
"third_party/boringssl/src/include/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -9960,7 +9046,7 @@
}
// GN: //components/metrics:library_support
-cc_library_static {
+cc_object {
name: "cronet_aml_components_metrics_library_support",
srcs: [
":cronet_aml_third_party_metrics_proto_metrics_proto_gen",
@@ -9978,58 +9064,8 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -10039,9 +9075,6 @@
generated_headers: [
"cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
],
- export_generated_headers: [
- "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -10085,27 +9118,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -10134,7 +9146,7 @@
}
// GN: //components/metrics:library_support__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_components_metrics_library_support__testing",
srcs: [
":cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen",
@@ -10150,60 +9162,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -10213,9 +9174,6 @@
generated_headers: [
"cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen_headers",
],
- export_generated_headers: [
- "cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen_headers",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -10259,27 +9217,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -10409,58 +9346,8 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -10599,60 +9486,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -10761,6 +9597,55 @@
cc_library_static {
name: "cronet_aml_components_prefs_test_support__testing",
srcs: [
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
+ ":cronet_aml_third_party_googletest_gmock__testing",
+ ":cronet_aml_third_party_googletest_gtest__testing",
"components/prefs/mock_pref_change_callback.cc",
"components/prefs/pref_store_observer_mock.cc",
"components/prefs/pref_test_utils.cc",
@@ -10777,67 +9662,14 @@
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
"cronet_aml_base_i18n__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_test_test_config__testing",
"cronet_aml_base_test_test_support__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_components_prefs_prefs__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_ced_ced__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -10846,6 +9678,12 @@
"cronet_aml_third_party_libxml_xml_reader__testing",
"cronet_aml_third_party_modp_b64_modp_b64__testing",
],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
+ export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -11032,58 +9870,8 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -11210,58 +9998,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -11322,10 +10061,6 @@
],
},
android_arm: {
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -11352,10 +10087,6 @@
],
},
android_arm64: {
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -11384,10 +10115,6 @@
],
},
android_x86: {
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -11414,10 +10141,6 @@
],
},
android_x86_64: {
- static_libs: [
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
- ],
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
@@ -11462,6 +10185,115 @@
},
}
+// GN: //crypto:test_support__testing
+cc_library_static {
+ name: "cronet_aml_crypto_test_support__testing",
+ srcs: [
+ "crypto/scoped_mock_unexportable_key_provider.cc",
+ ],
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ ],
+ static_libs: [
+ "cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
+ "cronet_aml_base_base__testing",
+ "cronet_aml_base_base_static__testing",
+ "cronet_aml_base_third_party_double_conversion_double_conversion__testing",
+ "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
+ "cronet_aml_crypto_crypto__testing",
+ "cronet_aml_third_party_boringssl_boringssl__testing",
+ "cronet_aml_third_party_icu_icui18n__testing",
+ "cronet_aml_third_party_icu_icuuc_private__testing",
+ "cronet_aml_third_party_libevent_libevent__testing",
+ "cronet_aml_third_party_modp_b64_modp_b64__testing",
+ ],
+ defaults: [
+ "cronet_aml_defaults",
+ ],
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
+ "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+ "-DHAVE_SYS_UIO_H",
+ "-DNDEBUG",
+ "-DNO_UNWIND_TABLES",
+ "-DNVALGRIND",
+ "-DOFFICIAL_BUILD",
+ "-D_FORTIFY_SOURCE=2",
+ "-D_GNU_SOURCE",
+ "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D__STDC_CONSTANT_MACROS",
+ "-D__STDC_FORMAT_MACROS",
+ "-Oz",
+ "-fdata-sections",
+ "-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
+ "-fvisibility-inlines-hidden",
+ "-fvisibility=hidden",
+ "-g1",
+ ],
+ local_include_dirs: [
+ "./",
+ "buildtools/third_party/libc++/",
+ "buildtools/third_party/libc++/trunk/include",
+ "buildtools/third_party/libc++abi/trunk/include",
+ "third_party/abseil-cpp/",
+ "third_party/boringssl/src/include/",
+ ],
+ cpp_std: "c++17",
+ ldflags: [
+ "-Wl,--as-needed",
+ "-Wl,--gc-sections",
+ "-Wl,--icf=all",
+ "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
+ "-Wl,-wrap,asprintf",
+ "-Wl,-wrap,calloc",
+ "-Wl,-wrap,free",
+ "-Wl,-wrap,getcwd",
+ "-Wl,-wrap,malloc",
+ "-Wl,-wrap,malloc_usable_size",
+ "-Wl,-wrap,memalign",
+ "-Wl,-wrap,posix_memalign",
+ "-Wl,-wrap,pvalloc",
+ "-Wl,-wrap,realloc",
+ "-Wl,-wrap,realpath",
+ "-Wl,-wrap,strdup",
+ "-Wl,-wrap,strndup",
+ "-Wl,-wrap,valloc",
+ "-Wl,-wrap,vasprintf",
+ ],
+ target: {
+ android_arm: {
+ cflags: [
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ },
+}
+
// GN: //gn:default_deps
cc_defaults {
name: "cronet_aml_defaults",
@@ -11700,6 +10532,7 @@
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
+ "components/cronet/android/java/src/org/chromium/net/impl/HeaderBlockImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
@@ -11977,6 +10810,7 @@
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
+ "components/cronet/android/java/src/org/chromium/net/impl/HeaderBlockImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
@@ -12151,33 +10985,92 @@
],
}
+// GN: //net/base/registry_controlled_domains:lookup_strings_test_sets__testing
+cc_genrule {
+ name: "cronet_aml_net_base_registry_controlled_domains_lookup_strings_test_sets__testing",
+ cmd: "$(location net/tools/dafsa/make_dafsa.py) $(location net/base/registry_controlled_domains/effective_tld_names.gperf) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names-inc.cc) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest1.gperf) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest1-inc.cc) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest2.gperf) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest2-inc.cc) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest3.gperf) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest3-inc.cc) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest4.gperf) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest4-inc.cc) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest5.gperf) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest5-inc.cc) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest6.gperf) " +
+ "$(location net/base/registry_controlled_domains/effective_tld_names_unittest6-inc.cc)",
+ out: [
+ "net/base/registry_controlled_domains/effective_tld_names-inc.cc",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest1-inc.cc",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest2-inc.cc",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest3-inc.cc",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest4-inc.cc",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest5-inc.cc",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest6-inc.cc",
+ ],
+ tool_files: [
+ "net/base/registry_controlled_domains/effective_tld_names.gperf",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest1.gperf",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest2.gperf",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest3.gperf",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest4.gperf",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest5.gperf",
+ "net/base/registry_controlled_domains/effective_tld_names_unittest6.gperf",
+ "net/tools/dafsa/make_dafsa.py",
+ ],
+ apex_available: [
+ "com.android.tethering",
+ ],
+}
+
// GN: //net/base/registry_controlled_domains:registry_controlled_domains
cc_genrule {
name: "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
cmd: "$(location net/tools/dafsa/make_dafsa.py) --reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest1.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest1-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest2.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest2-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest3.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest3-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest4.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest4-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest5.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest5-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest6.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest6-reversed-inc.cc)",
@@ -12211,27 +11104,33 @@
cmd: "$(location net/tools/dafsa/make_dafsa.py) --reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest1.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest1-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest2.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest2-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest3.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest3-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest4.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest4-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest5.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest5-reversed-inc.cc) " +
- "&& python3 $(location net/tools/dafsa/make_dafsa.py) " +
+ "&& " +
+ "python3 $(location net/tools/dafsa/make_dafsa.py) " +
"--reverse " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest6.gperf) " +
"$(location net/base/registry_controlled_domains/effective_tld_names_unittest6-reversed-inc.cc)",
@@ -12383,8 +11282,54 @@
],
}
+// GN: //net:cronet_buildflags
+cc_genrule {
+ name: "cronet_aml_net_cronet_buildflags",
+ cmd: "echo '--flags CRONET_BUILD=\"true\"' | " +
+ "$(location build/write_buildflag_header.py) --output " +
+ "$(out) " +
+ "--rulename " +
+ "//net:cronet_buildflags " +
+ "--gen-dir " +
+ ". " +
+ "--definitions " +
+ "/dev/stdin",
+ out: [
+ "net/base/cronet_buildflags.h",
+ ],
+ tool_files: [
+ "build/write_buildflag_header.py",
+ ],
+ apex_available: [
+ "com.android.tethering",
+ ],
+}
+
+// GN: //net:cronet_buildflags__testing
+cc_genrule {
+ name: "cronet_aml_net_cronet_buildflags__testing",
+ cmd: "echo '--flags CRONET_BUILD=\"true\"' | " +
+ "$(location build/write_buildflag_header.py) --output " +
+ "$(out) " +
+ "--rulename " +
+ "//net:cronet_buildflags " +
+ "--gen-dir " +
+ ". " +
+ "--definitions " +
+ "/dev/stdin",
+ out: [
+ "net/base/cronet_buildflags.h",
+ ],
+ tool_files: [
+ "build/write_buildflag_header.py",
+ ],
+ apex_available: [
+ "com.android.tethering",
+ ],
+}
+
// GN: //net/dns:dns
-cc_library_static {
+cc_object {
name: "cronet_aml_net_dns_dns",
srcs: [
"net/dns/address_info.cc",
@@ -12436,66 +11381,12 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
"cronet_aml_crypto_crypto",
- "cronet_aml_net_dns_public_public",
- "cronet_aml_net_net_deps",
- "cronet_aml_net_net_public_deps",
"cronet_aml_net_preload_decoder",
"cronet_aml_net_third_party_quiche_quiche",
- "cronet_aml_net_traffic_annotation_traffic_annotation",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_brotli_common",
"cronet_aml_third_party_brotli_dec",
"cronet_aml_third_party_icu_icui18n",
@@ -12505,6 +11396,18 @@
"cronet_aml_third_party_protobuf_protobuf_lite",
"cronet_aml_url_url",
],
+ generated_headers: [
+ "cronet_aml_base_debugging_buildflags",
+ "cronet_aml_base_logging_buildflags",
+ "cronet_aml_build_chromeos_buildflags",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
+ "cronet_aml_net_buildflags",
+ "cronet_aml_net_isolation_info_proto_gen_headers",
+ "cronet_aml_net_net_jni_headers",
+ "cronet_aml_net_net_nqe_proto_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
+ "cronet_aml_url_buildflags",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -12554,27 +11457,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -12603,7 +11485,7 @@
}
// GN: //net/dns:dns__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_dns_dns__testing",
srcs: [
"net/dns/address_info.cc",
@@ -12653,68 +11535,13 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -12724,6 +11551,18 @@
"cronet_aml_third_party_protobuf_protobuf_lite__testing",
"cronet_aml_url_url__testing",
],
+ generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
+ "cronet_aml_net_buildflags__testing",
+ "cronet_aml_net_isolation_info_proto__testing_gen_headers",
+ "cronet_aml_net_net_jni_headers__testing",
+ "cronet_aml_net_net_nqe_proto__testing_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -12773,27 +11612,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -12822,7 +11640,7 @@
}
// GN: //net/dns/public:public
-cc_library_static {
+cc_object {
name: "cronet_aml_net_dns_public_public",
srcs: [
"net/dns/public/dns_config_overrides.cc",
@@ -12845,65 +11663,12 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
"cronet_aml_crypto_crypto",
- "cronet_aml_net_net_deps",
- "cronet_aml_net_net_public_deps",
"cronet_aml_net_preload_decoder",
"cronet_aml_net_third_party_quiche_quiche",
- "cronet_aml_net_traffic_annotation_traffic_annotation",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_brotli_common",
"cronet_aml_third_party_brotli_dec",
"cronet_aml_third_party_icu_icui18n",
@@ -12913,6 +11678,18 @@
"cronet_aml_third_party_protobuf_protobuf_lite",
"cronet_aml_url_url",
],
+ generated_headers: [
+ "cronet_aml_base_debugging_buildflags",
+ "cronet_aml_base_logging_buildflags",
+ "cronet_aml_build_chromeos_buildflags",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
+ "cronet_aml_net_buildflags",
+ "cronet_aml_net_isolation_info_proto_gen_headers",
+ "cronet_aml_net_net_jni_headers",
+ "cronet_aml_net_net_nqe_proto_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
+ "cronet_aml_url_buildflags",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -12962,27 +11739,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -13011,7 +11767,7 @@
}
// GN: //net/dns/public:public__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_dns_public_public__testing",
srcs: [
"net/dns/public/dns_config_overrides.cc",
@@ -13032,67 +11788,13 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -13102,6 +11804,18 @@
"cronet_aml_third_party_protobuf_protobuf_lite__testing",
"cronet_aml_url_url__testing",
],
+ generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
+ "cronet_aml_net_buildflags__testing",
+ "cronet_aml_net_isolation_info_proto__testing_gen_headers",
+ "cronet_aml_net_net_jni_headers__testing",
+ "cronet_aml_net_net_nqe_proto__testing_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -13151,27 +11865,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -13199,13 +11892,13 @@
},
}
-// GN: //net/dns:test_support__testing
-cc_library_static {
- name: "cronet_aml_net_dns_test_support__testing",
+// GN: //net/dns/public:tests__testing
+cc_object {
+ name: "cronet_aml_net_dns_public_tests__testing",
srcs: [
- "net/dns/dns_test_util.cc",
- "net/dns/host_resolver_results_test_util.cc",
- "net/dns/mock_host_resolver.cc",
+ "net/dns/public/dns_over_https_config_unittest.cc",
+ "net/dns/public/dns_over_https_server_config_unittest.cc",
+ "net/dns/public/doh_provider_entry_unittest.cc",
],
shared_libs: [
"libandroid",
@@ -13216,76 +11909,17 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -13293,6 +11927,9 @@
"cronet_aml_third_party_protobuf_protobuf_lite__testing",
"cronet_aml_url_url__testing",
],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -13348,27 +11985,291 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
+ target: {
+ android_arm: {
+ cflags: [
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ },
+}
+
+// GN: //net/dns:test_support__testing
+cc_object {
+ name: "cronet_aml_net_dns_test_support__testing",
+ srcs: [
+ "net/dns/dns_test_util.cc",
+ "net/dns/host_resolver_results_test_util.cc",
+ "net/dns/mock_host_resolver.cc",
],
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ "libz",
+ ],
+ static_libs: [
+ "cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
+ "cronet_aml_base_base__testing",
+ "cronet_aml_base_base_static__testing",
+ "cronet_aml_base_third_party_double_conversion_double_conversion__testing",
+ "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
+ "cronet_aml_crypto_crypto__testing",
+ "cronet_aml_net_net__testing",
+ "cronet_aml_net_preload_decoder__testing",
+ "cronet_aml_net_third_party_quiche_quiche__testing",
+ "cronet_aml_net_uri_template__testing",
+ "cronet_aml_testing_gtest_gtest__testing",
+ "cronet_aml_third_party_boringssl_boringssl__testing",
+ "cronet_aml_third_party_brotli_common__testing",
+ "cronet_aml_third_party_brotli_dec__testing",
+ "cronet_aml_third_party_icu_icui18n__testing",
+ "cronet_aml_third_party_icu_icuuc_private__testing",
+ "cronet_aml_third_party_libevent_libevent__testing",
+ "cronet_aml_third_party_modp_b64_modp_b64__testing",
+ "cronet_aml_third_party_protobuf_protobuf_lite__testing",
+ "cronet_aml_url_url__testing",
+ ],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
+ defaults: [
+ "cronet_aml_defaults",
+ ],
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
+ "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+ "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
+ "-DGOOGLE_PROTOBUF_NO_RTTI",
+ "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+ "-DGTEST_API_=",
+ "-DGTEST_HAS_ABSL=1",
+ "-DGTEST_HAS_POSIX_RE=0",
+ "-DGTEST_HAS_TR1_TUPLE=0",
+ "-DGTEST_LANG_CXX11=1",
+ "-DHAVE_PTHREAD",
+ "-DHAVE_SYS_UIO_H",
+ "-DNDEBUG",
+ "-DNO_UNWIND_TABLES",
+ "-DNVALGRIND",
+ "-DOFFICIAL_BUILD",
+ "-DUNIT_TEST",
+ "-D_FORTIFY_SOURCE=2",
+ "-D_GNU_SOURCE",
+ "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D__STDC_CONSTANT_MACROS",
+ "-D__STDC_FORMAT_MACROS",
+ "-Oz",
+ "-fdata-sections",
+ "-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
+ "-fvisibility-inlines-hidden",
+ "-fvisibility=hidden",
+ "-g1",
+ ],
+ local_include_dirs: [
+ "./",
+ "buildtools/third_party/libc++/",
+ "buildtools/third_party/libc++/trunk/include",
+ "buildtools/third_party/libc++abi/trunk/include",
+ "net/third_party/quiche/overrides/",
+ "net/third_party/quiche/src/",
+ "net/third_party/quiche/src/quiche/common/platform/default/",
+ "third_party/abseil-cpp/",
+ "third_party/boringssl/src/include/",
+ "third_party/googletest/custom/",
+ "third_party/googletest/src/googlemock/include/",
+ "third_party/googletest/src/googletest/include/",
+ "third_party/protobuf/src/",
+ ],
+ cpp_std: "c++17",
+ target: {
+ android_arm: {
+ cflags: [
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ },
+}
+
+// GN: //net/dns:tests__testing
+cc_object {
+ name: "cronet_aml_net_dns_tests__testing",
+ srcs: [
+ "net/dns/address_info_unittest.cc",
+ "net/dns/address_sorter_posix_unittest.cc",
+ "net/dns/address_sorter_unittest.cc",
+ "net/dns/context_host_resolver_unittest.cc",
+ "net/dns/dns_alias_utility_unittest.cc",
+ "net/dns/dns_client_unittest.cc",
+ "net/dns/dns_config_service_android_unittest.cc",
+ "net/dns/dns_config_service_unittest.cc",
+ "net/dns/dns_hosts_unittest.cc",
+ "net/dns/dns_query_unittest.cc",
+ "net/dns/dns_response_result_extractor_unittest.cc",
+ "net/dns/dns_response_unittest.cc",
+ "net/dns/dns_transaction_unittest.cc",
+ "net/dns/dns_udp_tracker_unittest.cc",
+ "net/dns/dns_util_unittest.cc",
+ "net/dns/host_cache_unittest.cc",
+ "net/dns/host_resolver_manager_unittest.cc",
+ "net/dns/https_record_rdata_unittest.cc",
+ "net/dns/httpssvc_metrics_unittest.cc",
+ "net/dns/mapped_host_resolver_unittest.cc",
+ "net/dns/nsswitch_reader_unittest.cc",
+ "net/dns/opt_record_rdata_unittest.cc",
+ "net/dns/record_parsed_unittest.cc",
+ "net/dns/record_rdata_unittest.cc",
+ "net/dns/resolve_context_unittest.cc",
+ "net/dns/serial_worker_unittest.cc",
+ "net/dns/system_dns_config_change_notifier_unittest.cc",
+ ],
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ "libz",
+ ],
+ static_libs: [
+ "cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
+ "cronet_aml_base_base__testing",
+ "cronet_aml_base_base_static__testing",
+ "cronet_aml_base_i18n__testing",
+ "cronet_aml_base_test_test_config__testing",
+ "cronet_aml_base_test_test_support__testing",
+ "cronet_aml_base_third_party_double_conversion_double_conversion__testing",
+ "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
+ "cronet_aml_crypto_crypto__testing",
+ "cronet_aml_net_gtest_util__testing",
+ "cronet_aml_net_net__testing",
+ "cronet_aml_net_preload_decoder__testing",
+ "cronet_aml_net_test_support__testing",
+ "cronet_aml_net_third_party_quiche_quiche__testing",
+ "cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
+ "cronet_aml_net_uri_template__testing",
+ "cronet_aml_testing_gtest_gtest__testing",
+ "cronet_aml_third_party_boringssl_boringssl__testing",
+ "cronet_aml_third_party_brotli_common__testing",
+ "cronet_aml_third_party_brotli_dec__testing",
+ "cronet_aml_third_party_ced_ced__testing",
+ "cronet_aml_third_party_icu_icui18n__testing",
+ "cronet_aml_third_party_icu_icuuc_private__testing",
+ "cronet_aml_third_party_libevent_libevent__testing",
+ "cronet_aml_third_party_libxml_libxml__testing",
+ "cronet_aml_third_party_libxml_libxml_utils__testing",
+ "cronet_aml_third_party_libxml_xml_reader__testing",
+ "cronet_aml_third_party_modp_b64_modp_b64__testing",
+ "cronet_aml_third_party_protobuf_protobuf_lite__testing",
+ "cronet_aml_url_url__testing",
+ ],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
+ defaults: [
+ "cronet_aml_defaults",
+ ],
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
+ "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+ "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
+ "-DGOOGLE_PROTOBUF_NO_RTTI",
+ "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+ "-DGTEST_API_=",
+ "-DGTEST_HAS_ABSL=1",
+ "-DGTEST_HAS_POSIX_RE=0",
+ "-DGTEST_HAS_TR1_TUPLE=0",
+ "-DGTEST_LANG_CXX11=1",
+ "-DHAVE_PTHREAD",
+ "-DHAVE_SYS_UIO_H",
+ "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
+ "-DNDEBUG",
+ "-DNO_UNWIND_TABLES",
+ "-DNVALGRIND",
+ "-DOFFICIAL_BUILD",
+ "-DUNIT_TEST",
+ "-DUSE_CHROMIUM_ICU=1",
+ "-DUSE_REMOTE_TEST_SERVER",
+ "-DU_ENABLE_DYLOAD=0",
+ "-DU_ENABLE_RESOURCE_TRACING=0",
+ "-DU_ENABLE_TRACING=1",
+ "-DU_STATIC_IMPLEMENTATION",
+ "-DU_USING_ICU_NAMESPACE=0",
+ "-D_FORTIFY_SOURCE=2",
+ "-D_GNU_SOURCE",
+ "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D__STDC_CONSTANT_MACROS",
+ "-D__STDC_FORMAT_MACROS",
+ "-Oz",
+ "-fdata-sections",
+ "-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
+ "-fvisibility-inlines-hidden",
+ "-fvisibility=hidden",
+ "-g1",
+ ],
+ local_include_dirs: [
+ "./",
+ "buildtools/third_party/libc++/",
+ "buildtools/third_party/libc++/trunk/include",
+ "buildtools/third_party/libc++abi/trunk/include",
+ "net/third_party/quiche/overrides/",
+ "net/third_party/quiche/src/",
+ "net/third_party/quiche/src/quiche/common/platform/default/",
+ "third_party/abseil-cpp/",
+ "third_party/boringssl/src/include/",
+ "third_party/ced/src/",
+ "third_party/googletest/custom/",
+ "third_party/googletest/src/googlemock/include/",
+ "third_party/googletest/src/googletest/include/",
+ "third_party/icu/source/common/",
+ "third_party/icu/source/i18n/",
+ "third_party/protobuf/src/",
+ ],
+ cpp_std: "c++17",
target: {
android_arm: {
cflags: [
@@ -13419,6 +12320,55 @@
cc_library_static {
name: "cronet_aml_net_gtest_util__testing",
srcs: [
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
+ ":cronet_aml_third_party_googletest_gmock__testing",
+ ":cronet_aml_third_party_googletest_gtest__testing",
"net/test/scoped_disable_exit_on_dfatal.cc",
],
shared_libs: [
@@ -13431,79 +12381,20 @@
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
"cronet_aml_base_i18n__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_test_test_config__testing",
"cronet_aml_base_test_test_support__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_ced_ced__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -13514,6 +12405,12 @@
"cronet_aml_third_party_protobuf_protobuf_lite__testing",
"cronet_aml_url_url__testing",
],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
+ export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -13628,7 +12525,7 @@
}
// GN: //net/http:transport_security_state_generated_files
-cc_library_static {
+cc_object {
name: "cronet_aml_net_http_transport_security_state_generated_files",
srcs: [
"net/http/transport_security_state.cc",
@@ -13644,67 +12541,12 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
"cronet_aml_crypto_crypto",
- "cronet_aml_net_dns_dns",
- "cronet_aml_net_dns_public_public",
- "cronet_aml_net_net_deps",
- "cronet_aml_net_net_public_deps",
"cronet_aml_net_preload_decoder",
"cronet_aml_net_third_party_quiche_quiche",
- "cronet_aml_net_traffic_annotation_traffic_annotation",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_brotli_common",
"cronet_aml_third_party_brotli_dec",
"cronet_aml_third_party_icu_icui18n",
@@ -13715,10 +12557,17 @@
"cronet_aml_url_url",
],
generated_headers: [
+ "cronet_aml_base_debugging_buildflags",
+ "cronet_aml_base_logging_buildflags",
"cronet_aml_build_branding_buildflags",
- ],
- export_generated_headers: [
- "cronet_aml_build_branding_buildflags",
+ "cronet_aml_build_chromeos_buildflags",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
+ "cronet_aml_net_buildflags",
+ "cronet_aml_net_isolation_info_proto_gen_headers",
+ "cronet_aml_net_net_jni_headers",
+ "cronet_aml_net_net_nqe_proto_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
+ "cronet_aml_url_buildflags",
],
defaults: [
"cronet_aml_defaults",
@@ -13769,27 +12618,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -13818,7 +12646,7 @@
}
// GN: //net/http:transport_security_state_generated_files__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_http_transport_security_state_generated_files__testing",
srcs: [
"net/http/transport_security_state.cc",
@@ -13832,69 +12660,13 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -13905,10 +12677,17 @@
"cronet_aml_url_url__testing",
],
generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
"cronet_aml_build_branding_buildflags__testing",
- ],
- export_generated_headers: [
- "cronet_aml_build_branding_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
+ "cronet_aml_net_buildflags__testing",
+ "cronet_aml_net_isolation_info_proto__testing_gen_headers",
+ "cronet_aml_net_net_jni_headers__testing",
+ "cronet_aml_net_net_nqe_proto__testing_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
],
defaults: [
"cronet_aml_defaults",
@@ -13959,27 +12738,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -14007,6 +12765,47 @@
},
}
+// GN: //net/http:transport_security_state_unittest_data__testing
+cc_genrule {
+ name: "cronet_aml_net_http_transport_security_state_unittest_data__testing",
+ tools: [
+ "cronet_aml_net_tools_transport_security_state_generator_transport_security_state_generator__testing",
+ ],
+ cmd: "$(location cronet_aml_net_tools_transport_security_state_generator_transport_security_state_generator__testing) " +
+ "$(location net/http/transport_security_state_static_unittest1.json) " +
+ "$(location net/http/transport_security_state_static_unittest.pins) " +
+ "$(location net/http/transport_security_state_static_unittest.template) " +
+ "$(location net/http/transport_security_state_static_unittest1.h) " +
+ "&& " +
+ "$(location cronet_aml_net_tools_transport_security_state_generator_transport_security_state_generator__testing) " +
+ "$(location net/http/transport_security_state_static_unittest2.json) " +
+ "$(location net/http/transport_security_state_static_unittest.pins) " +
+ "$(location net/http/transport_security_state_static_unittest.template) " +
+ "$(location net/http/transport_security_state_static_unittest2.h) " +
+ "&& " +
+ "$(location cronet_aml_net_tools_transport_security_state_generator_transport_security_state_generator__testing) " +
+ "$(location net/http/transport_security_state_static_unittest3.json) " +
+ "$(location net/http/transport_security_state_static_unittest.pins) " +
+ "$(location net/http/transport_security_state_static_unittest.template) " +
+ "$(location net/http/transport_security_state_static_unittest3.h)",
+ out: [
+ "net/http/transport_security_state_static_unittest1.h",
+ "net/http/transport_security_state_static_unittest2.h",
+ "net/http/transport_security_state_static_unittest3.h",
+ ],
+ tool_files: [
+ "build/gn_run_binary.py",
+ "net/http/transport_security_state_static_unittest.pins",
+ "net/http/transport_security_state_static_unittest.template",
+ "net/http/transport_security_state_static_unittest1.json",
+ "net/http/transport_security_state_static_unittest2.json",
+ "net/http/transport_security_state_static_unittest3.json",
+ ],
+ apex_available: [
+ "com.android.tethering",
+ ],
+}
+
// GN: //net/http:transport_security_state_unittest_data_default__testing
cc_genrule {
name: "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
@@ -14032,52 +12831,6 @@
],
}
-// GN: //net:ios_cronet_buildflags
-cc_genrule {
- name: "cronet_aml_net_ios_cronet_buildflags",
- cmd: "echo '--flags CRONET_BUILD=\"true\"' | " +
- "$(location build/write_buildflag_header.py) --output " +
- "$(out) " +
- "--rulename " +
- "//net:ios_cronet_buildflags " +
- "--gen-dir " +
- ". " +
- "--definitions " +
- "/dev/stdin",
- out: [
- "net/socket/ios_cronet_buildflags.h",
- ],
- tool_files: [
- "build/write_buildflag_header.py",
- ],
- apex_available: [
- "com.android.tethering",
- ],
-}
-
-// GN: //net:ios_cronet_buildflags__testing
-cc_genrule {
- name: "cronet_aml_net_ios_cronet_buildflags__testing",
- cmd: "echo '--flags CRONET_BUILD=\"true\"' | " +
- "$(location build/write_buildflag_header.py) --output " +
- "$(out) " +
- "--rulename " +
- "//net:ios_cronet_buildflags " +
- "--gen-dir " +
- ". " +
- "--definitions " +
- "/dev/stdin",
- out: [
- "net/socket/ios_cronet_buildflags.h",
- ],
- tool_files: [
- "build/write_buildflag_header.py",
- ],
- apex_available: [
- "com.android.tethering",
- ],
-}
-
// GN: //net:isolation_info_proto__testing
cc_genrule {
name: "cronet_aml_net_isolation_info_proto__testing_gen",
@@ -14164,6 +12917,12 @@
cc_library_static {
name: "cronet_aml_net_net",
srcs: [
+ ":cronet_aml_net_dns_dns",
+ ":cronet_aml_net_dns_public_public",
+ ":cronet_aml_net_http_transport_security_state_generated_files",
+ ":cronet_aml_net_net_deps",
+ ":cronet_aml_net_net_public_deps",
+ ":cronet_aml_net_traffic_annotation_traffic_annotation",
"net/android/android_http_util.cc",
"net/android/cert_verify_result_android.cc",
"net/android/gurl_utils.cc",
@@ -14658,68 +13417,12 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
"cronet_aml_crypto_crypto",
- "cronet_aml_net_dns_dns",
- "cronet_aml_net_dns_public_public",
- "cronet_aml_net_http_transport_security_state_generated_files",
- "cronet_aml_net_net_deps",
- "cronet_aml_net_net_public_deps",
"cronet_aml_net_preload_decoder",
"cronet_aml_net_third_party_quiche_quiche",
- "cronet_aml_net_traffic_annotation_traffic_annotation",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_brotli_common",
"cronet_aml_third_party_brotli_dec",
"cronet_aml_third_party_icu_icui18n",
@@ -14730,12 +13433,32 @@
"cronet_aml_url_url",
],
generated_headers: [
+ "cronet_aml_base_debugging_buildflags",
+ "cronet_aml_base_logging_buildflags",
+ "cronet_aml_build_branding_buildflags",
"cronet_aml_build_chromeos_buildflags",
- "cronet_aml_net_ios_cronet_buildflags",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
+ "cronet_aml_net_buildflags",
+ "cronet_aml_net_cronet_buildflags",
+ "cronet_aml_net_isolation_info_proto_gen_headers",
+ "cronet_aml_net_net_jni_headers",
+ "cronet_aml_net_net_nqe_proto_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
+ "cronet_aml_url_buildflags",
],
export_generated_headers: [
+ "cronet_aml_base_debugging_buildflags",
+ "cronet_aml_base_logging_buildflags",
+ "cronet_aml_build_branding_buildflags",
"cronet_aml_build_chromeos_buildflags",
- "cronet_aml_net_ios_cronet_buildflags",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
+ "cronet_aml_net_buildflags",
+ "cronet_aml_net_cronet_buildflags",
+ "cronet_aml_net_isolation_info_proto_gen_headers",
+ "cronet_aml_net_net_jni_headers",
+ "cronet_aml_net_net_nqe_proto_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
+ "cronet_aml_url_buildflags",
],
export_static_lib_headers: [
"cronet_aml_crypto_crypto",
@@ -14854,6 +13577,12 @@
cc_library_static {
name: "cronet_aml_net_net__testing",
srcs: [
+ ":cronet_aml_net_dns_dns__testing",
+ ":cronet_aml_net_dns_public_public__testing",
+ ":cronet_aml_net_http_transport_security_state_generated_files__testing",
+ ":cronet_aml_net_net_deps__testing",
+ ":cronet_aml_net_net_public_deps__testing",
+ ":cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"net/android/android_http_util.cc",
"net/android/cert_verify_result_android.cc",
"net/android/gurl_utils.cc",
@@ -15346,70 +14075,13 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -15420,12 +14092,32 @@
"cronet_aml_url_url__testing",
],
generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_branding_buildflags__testing",
"cronet_aml_build_chromeos_buildflags__testing",
- "cronet_aml_net_ios_cronet_buildflags__testing",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
+ "cronet_aml_net_buildflags__testing",
+ "cronet_aml_net_cronet_buildflags__testing",
+ "cronet_aml_net_isolation_info_proto__testing_gen_headers",
+ "cronet_aml_net_net_jni_headers__testing",
+ "cronet_aml_net_net_nqe_proto__testing_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
],
export_generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_branding_buildflags__testing",
"cronet_aml_build_chromeos_buildflags__testing",
- "cronet_aml_net_ios_cronet_buildflags__testing",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
+ "cronet_aml_net_buildflags__testing",
+ "cronet_aml_net_cronet_buildflags__testing",
+ "cronet_aml_net_isolation_info_proto__testing_gen_headers",
+ "cronet_aml_net_net_jni_headers__testing",
+ "cronet_aml_net_net_nqe_proto__testing_gen_headers",
+ "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
],
defaults: [
"cronet_aml_defaults",
@@ -15537,7 +14229,7 @@
}
// GN: //net:net_deps
-cc_library_static {
+cc_object {
name: "cronet_aml_net_net_deps",
srcs: [
":cronet_aml_net_isolation_info_proto_gen",
@@ -15554,59 +14246,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
"cronet_aml_net_preload_decoder",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_brotli_common",
"cronet_aml_third_party_brotli_dec",
"cronet_aml_third_party_icu_icui18n",
@@ -15624,15 +14266,6 @@
"cronet_aml_net_net_jni_headers",
"cronet_aml_url_buildflags",
],
- export_generated_headers: [
- "cronet_aml_base_debugging_buildflags",
- "cronet_aml_base_logging_buildflags",
- "cronet_aml_build_chromeos_buildflags",
- "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
- "cronet_aml_net_isolation_info_proto_gen_headers",
- "cronet_aml_net_net_jni_headers",
- "cronet_aml_url_buildflags",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -15679,27 +14312,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -15728,7 +14340,7 @@
}
// GN: //net:net_deps__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_net_deps__testing",
srcs: [
":cronet_aml_net_isolation_info_proto__testing_gen",
@@ -15743,61 +14355,10 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_net_preload_decoder__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -15815,15 +14376,6 @@
"cronet_aml_net_net_jni_headers__testing",
"cronet_aml_url_buildflags__testing",
],
- export_generated_headers: [
- "cronet_aml_base_debugging_buildflags__testing",
- "cronet_aml_base_logging_buildflags__testing",
- "cronet_aml_build_chromeos_buildflags__testing",
- "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
- "cronet_aml_net_isolation_info_proto__testing_gen_headers",
- "cronet_aml_net_net_jni_headers__testing",
- "cronet_aml_url_buildflags__testing",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -15870,27 +14422,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -16211,7 +14742,7 @@
}
// GN: //net:net_public_deps
-cc_library_static {
+cc_object {
name: "cronet_aml_net_net_public_deps",
srcs: [
":cronet_aml_net_net_nqe_proto_gen",
@@ -16229,62 +14760,11 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
"cronet_aml_crypto_crypto",
"cronet_aml_net_third_party_quiche_quiche",
- "cronet_aml_net_traffic_annotation_traffic_annotation",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -16293,11 +14773,7 @@
"cronet_aml_url_url",
],
generated_headers: [
- "cronet_aml_net_buildflags",
- "cronet_aml_net_net_nqe_proto_gen_headers",
- "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
- ],
- export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
"cronet_aml_net_buildflags",
"cronet_aml_net_net_nqe_proto_gen_headers",
"cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
@@ -16348,27 +14824,6 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -16397,7 +14852,7 @@
}
// GN: //net:net_public_deps__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_net_public_deps__testing",
srcs: [
":cronet_aml_net_net_nqe_proto__testing_gen",
@@ -16413,64 +14868,12 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -16479,11 +14882,7 @@
"cronet_aml_url_url__testing",
],
generated_headers: [
- "cronet_aml_net_buildflags__testing",
- "cronet_aml_net_net_nqe_proto__testing_gen_headers",
- "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers",
- ],
- export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
"cronet_aml_net_buildflags__testing",
"cronet_aml_net_net_nqe_proto__testing_gen_headers",
"cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers",
@@ -16534,6 +14933,627 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
+ target: {
+ android_arm: {
+ cflags: [
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ },
+}
+
+// GN: //net:net_test_jni_headers__testing
+cc_genrule {
+ name: "cronet_aml_net_net_test_jni_headers__testing",
+ srcs: [
+ "net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
+ "net/android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
+ "net/test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
+ "net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
+ "net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
+ ],
+ cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " +
+ "long " +
+ "--output_dir " +
+ "$(genDir)/net/net_test_jni_headers " +
+ "--includes " +
+ "base/android/jni_generator/jni_generator_helper.h " +
+ "--use_proxy_hash " +
+ "--output_name " +
+ "AndroidKeyStoreTestUtil_jni.h " +
+ "--output_name " +
+ "AndroidProxyConfigServiceTestUtil_jni.h " +
+ "--output_name " +
+ "AndroidNetworkLibraryTestUtil_jni.h " +
+ "--output_name " +
+ "DummySpnegoAuthenticator_jni.h " +
+ "--output_name " +
+ "EmbeddedTestServerImpl_jni.h " +
+ "--input_file " +
+ "$(location net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java) " +
+ "--input_file " +
+ "$(location net/android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java) " +
+ "--input_file " +
+ "$(location net/test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java) " +
+ "--input_file " +
+ "$(location net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java) " +
+ "--input_file " +
+ "$(location net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java)",
+ out: [
+ "net/net_test_jni_headers/AndroidKeyStoreTestUtil_jni.h",
+ "net/net_test_jni_headers/AndroidNetworkLibraryTestUtil_jni.h",
+ "net/net_test_jni_headers/AndroidProxyConfigServiceTestUtil_jni.h",
+ "net/net_test_jni_headers/DummySpnegoAuthenticator_jni.h",
+ "net/net_test_jni_headers/EmbeddedTestServerImpl_jni.h",
+ ],
+ tool_files: [
+ "base/android/jni_generator/android_jar.classes",
+ "base/android/jni_generator/jni_generator.py",
+ "build/android/gyp/util/__init__.py",
+ "build/android/gyp/util/build_utils.py",
+ "build/gn_helpers.py",
+ ],
+ apex_available: [
+ "com.android.tethering",
+ ],
+}
+
+// GN: //net:net_unittests__library__testing
+cc_library_shared {
+ name: "cronet_aml_net_net_unittests__library__testing",
+ srcs: [
+ ":cronet_aml_buildtools_third_party_libc___libc____testing",
+ ":cronet_aml_buildtools_third_party_libc__abi_libc__abi__testing",
+ ":cronet_aml_net_dns_public_tests__testing",
+ ":cronet_aml_net_dns_tests__testing",
+ ":cronet_aml_net_quic_test_flags_utils__testing",
+ ":cronet_aml_net_quic_test_tools__testing",
+ ":cronet_aml_net_simple_quic_tools__testing",
+ ":cronet_aml_net_spdy_test_tools__testing",
+ ":cronet_aml_net_third_party_quiche_quiche_tests__testing",
+ ":cronet_aml_net_tools_huffman_trie_huffman_trie_generator_sources__testing",
+ ":cronet_aml_testing_android_native_test_native_test_native_code__testing",
+ ":cronet_aml_testing_android_native_test_native_test_support__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
+ ":cronet_aml_third_party_googletest_gmock__testing",
+ ":cronet_aml_third_party_googletest_gtest__testing",
+ "net/android/dummy_spnego_authenticator.cc",
+ "net/android/http_auth_negotiate_android_unittest.cc",
+ "net/android/network_change_notifier_android_unittest.cc",
+ "net/android/network_library_unittest.cc",
+ "net/android/traffic_stats_unittest.cc",
+ "net/base/address_family_unittest.cc",
+ "net/base/address_list_unittest.cc",
+ "net/base/address_tracker_linux_unittest.cc",
+ "net/base/backoff_entry_serializer_unittest.cc",
+ "net/base/backoff_entry_unittest.cc",
+ "net/base/chunked_upload_data_stream_unittest.cc",
+ "net/base/data_url_unittest.cc",
+ "net/base/datagram_buffer_unittest.cc",
+ "net/base/elements_upload_data_stream_unittest.cc",
+ "net/base/expiring_cache_unittest.cc",
+ "net/base/file_stream_unittest.cc",
+ "net/base/host_mapping_rules_unittest.cc",
+ "net/base/host_port_pair_unittest.cc",
+ "net/base/interval_test.cc",
+ "net/base/ip_address_unittest.cc",
+ "net/base/ip_endpoint_unittest.cc",
+ "net/base/isolation_info_unittest.cc",
+ "net/base/lookup_string_in_fixed_set_unittest.cc",
+ "net/base/mime_sniffer_unittest.cc",
+ "net/base/mime_util_unittest.cc",
+ "net/base/net_errors_unittest.cc",
+ "net/base/net_string_util_unittest.cc",
+ "net/base/network_activity_monitor_unittest.cc",
+ "net/base/network_anonymization_key_unittest.cc",
+ "net/base/network_change_notifier_posix_unittest.cc",
+ "net/base/network_change_notifier_unittest.cc",
+ "net/base/network_delegate_unittest.cc",
+ "net/base/network_interfaces_getifaddrs_unittest.cc",
+ "net/base/network_interfaces_linux_unittest.cc",
+ "net/base/network_interfaces_unittest.cc",
+ "net/base/network_isolation_key_unittest.cc",
+ "net/base/parse_number_unittest.cc",
+ "net/base/port_util_unittest.cc",
+ "net/base/prioritized_dispatcher_unittest.cc",
+ "net/base/prioritized_task_runner_unittest.cc",
+ "net/base/priority_queue_unittest.cc",
+ "net/base/proxy_server_unittest.cc",
+ "net/base/proxy_string_util_unittest.cc",
+ "net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc",
+ "net/base/scheme_host_port_matcher_rule_unittest.cc",
+ "net/base/scheme_host_port_matcher_unittest.cc",
+ "net/base/schemeful_site_unittest.cc",
+ "net/base/sockaddr_util_posix_unittest.cc",
+ "net/base/test_completion_callback_unittest.cc",
+ "net/base/test_proxy_delegate.cc",
+ "net/base/upload_bytes_element_reader_unittest.cc",
+ "net/base/upload_file_element_reader_unittest.cc",
+ "net/cert/caching_cert_verifier_unittest.cc",
+ "net/cert/cert_and_ct_verifier_unittest.cc",
+ "net/cert/cert_verifier_unittest.cc",
+ "net/cert/cert_verify_proc_android_unittest.cc",
+ "net/cert/cert_verify_proc_builtin_unittest.cc",
+ "net/cert/cert_verify_proc_unittest.cc",
+ "net/cert/coalescing_cert_verifier_unittest.cc",
+ "net/cert/crl_set_unittest.cc",
+ "net/cert/ct_log_response_parser_unittest.cc",
+ "net/cert/ct_log_verifier_unittest.cc",
+ "net/cert/ct_objects_extractor_unittest.cc",
+ "net/cert/ct_serialization_unittest.cc",
+ "net/cert/ev_root_ca_metadata_unittest.cc",
+ "net/cert/internal/cert_issuer_source_aia_unittest.cc",
+ "net/cert/internal/cert_issuer_source_sync_unittest.cc",
+ "net/cert/internal/crl_unittest.cc",
+ "net/cert/internal/general_names_unittest.cc",
+ "net/cert/internal/revocation_checker_unittest.cc",
+ "net/cert/internal/revocation_util_unittest.cc",
+ "net/cert/internal/system_trust_store_unittest.cc",
+ "net/cert/known_roots_unittest.cc",
+ "net/cert/merkle_audit_proof_unittest.cc",
+ "net/cert/merkle_tree_leaf_unittest.cc",
+ "net/cert/multi_log_ct_verifier_unittest.cc",
+ "net/cert/multi_threaded_cert_verifier_unittest.cc",
+ "net/cert/pem_unittest.cc",
+ "net/cert/pki/cert_issuer_source_static_unittest.cc",
+ "net/cert/pki/certificate_policies_unittest.cc",
+ "net/cert/pki/extended_key_usage_unittest.cc",
+ "net/cert/pki/name_constraints_unittest.cc",
+ "net/cert/pki/nist_pkits_unittest.cc",
+ "net/cert/pki/ocsp_unittest.cc",
+ "net/cert/pki/parse_certificate_unittest.cc",
+ "net/cert/pki/parse_name_unittest.cc",
+ "net/cert/pki/parsed_certificate_unittest.cc",
+ "net/cert/pki/path_builder_pkits_unittest.cc",
+ "net/cert/pki/path_builder_unittest.cc",
+ "net/cert/pki/path_builder_verify_certificate_chain_unittest.cc",
+ "net/cert/pki/signature_algorithm_unittest.cc",
+ "net/cert/pki/simple_path_builder_delegate_unittest.cc",
+ "net/cert/pki/string_util_unittest.cc",
+ "net/cert/pki/test_helpers.cc",
+ "net/cert/pki/trust_store_collection_unittest.cc",
+ "net/cert/pki/verify_certificate_chain_pkits_unittest.cc",
+ "net/cert/pki/verify_certificate_chain_unittest.cc",
+ "net/cert/pki/verify_name_match_unittest.cc",
+ "net/cert/pki/verify_signed_data_unittest.cc",
+ "net/cert/signed_certificate_timestamp_unittest.cc",
+ "net/cert/symantec_certs_unittest.cc",
+ "net/cert/test_root_certs_unittest.cc",
+ "net/cert/x509_cert_types_unittest.cc",
+ "net/cert/x509_util_unittest.cc",
+ "net/cert_net/cert_net_fetcher_url_request_unittest.cc",
+ "net/cookies/canonical_cookie_unittest.cc",
+ "net/cookies/cookie_constants_unittest.cc",
+ "net/cookies/cookie_deletion_info_unittest.cc",
+ "net/cookies/cookie_inclusion_status_unittest.cc",
+ "net/cookies/cookie_monster_unittest.cc",
+ "net/cookies/cookie_options_unittest.cc",
+ "net/cookies/cookie_partition_key_collection_unittest.cc",
+ "net/cookies/cookie_partition_key_unittest.cc",
+ "net/cookies/cookie_util_unittest.cc",
+ "net/cookies/parsed_cookie_unittest.cc",
+ "net/cookies/site_for_cookies_unittest.cc",
+ "net/cookies/static_cookie_policy_unittest.cc",
+ "net/der/encode_values_unittest.cc",
+ "net/der/input_unittest.cc",
+ "net/der/parse_values_unittest.cc",
+ "net/der/parser_unittest.cc",
+ "net/disk_cache/backend_cleanup_tracker_unittest.cc",
+ "net/disk_cache/backend_unittest.cc",
+ "net/disk_cache/blockfile/addr_unittest.cc",
+ "net/disk_cache/blockfile/bitmap_unittest.cc",
+ "net/disk_cache/blockfile/block_files_unittest.cc",
+ "net/disk_cache/blockfile/mapped_file_unittest.cc",
+ "net/disk_cache/blockfile/stats_unittest.cc",
+ "net/disk_cache/blockfile/storage_block_unittest.cc",
+ "net/disk_cache/cache_util_unittest.cc",
+ "net/disk_cache/entry_unittest.cc",
+ "net/disk_cache/simple/simple_file_enumerator_unittest.cc",
+ "net/disk_cache/simple/simple_file_tracker_unittest.cc",
+ "net/disk_cache/simple/simple_index_file_unittest.cc",
+ "net/disk_cache/simple/simple_index_unittest.cc",
+ "net/disk_cache/simple/simple_test_util.cc",
+ "net/disk_cache/simple/simple_util_unittest.cc",
+ "net/disk_cache/simple/simple_version_upgrade_unittest.cc",
+ "net/filter/brotli_source_stream_unittest.cc",
+ "net/filter/filter_source_stream_unittest.cc",
+ "net/filter/gzip_source_stream_unittest.cc",
+ "net/first_party_sets/addition_overlaps_union_find_unittest.cc",
+ "net/first_party_sets/first_party_sets_cache_filter_unittest.cc",
+ "net/first_party_sets/first_party_sets_context_config_unittest.cc",
+ "net/first_party_sets/global_first_party_sets_unittest.cc",
+ "net/http/alternative_service_unittest.cc",
+ "net/http/bidirectional_stream_unittest.cc",
+ "net/http/broken_alternative_services_unittest.cc",
+ "net/http/http_auth_cache_unittest.cc",
+ "net/http/http_auth_challenge_tokenizer_unittest.cc",
+ "net/http/http_auth_controller_unittest.cc",
+ "net/http/http_auth_filter_unittest.cc",
+ "net/http/http_auth_handler_basic_unittest.cc",
+ "net/http/http_auth_handler_digest_unittest.cc",
+ "net/http/http_auth_handler_factory_unittest.cc",
+ "net/http/http_auth_handler_mock.cc",
+ "net/http/http_auth_handler_negotiate_unittest.cc",
+ "net/http/http_auth_handler_ntlm_portable_unittest.cc",
+ "net/http/http_auth_handler_unittest.cc",
+ "net/http/http_auth_multi_round_parse_unittest.cc",
+ "net/http/http_auth_preferences_unittest.cc",
+ "net/http/http_auth_unittest.cc",
+ "net/http/http_basic_state_unittest.cc",
+ "net/http/http_byte_range_unittest.cc",
+ "net/http/http_cache_lookup_manager_unittest.cc",
+ "net/http/http_cache_unittest.cc",
+ "net/http/http_cache_writers_unittest.cc",
+ "net/http/http_chunked_decoder_unittest.cc",
+ "net/http/http_content_disposition_unittest.cc",
+ "net/http/http_log_util_unittest.cc",
+ "net/http/http_network_layer_unittest.cc",
+ "net/http/http_network_transaction_unittest.cc",
+ "net/http/http_proxy_client_socket_unittest.cc",
+ "net/http/http_proxy_connect_job_unittest.cc",
+ "net/http/http_request_headers_unittest.cc",
+ "net/http/http_request_info_unittest.cc",
+ "net/http/http_response_body_drainer_unittest.cc",
+ "net/http/http_response_headers_unittest.cc",
+ "net/http/http_response_info_unittest.cc",
+ "net/http/http_security_headers_unittest.cc",
+ "net/http/http_server_properties_manager_unittest.cc",
+ "net/http/http_server_properties_unittest.cc",
+ "net/http/http_status_code_unittest.cc",
+ "net/http/http_stream_factory_job_controller_unittest.cc",
+ "net/http/http_stream_factory_unittest.cc",
+ "net/http/http_stream_parser_unittest.cc",
+ "net/http/http_stream_request_unittest.cc",
+ "net/http/http_util_unittest.cc",
+ "net/http/http_vary_data_unittest.cc",
+ "net/http/mock_allow_http_auth_preferences.cc",
+ "net/http/test_upload_data_stream_not_allow_http1.cc",
+ "net/http/transport_security_persister_unittest.cc",
+ "net/http/transport_security_state_unittest.cc",
+ "net/http/url_security_manager_unittest.cc",
+ "net/http/webfonts_histogram_unittest.cc",
+ "net/log/file_net_log_observer_unittest.cc",
+ "net/log/net_log_capture_mode_unittest.cc",
+ "net/log/net_log_unittest.cc",
+ "net/log/net_log_util_unittest.cc",
+ "net/log/net_log_values_unittest.cc",
+ "net/network_error_logging/mock_persistent_nel_store_unittest.cc",
+ "net/network_error_logging/network_error_logging_service_unittest.cc",
+ "net/nqe/effective_connection_type_unittest.cc",
+ "net/nqe/event_creator_unittest.cc",
+ "net/nqe/network_id_unittest.cc",
+ "net/nqe/network_qualities_prefs_manager_unittest.cc",
+ "net/nqe/network_quality_estimator_params_unittest.cc",
+ "net/nqe/network_quality_estimator_unittest.cc",
+ "net/nqe/network_quality_estimator_util_unittest.cc",
+ "net/nqe/network_quality_store_unittest.cc",
+ "net/nqe/observation_buffer_unittest.cc",
+ "net/nqe/socket_watcher_unittest.cc",
+ "net/nqe/throughput_analyzer_unittest.cc",
+ "net/ntlm/ntlm_buffer_reader_unittest.cc",
+ "net/ntlm/ntlm_buffer_writer_unittest.cc",
+ "net/ntlm/ntlm_client_unittest.cc",
+ "net/ntlm/ntlm_unittest.cc",
+ "net/proxy_resolution/configured_proxy_resolution_service_unittest.cc",
+ "net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc",
+ "net/proxy_resolution/network_delegate_error_observer_unittest.cc",
+ "net/proxy_resolution/pac_file_decider_unittest.cc",
+ "net/proxy_resolution/pac_file_fetcher_impl_unittest.cc",
+ "net/proxy_resolution/proxy_bypass_rules_unittest.cc",
+ "net/proxy_resolution/proxy_config_service_android_unittest.cc",
+ "net/proxy_resolution/proxy_config_unittest.cc",
+ "net/proxy_resolution/proxy_info_unittest.cc",
+ "net/proxy_resolution/proxy_list_unittest.cc",
+ "net/quic/bidirectional_stream_quic_impl_unittest.cc",
+ "net/quic/crypto/proof_test_chromium.cc",
+ "net/quic/crypto/proof_verifier_chromium_test.cc",
+ "net/quic/dedicated_web_transport_http3_client_test.cc",
+ "net/quic/mock_quic_data.cc",
+ "net/quic/network_connection_unittest.cc",
+ "net/quic/platform/impl/quic_chromium_clock_test.cc",
+ "net/quic/properties_based_quic_server_info_test.cc",
+ "net/quic/quic_address_mismatch_test.cc",
+ "net/quic/quic_chromium_alarm_factory_test.cc",
+ "net/quic/quic_chromium_client_session_peer.cc",
+ "net/quic/quic_chromium_client_session_test.cc",
+ "net/quic/quic_chromium_client_stream_test.cc",
+ "net/quic/quic_chromium_connection_helper_test.cc",
+ "net/quic/quic_clock_skew_detector_test.cc",
+ "net/quic/quic_end_to_end_unittest.cc",
+ "net/quic/quic_http_stream_test.cc",
+ "net/quic/quic_http_utils_test.cc",
+ "net/quic/quic_network_transaction_unittest.cc",
+ "net/quic/quic_proxy_client_socket_unittest.cc",
+ "net/quic/quic_stream_factory_peer.cc",
+ "net/quic/quic_stream_factory_test.cc",
+ "net/quic/quic_test_packet_maker.cc",
+ "net/quic/set_quic_flag_test.cc",
+ "net/quic/test_quic_crypto_client_config_handle.cc",
+ "net/reporting/mock_persistent_reporting_store_unittest.cc",
+ "net/reporting/reporting_browsing_data_remover_unittest.cc",
+ "net/reporting/reporting_cache_unittest.cc",
+ "net/reporting/reporting_delivery_agent_unittest.cc",
+ "net/reporting/reporting_endpoint_manager_unittest.cc",
+ "net/reporting/reporting_garbage_collector_unittest.cc",
+ "net/reporting/reporting_header_parser_unittest.cc",
+ "net/reporting/reporting_network_change_observer_unittest.cc",
+ "net/reporting/reporting_service_unittest.cc",
+ "net/reporting/reporting_uploader_unittest.cc",
+ "net/socket/client_socket_pool_base_unittest.cc",
+ "net/socket/client_socket_pool_unittest.cc",
+ "net/socket/connect_job_factory_unittest.cc",
+ "net/socket/connect_job_test_util.cc",
+ "net/socket/connect_job_unittest.cc",
+ "net/socket/mock_client_socket_pool_manager.cc",
+ "net/socket/sequenced_socket_data_unittest.cc",
+ "net/socket/socket_bio_adapter_unittest.cc",
+ "net/socket/socket_tag_unittest.cc",
+ "net/socket/socks5_client_socket_unittest.cc",
+ "net/socket/socks_client_socket_unittest.cc",
+ "net/socket/socks_connect_job_unittest.cc",
+ "net/socket/ssl_client_socket_unittest.cc",
+ "net/socket/ssl_connect_job_unittest.cc",
+ "net/socket/ssl_server_socket_unittest.cc",
+ "net/socket/tcp_client_socket_unittest.cc",
+ "net/socket/tcp_server_socket_unittest.cc",
+ "net/socket/tcp_socket_unittest.cc",
+ "net/socket/transport_client_socket_pool_test_util.cc",
+ "net/socket/transport_client_socket_pool_unittest.cc",
+ "net/socket/transport_client_socket_unittest.cc",
+ "net/socket/transport_connect_job_unittest.cc",
+ "net/socket/udp_socket_unittest.cc",
+ "net/socket/unix_domain_client_socket_posix_unittest.cc",
+ "net/socket/unix_domain_server_socket_posix_unittest.cc",
+ "net/socket/websocket_endpoint_lock_manager_unittest.cc",
+ "net/socket/websocket_transport_client_socket_pool_unittest.cc",
+ "net/spdy/alps_decoder_test.cc",
+ "net/spdy/bidirectional_stream_spdy_impl_unittest.cc",
+ "net/spdy/buffered_spdy_framer_unittest.cc",
+ "net/spdy/fuzzing/hpack_fuzz_util_test.cc",
+ "net/spdy/header_coalescer_test.cc",
+ "net/spdy/http2_priority_dependencies_unittest.cc",
+ "net/spdy/http2_push_promise_index_test.cc",
+ "net/spdy/spdy_buffer_unittest.cc",
+ "net/spdy/spdy_http_stream_unittest.cc",
+ "net/spdy/spdy_http_utils_unittest.cc",
+ "net/spdy/spdy_log_util_unittest.cc",
+ "net/spdy/spdy_network_transaction_unittest.cc",
+ "net/spdy/spdy_proxy_client_socket_unittest.cc",
+ "net/spdy/spdy_read_queue_unittest.cc",
+ "net/spdy/spdy_session_pool_unittest.cc",
+ "net/spdy/spdy_session_test_util.cc",
+ "net/spdy/spdy_session_unittest.cc",
+ "net/spdy/spdy_stream_test_util.cc",
+ "net/spdy/spdy_stream_unittest.cc",
+ "net/spdy/spdy_write_queue_unittest.cc",
+ "net/ssl/client_cert_identity_unittest.cc",
+ "net/ssl/ssl_cipher_suite_names_unittest.cc",
+ "net/ssl/ssl_client_auth_cache_unittest.cc",
+ "net/ssl/ssl_client_session_cache_unittest.cc",
+ "net/ssl/ssl_config_service_unittest.cc",
+ "net/ssl/ssl_config_unittest.cc",
+ "net/ssl/ssl_connection_status_flags_unittest.cc",
+ "net/ssl/ssl_platform_key_android_unittest.cc",
+ "net/ssl/ssl_platform_key_util_unittest.cc",
+ "net/test/embedded_test_server/embedded_test_server_unittest.cc",
+ "net/test/embedded_test_server/http_request_unittest.cc",
+ "net/test/embedded_test_server/http_response_unittest.cc",
+ "net/test/run_all_unittests.cc",
+ "net/third_party/uri_template/uri_template_test.cc",
+ "net/tools/content_decoder_tool/content_decoder_tool.cc",
+ "net/tools/content_decoder_tool/content_decoder_tool_unittest.cc",
+ "net/tools/quic/quic_simple_client_test.cc",
+ "net/tools/tld_cleanup/tld_cleanup_util_unittest.cc",
+ "net/url_request/http_with_dns_over_https_unittest.cc",
+ "net/url_request/redirect_info_unittest.cc",
+ "net/url_request/redirect_util_unittest.cc",
+ "net/url_request/report_sender_unittest.cc",
+ "net/url_request/url_request_context_builder_unittest.cc",
+ "net/url_request/url_request_filter_unittest.cc",
+ "net/url_request/url_request_http_job_unittest.cc",
+ "net/url_request/url_request_job_factory_unittest.cc",
+ "net/url_request/url_request_quic_unittest.cc",
+ "net/url_request/url_request_throttler_simulation_unittest.cc",
+ "net/url_request/url_request_throttler_test_support.cc",
+ "net/url_request/url_request_throttler_unittest.cc",
+ "net/url_request/url_request_unittest.cc",
+ "net/url_request/view_cache_helper_unittest.cc",
+ ],
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ "libz",
+ ],
+ static_libs: [
+ "cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
+ "cronet_aml_base_base__testing",
+ "cronet_aml_base_base_static__testing",
+ "cronet_aml_base_i18n__testing",
+ "cronet_aml_base_test_test_config__testing",
+ "cronet_aml_base_test_test_support__testing",
+ "cronet_aml_base_third_party_double_conversion_double_conversion__testing",
+ "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
+ "cronet_aml_crypto_crypto__testing",
+ "cronet_aml_crypto_test_support__testing",
+ "cronet_aml_net_gtest_util__testing",
+ "cronet_aml_net_net__testing",
+ "cronet_aml_net_preload_decoder__testing",
+ "cronet_aml_net_test_support__testing",
+ "cronet_aml_net_third_party_quiche_quiche__testing",
+ "cronet_aml_net_third_party_quiche_quiche_test_support__testing",
+ "cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
+ "cronet_aml_net_uri_template__testing",
+ "cronet_aml_testing_gtest_gtest__testing",
+ "cronet_aml_third_party_boringssl_boringssl__testing",
+ "cronet_aml_third_party_brotli_common__testing",
+ "cronet_aml_third_party_brotli_dec__testing",
+ "cronet_aml_third_party_ced_ced__testing",
+ "cronet_aml_third_party_icu_icui18n__testing",
+ "cronet_aml_third_party_icu_icuuc_private__testing",
+ "cronet_aml_third_party_libevent_libevent__testing",
+ "cronet_aml_third_party_libxml_libxml__testing",
+ "cronet_aml_third_party_libxml_libxml_utils__testing",
+ "cronet_aml_third_party_libxml_xml_reader__testing",
+ "cronet_aml_third_party_modp_b64_modp_b64__testing",
+ "cronet_aml_third_party_protobuf_protobuf_lite__testing",
+ "cronet_aml_url_url__testing",
+ ],
+ generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_net_base_registry_controlled_domains_lookup_strings_test_sets__testing",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
+ "cronet_aml_net_http_transport_security_state_unittest_data__testing",
+ "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
+ "cronet_aml_net_net_test_jni_headers__testing",
+ "cronet_aml_testing_android_native_test_native_test_jni_headers__testing",
+ "cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
+ ],
+ export_generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_net_base_registry_controlled_domains_lookup_strings_test_sets__testing",
+ "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing",
+ "cronet_aml_net_http_transport_security_state_unittest_data__testing",
+ "cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
+ "cronet_aml_net_net_test_jni_headers__testing",
+ "cronet_aml_testing_android_native_test_native_test_jni_headers__testing",
+ "cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers",
+ "cronet_aml_url_buildflags__testing",
+ ],
+ defaults: [
+ "cronet_aml_defaults",
+ ],
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
+ "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+ "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
+ "-DGOOGLE_PROTOBUF_NO_RTTI",
+ "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+ "-DGTEST_API_=",
+ "-DGTEST_HAS_ABSL=1",
+ "-DGTEST_HAS_POSIX_RE=0",
+ "-DGTEST_HAS_TR1_TUPLE=0",
+ "-DGTEST_LANG_CXX11=1",
+ "-DHAVE_PTHREAD",
+ "-DHAVE_SYS_UIO_H",
+ "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
+ "-DNDEBUG",
+ "-DNO_UNWIND_TABLES",
+ "-DNVALGRIND",
+ "-DOFFICIAL_BUILD",
+ "-DUNIT_TEST",
+ "-DUSE_CHROMIUM_ICU=1",
+ "-DUSE_REMOTE_TEST_SERVER",
+ "-DU_ENABLE_DYLOAD=0",
+ "-DU_ENABLE_RESOURCE_TRACING=0",
+ "-DU_ENABLE_TRACING=1",
+ "-DU_STATIC_IMPLEMENTATION",
+ "-DU_USING_ICU_NAMESPACE=0",
+ "-D_FORTIFY_SOURCE=2",
+ "-D_GNU_SOURCE",
+ "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D__STDC_CONSTANT_MACROS",
+ "-D__STDC_FORMAT_MACROS",
+ "-Oz",
+ "-fdata-sections",
+ "-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
+ "-fvisibility-inlines-hidden",
+ "-fvisibility=hidden",
+ "-g1",
+ ],
+ local_include_dirs: [
+ "./",
+ "buildtools/third_party/libc++/",
+ "buildtools/third_party/libc++/trunk/include",
+ "buildtools/third_party/libc++abi/trunk/include",
+ "net/third_party/quiche/overrides/",
+ "net/third_party/quiche/src/",
+ "net/third_party/quiche/src/quiche/common/platform/default/",
+ "third_party/abseil-cpp/",
+ "third_party/boringssl/src/include/",
+ "third_party/ced/src/",
+ "third_party/googletest/custom/",
+ "third_party/googletest/src/googlemock/include/",
+ "third_party/googletest/src/googletest/include/",
+ "third_party/icu/source/common/",
+ "third_party/icu/source/i18n/",
+ "third_party/protobuf/src/",
+ ],
+ cpp_std: "c++17",
ldflags: [
"-Wl,--as-needed",
"-Wl,--gc-sections",
@@ -16555,6 +15575,7 @@
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
+ stem: "libnet_unittests__library",
target: {
android_arm: {
cflags: [
@@ -16598,58 +15619,8 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -16755,60 +15726,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -16901,7 +15821,7 @@
}
// GN: //net:quic_test_flags_utils__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_quic_test_flags_utils__testing",
srcs: [
"net/quic/platform/impl/quic_test_flags_utils.cc",
@@ -16915,71 +15835,14 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -17035,27 +15898,156 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
+ target: {
+ android_arm: {
+ cflags: [
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ },
+}
+
+// GN: //net:quic_test_tools__testing
+cc_object {
+ name: "cronet_aml_net_quic_test_tools__testing",
+ srcs: [
+ ":cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen",
+ "net/quic/crypto_test_utils_chromium.cc",
+ "net/quic/mock_crypto_client_stream.cc",
+ "net/quic/mock_crypto_client_stream_factory.cc",
+ "net/quic/mock_decrypter.cc",
+ "net/quic/mock_encrypter.cc",
+ "net/quic/mock_quic_context.cc",
+ "net/quic/test_task_runner.cc",
],
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ "libprotobuf-cpp-lite",
+ "libz",
+ ],
+ static_libs: [
+ "cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
+ "cronet_aml_base_base__testing",
+ "cronet_aml_base_base_static__testing",
+ "cronet_aml_base_i18n__testing",
+ "cronet_aml_base_test_test_config__testing",
+ "cronet_aml_base_test_test_support__testing",
+ "cronet_aml_base_third_party_double_conversion_double_conversion__testing",
+ "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
+ "cronet_aml_crypto_crypto__testing",
+ "cronet_aml_crypto_test_support__testing",
+ "cronet_aml_net_gtest_util__testing",
+ "cronet_aml_net_net__testing",
+ "cronet_aml_net_preload_decoder__testing",
+ "cronet_aml_net_test_support__testing",
+ "cronet_aml_net_third_party_quiche_quiche__testing",
+ "cronet_aml_net_third_party_quiche_quiche_test_support__testing",
+ "cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
+ "cronet_aml_net_uri_template__testing",
+ "cronet_aml_testing_gtest_gtest__testing",
+ "cronet_aml_third_party_boringssl_boringssl__testing",
+ "cronet_aml_third_party_brotli_common__testing",
+ "cronet_aml_third_party_brotli_dec__testing",
+ "cronet_aml_third_party_ced_ced__testing",
+ "cronet_aml_third_party_icu_icui18n__testing",
+ "cronet_aml_third_party_icu_icuuc_private__testing",
+ "cronet_aml_third_party_libevent_libevent__testing",
+ "cronet_aml_third_party_libxml_libxml__testing",
+ "cronet_aml_third_party_libxml_libxml_utils__testing",
+ "cronet_aml_third_party_libxml_xml_reader__testing",
+ "cronet_aml_third_party_modp_b64_modp_b64__testing",
+ "cronet_aml_third_party_protobuf_protobuf_lite__testing",
+ "cronet_aml_url_url__testing",
+ ],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers",
+ ],
+ defaults: [
+ "cronet_aml_defaults",
+ ],
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
+ "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+ "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
+ "-DGOOGLE_PROTOBUF_NO_RTTI",
+ "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+ "-DGTEST_API_=",
+ "-DGTEST_HAS_ABSL=1",
+ "-DGTEST_HAS_POSIX_RE=0",
+ "-DGTEST_HAS_TR1_TUPLE=0",
+ "-DGTEST_LANG_CXX11=1",
+ "-DHAVE_PTHREAD",
+ "-DHAVE_SYS_UIO_H",
+ "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
+ "-DNDEBUG",
+ "-DNO_UNWIND_TABLES",
+ "-DNVALGRIND",
+ "-DOFFICIAL_BUILD",
+ "-DUNIT_TEST",
+ "-DUSE_CHROMIUM_ICU=1",
+ "-DUSE_REMOTE_TEST_SERVER",
+ "-DU_ENABLE_DYLOAD=0",
+ "-DU_ENABLE_RESOURCE_TRACING=0",
+ "-DU_ENABLE_TRACING=1",
+ "-DU_STATIC_IMPLEMENTATION",
+ "-DU_USING_ICU_NAMESPACE=0",
+ "-D_FORTIFY_SOURCE=2",
+ "-D_GNU_SOURCE",
+ "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D__STDC_CONSTANT_MACROS",
+ "-D__STDC_FORMAT_MACROS",
+ "-Oz",
+ "-fdata-sections",
+ "-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
+ "-fvisibility-inlines-hidden",
+ "-fvisibility=hidden",
+ "-g1",
+ ],
+ local_include_dirs: [
+ "./",
+ "buildtools/third_party/libc++/",
+ "buildtools/third_party/libc++/trunk/include",
+ "buildtools/third_party/libc++abi/trunk/include",
+ "net/third_party/quiche/overrides/",
+ "net/third_party/quiche/src/",
+ "net/third_party/quiche/src/quiche/common/platform/default/",
+ "third_party/abseil-cpp/",
+ "third_party/boringssl/src/include/",
+ "third_party/ced/src/",
+ "third_party/googletest/custom/",
+ "third_party/googletest/src/googlemock/include/",
+ "third_party/googletest/src/googletest/include/",
+ "third_party/icu/source/common/",
+ "third_party/icu/source/i18n/",
+ "third_party/protobuf/src/",
+ ],
+ cpp_std: "c++17",
target: {
android_arm: {
cflags: [
@@ -17084,7 +16076,7 @@
}
// GN: //net:simple_quic_tools__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_simple_quic_tools__testing",
srcs: [
"net/tools/quic/quic_client_message_loop_network_helper.cc",
@@ -17104,72 +16096,15 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
"cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -17225,27 +16160,124 @@
"third_party/protobuf/src/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
+ target: {
+ android_arm: {
+ cflags: [
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ },
+}
+
+// GN: //net:spdy_test_tools__testing
+cc_object {
+ name: "cronet_aml_net_spdy_test_tools__testing",
+ srcs: [
+ "net/spdy/fuzzing/hpack_fuzz_util.cc",
],
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ "libz",
+ ],
+ static_libs: [
+ "cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
+ "cronet_aml_base_base__testing",
+ "cronet_aml_base_base_static__testing",
+ "cronet_aml_base_third_party_double_conversion_double_conversion__testing",
+ "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
+ "cronet_aml_crypto_crypto__testing",
+ "cronet_aml_net_net__testing",
+ "cronet_aml_net_preload_decoder__testing",
+ "cronet_aml_net_third_party_quiche_quiche__testing",
+ "cronet_aml_net_uri_template__testing",
+ "cronet_aml_testing_gtest_gtest__testing",
+ "cronet_aml_third_party_boringssl_boringssl__testing",
+ "cronet_aml_third_party_brotli_common__testing",
+ "cronet_aml_third_party_brotli_dec__testing",
+ "cronet_aml_third_party_icu_icui18n__testing",
+ "cronet_aml_third_party_icu_icuuc_private__testing",
+ "cronet_aml_third_party_libevent_libevent__testing",
+ "cronet_aml_third_party_modp_b64_modp_b64__testing",
+ "cronet_aml_third_party_protobuf_protobuf_lite__testing",
+ "cronet_aml_url_url__testing",
+ ],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
+ defaults: [
+ "cronet_aml_defaults",
+ ],
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
+ "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+ "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
+ "-DGOOGLE_PROTOBUF_NO_RTTI",
+ "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+ "-DGTEST_API_=",
+ "-DGTEST_HAS_ABSL=1",
+ "-DGTEST_HAS_POSIX_RE=0",
+ "-DGTEST_HAS_TR1_TUPLE=0",
+ "-DGTEST_LANG_CXX11=1",
+ "-DHAVE_PTHREAD",
+ "-DHAVE_SYS_UIO_H",
+ "-DNDEBUG",
+ "-DNO_UNWIND_TABLES",
+ "-DNVALGRIND",
+ "-DOFFICIAL_BUILD",
+ "-DUNIT_TEST",
+ "-D_FORTIFY_SOURCE=2",
+ "-D_GNU_SOURCE",
+ "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D__STDC_CONSTANT_MACROS",
+ "-D__STDC_FORMAT_MACROS",
+ "-Oz",
+ "-fdata-sections",
+ "-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
+ "-fvisibility-inlines-hidden",
+ "-fvisibility=hidden",
+ "-g1",
+ ],
+ local_include_dirs: [
+ "./",
+ "buildtools/third_party/libc++/",
+ "buildtools/third_party/libc++/trunk/include",
+ "buildtools/third_party/libc++abi/trunk/include",
+ "net/third_party/quiche/overrides/",
+ "net/third_party/quiche/src/",
+ "net/third_party/quiche/src/quiche/common/platform/default/",
+ "third_party/abseil-cpp/",
+ "third_party/boringssl/src/include/",
+ "third_party/googletest/custom/",
+ "third_party/googletest/src/googlemock/include/",
+ "third_party/googletest/src/googletest/include/",
+ "third_party/protobuf/src/",
+ ],
+ cpp_std: "c++17",
target: {
android_arm: {
cflags: [
@@ -17277,6 +16309,60 @@
cc_library_static {
name: "cronet_aml_net_test_support__testing",
srcs: [
+ ":cronet_aml_net_dns_test_support__testing",
+ ":cronet_aml_net_quic_test_flags_utils__testing",
+ ":cronet_aml_net_simple_quic_tools__testing",
+ ":cronet_aml_net_tools_tld_cleanup_tld_cleanup__testing",
+ ":cronet_aml_net_traffic_annotation_traffic_annotation__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
+ ":cronet_aml_third_party_googletest_gmock__testing",
+ ":cronet_aml_third_party_googletest_gtest__testing",
"net/base/connection_endpoint_metadata_test_util.cc",
"net/base/load_timing_info_test_util.cc",
"net/base/mock_file_stream.cc",
@@ -17363,85 +16449,22 @@
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
"cronet_aml_base_i18n__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_test_test_config__testing",
"cronet_aml_base_test_test_support__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_dns_test_support__testing",
"cronet_aml_net_gtest_util__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
- "cronet_aml_net_quic_test_flags_utils__testing",
- "cronet_aml_net_simple_quic_tools__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
"cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
- "cronet_aml_net_tools_tld_cleanup_tld_cleanup__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_ced_ced__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -17453,9 +16476,13 @@
"cronet_aml_url_url__testing",
],
generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_net_cronet_buildflags__testing",
"cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
],
export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_net_cronet_buildflags__testing",
"cronet_aml_net_http_transport_security_state_unittest_data_default__testing",
],
defaults: [
@@ -17707,6 +16734,7 @@
],
export_include_dirs: [
".",
+ "net/third_party/quiche/src",
"net/third_party/quiche/src/quiche/quic/test_tools",
"protos",
],
@@ -17748,6 +16776,7 @@
],
export_include_dirs: [
".",
+ "net/third_party/quiche/src",
"net/third_party/quiche/src/quiche/quic/test_tools",
"protos",
],
@@ -17761,6 +16790,53 @@
name: "cronet_aml_net_third_party_quiche_quiche",
srcs: [
":cronet_aml_net_third_party_quiche_net_quic_proto_gen",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
"net/third_party/quiche/overrides/quiche_platform_impl/quiche_mutex_impl.cc",
"net/third_party/quiche/overrides/quiche_platform_impl/quiche_time_utils_impl.cc",
"net/third_party/quiche/overrides/quiche_platform_impl/quiche_url_utils_impl.cc",
@@ -18054,59 +17130,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
"cronet_aml_net_uri_template",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -18115,9 +17141,11 @@
"cronet_aml_url_url",
],
generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
"cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
],
export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
"cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
],
defaults: [
@@ -18220,6 +17248,53 @@
name: "cronet_aml_net_third_party_quiche_quiche__testing",
srcs: [
":cronet_aml_net_third_party_quiche_net_quic_proto__testing_gen",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
"net/third_party/quiche/overrides/quiche_platform_impl/quiche_mutex_impl.cc",
"net/third_party/quiche/overrides/quiche_platform_impl/quiche_time_utils_impl.cc",
"net/third_party/quiche/overrides/quiche_platform_impl/quiche_url_utils_impl.cc",
@@ -18511,61 +17586,10 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -18574,9 +17598,11 @@
"cronet_aml_url_url__testing",
],
generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
"cronet_aml_net_third_party_quiche_net_quic_proto__testing_gen_headers",
],
export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
"cronet_aml_net_third_party_quiche_net_quic_proto__testing_gen_headers",
],
defaults: [
@@ -18674,6 +17700,681 @@
},
}
+// GN: //net/third_party/quiche:quiche_test_support__testing
+cc_library_static {
+ name: "cronet_aml_net_third_party_quiche_quiche_test_support__testing",
+ srcs: [
+ ":cronet_aml_net_quic_test_flags_utils__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
+ ":cronet_aml_third_party_googletest_gmock__testing",
+ ":cronet_aml_third_party_googletest_gtest__testing",
+ ":cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen",
+ "net/third_party/quiche/overrides/quiche_platform_impl/quiche_test_helpers_impl.cc",
+ "net/third_party/quiche/overrides/quiche_platform_impl/quiche_test_impl.cc",
+ "net/third_party/quiche/overrides/quiche_platform_impl/quiche_test_output_impl.cc",
+ "net/third_party/quiche/src/quiche/common/platform/api/quiche_test_loopback.cc",
+ "net/third_party/quiche/src/quiche/common/platform/default/quiche_platform_impl/quiche_test_loopback_impl.cc",
+ "net/third_party/quiche/src/quiche/common/test_tools/quiche_test_utils.cc",
+ "net/third_party/quiche/src/quiche/http2/adapter/test_frame_sequence.cc",
+ "net/third_party/quiche/src/quiche/http2/adapter/test_utils.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/frame_decoder_state_test_util.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/frame_parts.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/frame_parts_collector.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/frame_parts_collector_listener.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/hpack_block_builder.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/hpack_block_collector.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/hpack_entry_collector.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/hpack_example.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/hpack_string_collector.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/http2_constants_test_util.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/http2_frame_builder.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/http2_random.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/http2_structure_decoder_test_util.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/http2_structures_test_util.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/payload_decoder_base_test_util.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/random_decoder_test_base.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/random_util.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_trace_visitor.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/bad_packet_writer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/crypto_test_utils.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/failing_proof_source.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/fake_proof_source.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/first_flight.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/limited_mtu_test_writer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/mock_clock.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/mock_quic_client_promised_info.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/mock_quic_dispatcher.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/mock_quic_session_visitor.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/mock_quic_spdy_client_stream.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/mock_quic_time_wait_list_manager.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/mock_random.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/packet_dropping_test_writer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/packet_reordering_writer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/qpack/qpack_decoder_test_utils.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/qpack/qpack_encoder_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/qpack/qpack_offline_decoder.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/qpack/qpack_test_utils.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_buffered_packet_store_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_client_promised_info_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_coalesced_packet_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_config_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_connection_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_crypto_server_config_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_dispatcher_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_flow_controller_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_framer_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_packet_creator_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_path_validator_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_sent_packet_manager_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_session_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_spdy_session_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_spdy_stream_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_stream_id_manager_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_stream_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_stream_send_buffer_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_stream_sequencer_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_sustained_bandwidth_recorder_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_test_backend.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_test_utils.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_time_wait_list_manager_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_unacked_packet_map_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/rtt_stats_peer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_utils.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simple_data_producer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simple_quic_framer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simple_session_cache.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simple_session_notifier.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/actor.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/alarm_factory.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/link.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/packet_filter.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/port.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/queue.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/quic_endpoint.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/quic_endpoint_base.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/simulator.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/switch.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/traffic_policer.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/test_certificates.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/test_ticket_crypter.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/web_transport_resets_backend.cc",
+ "net/third_party/quiche/src/quiche/spdy/test_tools/mock_spdy_framer_visitor.cc",
+ "net/third_party/quiche/src/quiche/spdy/test_tools/spdy_test_utils.cc",
+ ],
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ "libprotobuf-cpp-lite",
+ "libz",
+ ],
+ static_libs: [
+ "cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
+ "cronet_aml_base_base__testing",
+ "cronet_aml_base_base_static__testing",
+ "cronet_aml_base_i18n__testing",
+ "cronet_aml_base_test_test_config__testing",
+ "cronet_aml_base_test_test_support__testing",
+ "cronet_aml_base_third_party_double_conversion_double_conversion__testing",
+ "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
+ "cronet_aml_crypto_crypto__testing",
+ "cronet_aml_crypto_test_support__testing",
+ "cronet_aml_net_gtest_util__testing",
+ "cronet_aml_net_net__testing",
+ "cronet_aml_net_preload_decoder__testing",
+ "cronet_aml_net_test_support__testing",
+ "cronet_aml_net_third_party_quiche_quiche__testing",
+ "cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
+ "cronet_aml_net_uri_template__testing",
+ "cronet_aml_testing_gtest_gtest__testing",
+ "cronet_aml_third_party_boringssl_boringssl__testing",
+ "cronet_aml_third_party_brotli_common__testing",
+ "cronet_aml_third_party_brotli_dec__testing",
+ "cronet_aml_third_party_ced_ced__testing",
+ "cronet_aml_third_party_icu_icui18n__testing",
+ "cronet_aml_third_party_icu_icuuc_private__testing",
+ "cronet_aml_third_party_libevent_libevent__testing",
+ "cronet_aml_third_party_libxml_libxml__testing",
+ "cronet_aml_third_party_libxml_libxml_utils__testing",
+ "cronet_aml_third_party_libxml_xml_reader__testing",
+ "cronet_aml_third_party_modp_b64_modp_b64__testing",
+ "cronet_aml_third_party_protobuf_protobuf_lite__testing",
+ "cronet_aml_url_url__testing",
+ ],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers",
+ ],
+ export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers",
+ ],
+ defaults: [
+ "cronet_aml_defaults",
+ ],
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
+ "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+ "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
+ "-DGOOGLE_PROTOBUF_NO_RTTI",
+ "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+ "-DGTEST_API_=",
+ "-DGTEST_HAS_ABSL=1",
+ "-DGTEST_HAS_POSIX_RE=0",
+ "-DGTEST_HAS_TR1_TUPLE=0",
+ "-DGTEST_LANG_CXX11=1",
+ "-DHAVE_PTHREAD",
+ "-DHAVE_SYS_UIO_H",
+ "-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE",
+ "-DNDEBUG",
+ "-DNO_UNWIND_TABLES",
+ "-DNVALGRIND",
+ "-DOFFICIAL_BUILD",
+ "-DUNIT_TEST",
+ "-DUSE_CHROMIUM_ICU=1",
+ "-DUSE_REMOTE_TEST_SERVER",
+ "-DU_ENABLE_DYLOAD=0",
+ "-DU_ENABLE_RESOURCE_TRACING=0",
+ "-DU_ENABLE_TRACING=1",
+ "-DU_STATIC_IMPLEMENTATION",
+ "-DU_USING_ICU_NAMESPACE=0",
+ "-D_FORTIFY_SOURCE=2",
+ "-D_GNU_SOURCE",
+ "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D__STDC_CONSTANT_MACROS",
+ "-D__STDC_FORMAT_MACROS",
+ "-Oz",
+ "-fdata-sections",
+ "-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
+ "-fvisibility-inlines-hidden",
+ "-fvisibility=hidden",
+ "-g1",
+ ],
+ local_include_dirs: [
+ "./",
+ "buildtools/third_party/libc++/",
+ "buildtools/third_party/libc++/trunk/include",
+ "buildtools/third_party/libc++abi/trunk/include",
+ "net/third_party/quiche/overrides/",
+ "net/third_party/quiche/src/",
+ "net/third_party/quiche/src/quiche/common/platform/default/",
+ "third_party/abseil-cpp/",
+ "third_party/boringssl/src/include/",
+ "third_party/ced/src/",
+ "third_party/googletest/custom/",
+ "third_party/googletest/src/googlemock/include/",
+ "third_party/googletest/src/googletest/include/",
+ "third_party/icu/source/common/",
+ "third_party/icu/source/i18n/",
+ "third_party/protobuf/src/",
+ ],
+ cpp_std: "c++17",
+ ldflags: [
+ "-Wl,--as-needed",
+ "-Wl,--gc-sections",
+ "-Wl,--icf=all",
+ "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
+ "-Wl,-wrap,asprintf",
+ "-Wl,-wrap,calloc",
+ "-Wl,-wrap,free",
+ "-Wl,-wrap,getcwd",
+ "-Wl,-wrap,malloc",
+ "-Wl,-wrap,malloc_usable_size",
+ "-Wl,-wrap,memalign",
+ "-Wl,-wrap,posix_memalign",
+ "-Wl,-wrap,pvalloc",
+ "-Wl,-wrap,realloc",
+ "-Wl,-wrap,realpath",
+ "-Wl,-wrap,strdup",
+ "-Wl,-wrap,strndup",
+ "-Wl,-wrap,valloc",
+ "-Wl,-wrap,vasprintf",
+ ],
+ target: {
+ android_arm: {
+ cflags: [
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ },
+}
+
+// GN: //net/third_party/quiche:quiche_tests__testing
+cc_object {
+ name: "cronet_aml_net_third_party_quiche_quiche_tests__testing",
+ srcs: [
+ "net/third_party/quiche/src/quiche/common/platform/api/quiche_file_utils_test.cc",
+ "net/third_party/quiche/src/quiche/common/platform/api/quiche_hostname_utils_test.cc",
+ "net/third_party/quiche/src/quiche/common/platform/api/quiche_mem_slice_test.cc",
+ "net/third_party/quiche/src/quiche/common/platform/api/quiche_reference_counted_test.cc",
+ "net/third_party/quiche/src/quiche/common/platform/api/quiche_stack_trace_test.cc",
+ "net/third_party/quiche/src/quiche/common/platform/api/quiche_time_utils_test.cc",
+ "net/third_party/quiche/src/quiche/common/platform/api/quiche_url_utils_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_buffer_allocator_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_circular_deque_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_data_reader_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_data_writer_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_endian_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_ip_address_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_linked_hash_map_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_mem_slice_storage_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_random_test.cc",
+ "net/third_party/quiche/src/quiche/common/quiche_text_utils_test.cc",
+ "net/third_party/quiche/src/quiche/common/simple_buffer_allocator_test.cc",
+ "net/third_party/quiche/src/quiche/common/structured_headers_generated_test.cc",
+ "net/third_party/quiche/src/quiche/common/structured_headers_test.cc",
+ "net/third_party/quiche/src/quiche/http2/adapter/event_forwarder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/adapter/header_validator_test.cc",
+ "net/third_party/quiche/src/quiche/http2/adapter/noop_header_validator_test.cc",
+ "net/third_party/quiche/src/quiche/http2/adapter/oghttp2_adapter_test.cc",
+ "net/third_party/quiche/src/quiche/http2/adapter/oghttp2_session_test.cc",
+ "net/third_party/quiche/src/quiche/http2/adapter/window_manager_test.cc",
+ "net/third_party/quiche/src/quiche/http2/core/priority_write_scheduler_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/decode_buffer_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/decode_http2_structures_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/http2_frame_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/http2_structure_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_block_collector_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/decoder/hpack_whole_entry_buffer_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/http2_hpack_constants_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/huffman/hpack_huffman_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/huffman/hpack_huffman_encoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/huffman/hpack_huffman_transcoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/varint/hpack_varint_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/varint/hpack_varint_encoder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc",
+ "net/third_party/quiche/src/quiche/http2/http2_constants_test.cc",
+ "net/third_party/quiche/src/quiche/http2/http2_structures_test.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/hpack_block_builder_test.cc",
+ "net/third_party/quiche/src/quiche/http2/test_tools/http2_random_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/bandwidth_sampler_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/bbr2_simulator_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/bbr_sender_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/cubic_bytes_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/general_loss_algorithm_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/hybrid_slow_start_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/pacing_sender_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/prr_sender_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/rtt_stats_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/send_algorithm_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/uber_loss_algorithm_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/congestion_control/windowed_filter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/aes_128_gcm_12_decrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/aes_128_gcm_12_encrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/aes_128_gcm_decrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/aes_128_gcm_encrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/aes_256_gcm_decrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/aes_256_gcm_encrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/cert_compressor_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/certificate_util_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/certificate_view_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/chacha20_poly1305_decrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/chacha20_poly1305_encrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/channel_id_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/client_proof_source_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/crypto_framer_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/crypto_handshake_message_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/crypto_secret_boxer_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/crypto_server_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/crypto_utils_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/curve25519_key_exchange_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/null_decrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/null_encrypter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/p256_key_exchange_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/proof_source_x509_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/quic_client_session_cache_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/quic_compressed_certs_cache_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/quic_crypto_client_config_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/quic_crypto_server_config_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/transport_parameters_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/crypto/web_transport_fingerprint_proof_verifier_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/frames/quic_frames_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/capsule_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/http_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/http_encoder_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/http_frames_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_client_promised_info_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_client_push_promise_index_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_header_list_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_headers_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_receive_control_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_send_control_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_server_session_base_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_spdy_session_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_spdy_stream_body_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/quic_spdy_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/spdy_server_push_utils_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/spdy_utils_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/http/web_transport_http3_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/legacy_quic_stream_id_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/packet_number_indexed_queue_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_blocking_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_decoder_stream_receiver_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_decoder_stream_sender_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_encoder_stream_receiver_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_encoder_stream_sender_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_encoder_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_header_table_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_index_conversions_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_instruction_decoder_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_instruction_encoder_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_receive_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_required_insert_count_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_round_trip_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_send_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/qpack_static_table_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/qpack/value_splitting_header_list_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_alarm_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_arena_scoped_ptr_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_bandwidth_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_buffered_packet_store_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_chaos_protector_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_coalesced_packet_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_config_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_connection_context_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_connection_id_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_connection_id_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_connection_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_control_frame_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_crypto_client_handshaker_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_crypto_client_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_crypto_server_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_crypto_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_data_writer_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_datagram_queue_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_dispatcher_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_error_codes_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_flow_controller_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_framer_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_idle_network_detector_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_interval_deque_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_interval_set_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_interval_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_legacy_version_encapsulator_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_lru_cache_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_network_blackhole_detector_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_packet_creator_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_packet_number_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_packets_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_path_validator_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_received_packet_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_sent_packet_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_server_id_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_session_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_socket_address_coder_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_stream_id_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_stream_sequencer_buffer_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_stream_sequencer_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_stream_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_sustained_bandwidth_recorder_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_tag_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_time_accumulator_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_time_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_time_wait_list_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_trace_visitor_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_unacked_packet_map_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_utils_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_version_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_versions_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_write_blocked_list_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/tls_chlo_extractor_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/tls_client_handshaker_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/uber_quic_stream_id_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/core/uber_received_packet_manager_test.cc",
+ "net/third_party/quiche/src/quiche/quic/platform/api/quic_socket_address_test.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/crypto_test_utils_test.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/quic_test_utils_test.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simple_session_notifier_test.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/quic_endpoint_test.cc",
+ "net/third_party/quiche/src/quiche/quic/test_tools/simulator/simulator_test.cc",
+ "net/third_party/quiche/src/quiche/quic/tools/quic_memory_cache_backend_test.cc",
+ "net/third_party/quiche/src/quiche/quic/tools/quic_tcp_like_trace_converter_test.cc",
+ "net/third_party/quiche/src/quiche/quic/tools/simple_ticket_crypter_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/array_output_buffer_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/hpack/hpack_decoder_adapter_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/hpack/hpack_encoder_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/hpack/hpack_entry_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/hpack/hpack_header_table_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/hpack/hpack_output_stream_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/hpack/hpack_round_trip_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/hpack/hpack_static_table_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/http2_header_block_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/http2_header_storage_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/spdy_alt_svc_wire_format_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/spdy_frame_builder_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/spdy_framer_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/spdy_intrusive_list_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/spdy_pinnable_buffer_piece_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/spdy_prefixed_buffer_reader_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol_test.cc",
+ "net/third_party/quiche/src/quiche/spdy/core/spdy_simple_arena_test.cc",
+ ],
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ "libz",
+ ],
+ static_libs: [
+ "cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
+ "cronet_aml_base_base__testing",
+ "cronet_aml_base_base_static__testing",
+ "cronet_aml_base_i18n__testing",
+ "cronet_aml_base_test_test_config__testing",
+ "cronet_aml_base_test_test_support__testing",
+ "cronet_aml_base_third_party_double_conversion_double_conversion__testing",
+ "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
+ "cronet_aml_crypto_crypto__testing",
+ "cronet_aml_crypto_test_support__testing",
+ "cronet_aml_net_gtest_util__testing",
+ "cronet_aml_net_net__testing",
+ "cronet_aml_net_preload_decoder__testing",
+ "cronet_aml_net_test_support__testing",
+ "cronet_aml_net_third_party_quiche_quiche__testing",
+ "cronet_aml_net_third_party_quiche_quiche_test_support__testing",
+ "cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
+ "cronet_aml_net_uri_template__testing",
+ "cronet_aml_testing_gtest_gtest__testing",
+ "cronet_aml_third_party_boringssl_boringssl__testing",
+ "cronet_aml_third_party_brotli_common__testing",
+ "cronet_aml_third_party_brotli_dec__testing",
+ "cronet_aml_third_party_ced_ced__testing",
+ "cronet_aml_third_party_icu_icui18n__testing",
+ "cronet_aml_third_party_icu_icuuc_private__testing",
+ "cronet_aml_third_party_libevent_libevent__testing",
+ "cronet_aml_third_party_libxml_libxml__testing",
+ "cronet_aml_third_party_libxml_libxml_utils__testing",
+ "cronet_aml_third_party_libxml_xml_reader__testing",
+ "cronet_aml_third_party_modp_b64_modp_b64__testing",
+ "cronet_aml_third_party_protobuf_protobuf_lite__testing",
+ "cronet_aml_url_url__testing",
+ ],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers",
+ ],
+ defaults: [
+ "cronet_aml_defaults",
+ ],
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
+ "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+ "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
+ "-DGOOGLE_PROTOBUF_NO_RTTI",
+ "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+ "-DGTEST_API_=",
+ "-DGTEST_HAS_ABSL=1",
+ "-DGTEST_HAS_POSIX_RE=0",
+ "-DGTEST_HAS_TR1_TUPLE=0",
+ "-DGTEST_LANG_CXX11=1",
+ "-DHAVE_PTHREAD",
+ "-DHAVE_SYS_UIO_H",
+ "-DNDEBUG",
+ "-DNO_UNWIND_TABLES",
+ "-DNVALGRIND",
+ "-DOFFICIAL_BUILD",
+ "-DUNIT_TEST",
+ "-D_FORTIFY_SOURCE=2",
+ "-D_GNU_SOURCE",
+ "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+ "-D__STDC_CONSTANT_MACROS",
+ "-D__STDC_FORMAT_MACROS",
+ "-Oz",
+ "-fdata-sections",
+ "-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
+ "-fvisibility-inlines-hidden",
+ "-fvisibility=hidden",
+ "-g1",
+ ],
+ local_include_dirs: [
+ "./",
+ "buildtools/third_party/libc++/",
+ "buildtools/third_party/libc++/trunk/include",
+ "buildtools/third_party/libc++abi/trunk/include",
+ "net/third_party/quiche/overrides/",
+ "net/third_party/quiche/src/",
+ "net/third_party/quiche/src/quiche/common/platform/default/",
+ "third_party/abseil-cpp/",
+ "third_party/boringssl/src/include/",
+ "third_party/googletest/custom/",
+ "third_party/googletest/src/googlemock/include/",
+ "third_party/googletest/src/googletest/include/",
+ "third_party/protobuf/src/",
+ ],
+ cpp_std: "c++17",
+ target: {
+ android_arm: {
+ cflags: [
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ },
+}
+
// GN: //net/third_party/quiche:quiche_tool_support__testing
cc_library_static {
name: "cronet_aml_net_third_party_quiche_quiche_tool_support__testing",
@@ -18712,71 +18413,14 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_dns_dns__testing",
- "cronet_aml_net_dns_public_public__testing",
- "cronet_aml_net_http_transport_security_state_generated_files__testing",
"cronet_aml_net_net__testing",
- "cronet_aml_net_net_deps__testing",
- "cronet_aml_net_net_public_deps__testing",
"cronet_aml_net_preload_decoder__testing",
"cronet_aml_net_third_party_quiche_quiche__testing",
- "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
"cronet_aml_net_uri_template__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_brotli_common__testing",
"cronet_aml_third_party_brotli_dec__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -18881,7 +18525,7 @@
}
// GN: //net/tools/huffman_trie:huffman_trie_generator_sources__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_tools_huffman_trie_huffman_trie_generator_sources__testing",
srcs: [
"net/tools/huffman_trie/bit_writer.cc",
@@ -18894,99 +18538,39 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
"cronet_aml_third_party_modp_b64_modp_b64__testing",
],
host_supported: true,
- device_supported: false,
defaults: [
"cronet_aml_defaults",
],
cflags: [
"-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
"-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
- "-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DDYNAMIC_ANNOTATIONS_ENABLED=0",
"-DNDEBUG",
"-DNO_UNWIND_TABLES",
"-DNVALGRIND",
"-DOFFICIAL_BUILD",
- "-DUSE_AURA=1",
- "-DUSE_OZONE=1",
- "-DUSE_UDEV",
- "-D_FILE_OFFSET_BITS=64",
"-D_FORTIFY_SOURCE=2",
"-D_GNU_SOURCE",
- "-D_LARGEFILE64_SOURCE",
- "-D_LARGEFILE_SOURCE",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
- "-O2",
"-fdata-sections",
"-ffunction-sections",
"-fno-asynchronous-unwind-tables",
"-fno-unwind-tables",
- "-fstack-protector",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
- "-msse3",
],
local_include_dirs: [
"./",
@@ -18996,16 +18580,72 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
+ target: {
+ android: {
+ shared_libs: [
+ "libandroid",
+ "liblog",
+ ],
+ },
+ android_arm: {
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DHAVE_SYS_UIO_H",
+ "-Oz",
+ "-fstack-protector",
+ ],
+ },
+ android_arm64: {
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DHAVE_SYS_UIO_H",
+ "-Oz",
+ "-fstack-protector",
+ "-mno-outline",
+ "-mno-outline-atomics",
+ ],
+ },
+ android_x86: {
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DHAVE_SYS_UIO_H",
+ "-Oz",
+ "-msse3",
+ ],
+ },
+ android_x86_64: {
+ cflags: [
+ "-DANDROID",
+ "-DANDROID_NDK_VERSION_ROLL=r23_1",
+ "-DHAVE_SYS_UIO_H",
+ "-Oz",
+ "-fstack-protector",
+ "-msse3",
+ ],
+ },
+ host: {
+ cflags: [
+ "-DCR_SYSROOT_KEY=20220331T153654Z-0",
+ "-DUSE_AURA=1",
+ "-DUSE_OZONE=1",
+ "-DUSE_UDEV",
+ "-D_FILE_OFFSET_BITS=64",
+ "-D_LARGEFILE64_SOURCE",
+ "-D_LARGEFILE_SOURCE",
+ "-O2",
+ "-fstack-protector",
+ "-msse3",
+ ],
+ compile_multilib: "64",
+ },
+ },
}
// GN: //net/tools/tld_cleanup:tld_cleanup__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_tools_tld_cleanup_tld_cleanup__testing",
srcs: [
"net/tools/tld_cleanup/tld_cleanup_util.cc",
@@ -19018,60 +18658,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -19116,27 +18705,6 @@
"third_party/boringssl/src/include/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -19168,69 +18736,20 @@
cc_binary {
name: "cronet_aml_net_tools_transport_security_state_generator_transport_security_state_generator__testing",
srcs: [
+ ":cronet_aml_buildtools_third_party_libc___libc____testing",
+ ":cronet_aml_buildtools_third_party_libc__abi_libc__abi__testing",
+ ":cronet_aml_net_tools_huffman_trie_huffman_trie_generator_sources__testing",
+ ":cronet_aml_net_tools_transport_security_state_generator_transport_security_state_generator_sources__testing",
"net/tools/transport_security_state_generator/transport_security_state_generator.cc",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_buildtools_third_party_libc___libc____testing",
- "cronet_aml_buildtools_third_party_libc__abi_libc__abi__testing",
"cronet_aml_crypto_crypto__testing",
- "cronet_aml_net_tools_huffman_trie_huffman_trie_generator_sources__testing",
- "cronet_aml_net_tools_transport_security_state_generator_transport_security_state_generator_sources__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -19290,7 +18809,7 @@
}
// GN: //net/tools/transport_security_state_generator:transport_security_state_generator_sources__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_tools_transport_security_state_generator_transport_security_state_generator_sources__testing",
srcs: [
"net/tools/transport_security_state_generator/cert_util.cc",
@@ -19305,59 +18824,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_net_tools_huffman_trie_huffman_trie_generator_sources__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -19409,15 +18878,10 @@
"third_party/boringssl/src/include/",
],
cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
}
// GN: //net/traffic_annotation:traffic_annotation
-cc_library_static {
+cc_object {
name: "cronet_aml_net_traffic_annotation_traffic_annotation",
srcs: [
"net/traffic_annotation/network_traffic_annotation_android.cc",
@@ -19432,58 +18896,8 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -19492,9 +18906,6 @@
generated_headers: [
"cronet_aml_build_chromeos_buildflags",
],
- export_generated_headers: [
- "cronet_aml_build_chromeos_buildflags",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -19533,27 +18944,6 @@
"third_party/boringssl/src/include/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -19582,7 +18972,7 @@
}
// GN: //net/traffic_annotation:traffic_annotation__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_net_traffic_annotation_traffic_annotation__testing",
srcs: [
"net/traffic_annotation/network_traffic_annotation_android.cc",
@@ -19595,60 +18985,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -19657,9 +18996,6 @@
generated_headers: [
"cronet_aml_build_chromeos_buildflags__testing",
],
- export_generated_headers: [
- "cronet_aml_build_chromeos_buildflags__testing",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -19698,27 +19034,6 @@
"third_party/boringssl/src/include/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -19762,58 +19077,8 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -19920,60 +19185,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -20105,7 +19319,7 @@
}
// GN: //testing/android/native_test:native_test_native_code__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_testing_android_native_test_native_test_native_code__testing",
srcs: [
"testing/android/native_test/native_test_jni_onload.cc",
@@ -20120,67 +19334,13 @@
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
"cronet_aml_base_i18n__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_test_test_config__testing",
"cronet_aml_base_test_test_support__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_testing_android_native_test_native_test_support__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_ced_ced__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -20189,6 +19349,12 @@
"cronet_aml_third_party_libxml_xml_reader__testing",
"cronet_aml_third_party_modp_b64_modp_b64__testing",
],
+ generated_headers: [
+ "cronet_aml_base_debugging_buildflags__testing",
+ "cronet_aml_base_logging_buildflags__testing",
+ "cronet_aml_build_chromeos_buildflags__testing",
+ "cronet_aml_testing_android_native_test_native_test_jni_headers__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -20227,27 +19393,6 @@
"third_party/boringssl/src/include/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -20276,7 +19421,7 @@
}
// GN: //testing/android/native_test:native_test_support__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_testing_android_native_test_native_test_support__testing",
srcs: [
"testing/android/native_test/main_runner.cc",
@@ -20293,66 +19438,13 @@
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
"cronet_aml_base_i18n__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_test_test_config__testing",
"cronet_aml_base_test_test_support__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
"cronet_aml_testing_gtest_gtest__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_ced_ced__testing",
- "cronet_aml_third_party_googletest_gmock__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
@@ -20367,12 +19459,6 @@
"cronet_aml_build_chromeos_buildflags__testing",
"cronet_aml_testing_android_native_test_native_test_jni_headers__testing",
],
- export_generated_headers: [
- "cronet_aml_base_debugging_buildflags__testing",
- "cronet_aml_base_logging_buildflags__testing",
- "cronet_aml_build_chromeos_buildflags__testing",
- "cronet_aml_testing_android_native_test_native_test_jni_headers__testing",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -20430,27 +19516,6 @@
"third_party/icu/source/i18n/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -20482,6 +19547,54 @@
cc_library_static {
name: "cronet_aml_testing_gtest_gtest__testing",
srcs: [
+ ":cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
+ ":cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
+ ":cronet_aml_third_party_googletest_gtest__testing",
"testing/gtest/empty.cc",
"testing/multiprocess_func_list.cc",
],
@@ -20493,66 +19606,20 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
"cronet_aml_third_party_modp_b64_modp_b64__testing",
],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
+ export_generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -20647,7 +19714,7 @@
}
// GN: //third_party/abseil-cpp/absl/base:base
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_base",
srcs: [
"third_party/abseil-cpp/absl/base/internal/cycleclock.cc",
@@ -20656,11 +19723,6 @@
"third_party/abseil-cpp/absl/base/internal/thread_identity.cc",
"third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -20696,11 +19758,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -20729,7 +19786,7 @@
}
// GN: //third_party/abseil-cpp/absl/base:base__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
srcs: [
"third_party/abseil-cpp/absl/base/internal/cycleclock.cc",
@@ -20738,11 +19795,6 @@
"third_party/abseil-cpp/absl/base/internal/thread_identity.cc",
"third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -20774,11 +19826,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -20838,7 +19885,7 @@
}
// GN: //third_party/abseil-cpp/absl/base:log_severity
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
srcs: [
"third_party/abseil-cpp/absl/base/log_severity.cc",
@@ -20878,11 +19925,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -20911,7 +19953,7 @@
}
// GN: //third_party/abseil-cpp/absl/base:log_severity__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
srcs: [
"third_party/abseil-cpp/absl/base/log_severity.cc",
@@ -20947,11 +19989,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21011,17 +20048,11 @@
}
// GN: //third_party/abseil-cpp/absl/base:malloc_internal
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
srcs: [
"third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -21057,11 +20088,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21090,17 +20116,11 @@
}
// GN: //third_party/abseil-cpp/absl/base:malloc_internal__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
srcs: [
"third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -21132,11 +20152,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21196,14 +20211,11 @@
}
// GN: //third_party/abseil-cpp/absl/base:raw_logging_internal
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
srcs: [
"third_party/abseil-cpp/absl/base/internal/raw_logging.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -21239,11 +20251,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21272,14 +20279,11 @@
}
// GN: //third_party/abseil-cpp/absl/base:raw_logging_internal__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
srcs: [
"third_party/abseil-cpp/absl/base/internal/raw_logging.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -21311,11 +20315,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21375,7 +20374,7 @@
}
// GN: //third_party/abseil-cpp/absl/base:spinlock_wait
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
srcs: [
"third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc",
@@ -21415,11 +20414,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21448,7 +20442,7 @@
}
// GN: //third_party/abseil-cpp/absl/base:spinlock_wait__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
srcs: [
"third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc",
@@ -21484,11 +20478,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21548,7 +20537,7 @@
}
// GN: //third_party/abseil-cpp/absl/base:strerror
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
srcs: [
"third_party/abseil-cpp/absl/base/internal/strerror.cc",
@@ -21588,11 +20577,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21621,7 +20605,7 @@
}
// GN: //third_party/abseil-cpp/absl/base:strerror__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
srcs: [
"third_party/abseil-cpp/absl/base/internal/strerror.cc",
@@ -21657,11 +20641,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21721,15 +20700,11 @@
}
// GN: //third_party/abseil-cpp/absl/base:throw_delegate
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
srcs: [
"third_party/abseil-cpp/absl/base/internal/throw_delegate.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -21765,11 +20740,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21798,15 +20768,11 @@
}
// GN: //third_party/abseil-cpp/absl/base:throw_delegate__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
srcs: [
"third_party/abseil-cpp/absl/base/internal/throw_delegate.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -21838,11 +20804,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21902,33 +20863,12 @@
}
// GN: //third_party/abseil-cpp/absl/container:hashtablez_sampler
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
srcs: [
"third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc",
"third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -21964,11 +20904,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -21997,33 +20932,12 @@
}
// GN: //third_party/abseil-cpp/absl/container:hashtablez_sampler__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
srcs: [
"third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc",
"third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -22055,11 +20969,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22119,34 +21028,11 @@
}
// GN: //third_party/abseil-cpp/absl/container:raw_hash_set
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
srcs: [
"third_party/abseil-cpp/absl/container/internal/raw_hash_set.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -22182,11 +21068,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22215,34 +21096,11 @@
}
// GN: //third_party/abseil-cpp/absl/container:raw_hash_set__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
srcs: [
"third_party/abseil-cpp/absl/container/internal/raw_hash_set.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -22274,11 +21132,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22338,17 +21191,13 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:debugging_internal
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
srcs: [
"third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc",
"third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc",
"third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -22384,11 +21233,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22417,17 +21261,13 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:debugging_internal__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
srcs: [
"third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc",
"third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc",
"third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -22459,11 +21299,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22523,17 +21358,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:demangle_internal
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
srcs: [
"third_party/abseil-cpp/absl/debugging/internal/demangle.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -22569,11 +21398,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22602,17 +21426,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:demangle_internal__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
srcs: [
"third_party/abseil-cpp/absl/debugging/internal/demangle.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -22644,11 +21462,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22708,26 +21521,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:examine_stack
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
srcs: [
"third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -22763,11 +21561,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22796,26 +21589,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:examine_stack__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
srcs: [
"third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -22847,11 +21625,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -22911,27 +21684,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:failure_signal_handler
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
srcs: [
"third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -22967,11 +21724,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23000,27 +21752,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:failure_signal_handler__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
srcs: [
"third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -23052,11 +21788,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23116,16 +21847,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:stacktrace
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
srcs: [
"third_party/abseil-cpp/absl/debugging/stacktrace.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -23161,11 +21887,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23194,16 +21915,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:stacktrace__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
srcs: [
"third_party/abseil-cpp/absl/debugging/stacktrace.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -23235,11 +21951,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23299,24 +22010,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:symbolize
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
srcs: [
"third_party/abseil-cpp/absl/debugging/symbolize.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -23352,11 +22050,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23385,24 +22078,11 @@
}
// GN: //third_party/abseil-cpp/absl/debugging:symbolize__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
srcs: [
"third_party/abseil-cpp/absl/debugging/symbolize.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -23434,11 +22114,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23498,17 +22173,11 @@
}
// GN: //third_party/abseil-cpp/absl/hash:city
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_hash_city",
srcs: [
"third_party/abseil-cpp/absl/hash/internal/city.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -23544,11 +22213,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23577,17 +22241,11 @@
}
// GN: //third_party/abseil-cpp/absl/hash:city__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
srcs: [
"third_party/abseil-cpp/absl/hash/internal/city.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -23619,11 +22277,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23683,25 +22336,11 @@
}
// GN: //third_party/abseil-cpp/absl/hash:hash
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
srcs: [
"third_party/abseil-cpp/absl/hash/internal/hash.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -23737,11 +22376,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23770,25 +22404,11 @@
}
// GN: //third_party/abseil-cpp/absl/hash:hash__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
srcs: [
"third_party/abseil-cpp/absl/hash/internal/hash.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -23820,11 +22440,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23884,18 +22499,11 @@
}
// GN: //third_party/abseil-cpp/absl/hash:low_level_hash
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
srcs: [
"third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -23931,11 +22539,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -23964,18 +22567,11 @@
}
// GN: //third_party/abseil-cpp/absl/hash:low_level_hash__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
srcs: [
"third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -24007,11 +22603,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24071,7 +22662,7 @@
}
// GN: //third_party/abseil-cpp/absl/numeric:int128
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
srcs: [
"third_party/abseil-cpp/absl/numeric/int128.cc",
@@ -24111,11 +22702,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24144,7 +22730,7 @@
}
// GN: //third_party/abseil-cpp/absl/numeric:int128__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
srcs: [
"third_party/abseil-cpp/absl/numeric/int128.cc",
@@ -24180,11 +22766,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24244,7 +22825,7 @@
}
// GN: //third_party/abseil-cpp/absl/profiling:exponential_biased
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
srcs: [
"third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc",
@@ -24284,11 +22865,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24317,7 +22893,7 @@
}
// GN: //third_party/abseil-cpp/absl/profiling:exponential_biased__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
srcs: [
"third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc",
@@ -24353,11 +22929,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24417,22 +22988,12 @@
}
// GN: //third_party/abseil-cpp/absl/random:distributions
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
srcs: [
"third_party/abseil-cpp/absl/random/discrete_distribution.cc",
"third_party/abseil-cpp/absl/random/gaussian_distribution.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -24468,11 +23029,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24501,22 +23057,12 @@
}
// GN: //third_party/abseil-cpp/absl/random:distributions__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
srcs: [
"third_party/abseil-cpp/absl/random/discrete_distribution.cc",
"third_party/abseil-cpp/absl/random/gaussian_distribution.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -24548,11 +23094,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24612,7 +23153,7 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:platform
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen_round_keys.cc",
@@ -24620,9 +23161,6 @@
generated_headers: [
"cronet_aml_build_chromeos_buildflags",
],
- export_generated_headers: [
- "cronet_aml_build_chromeos_buildflags",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -24658,11 +23196,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24691,7 +23224,7 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:platform__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen_round_keys.cc",
@@ -24700,9 +23233,6 @@
generated_headers: [
"cronet_aml_build_chromeos_buildflags__testing",
],
- export_generated_headers: [
- "cronet_aml_build_chromeos_buildflags__testing",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -24733,11 +23263,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24797,28 +23322,13 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:pool_urbg
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
srcs: [
"third_party/abseil-cpp/absl/random/internal/pool_urbg.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
],
defaults: [
"cronet_aml_defaults",
@@ -24855,11 +23365,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -24888,30 +23393,15 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:pool_urbg__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
srcs: [
"third_party/abseil-cpp/absl/random/internal/pool_urbg.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- ],
host_supported: true,
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -24942,11 +23432,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25006,21 +23491,13 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:randen
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
],
defaults: [
"cronet_aml_defaults",
@@ -25057,11 +23534,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25090,23 +23562,15 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:randen__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- ],
host_supported: true,
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -25137,11 +23601,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25201,15 +23660,13 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:randen_hwaes
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen_detect.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
],
defaults: [
"cronet_aml_defaults",
@@ -25246,11 +23703,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25279,17 +23731,15 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:randen_hwaes__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen_detect.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- ],
host_supported: true,
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -25320,11 +23770,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25384,14 +23829,13 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:randen_hwaes_impl
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
],
defaults: [
"cronet_aml_defaults",
@@ -25428,11 +23872,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25461,16 +23900,15 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:randen_hwaes_impl__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- ],
host_supported: true,
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -25501,11 +23939,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25565,18 +23998,13 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:randen_slow
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen_slow.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
],
defaults: [
"cronet_aml_defaults",
@@ -25613,11 +24041,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25646,20 +24069,15 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:randen_slow__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
srcs: [
"third_party/abseil-cpp/absl/random/internal/randen_slow.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- ],
host_supported: true,
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -25690,11 +24108,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25754,22 +24167,11 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:seed_material
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
srcs: [
"third_party/abseil-cpp/absl/random/internal/seed_material.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -25805,11 +24207,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25838,22 +24235,11 @@
}
// GN: //third_party/abseil-cpp/absl/random/internal:seed_material__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
srcs: [
"third_party/abseil-cpp/absl/random/internal/seed_material.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -25885,11 +24271,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -25949,7 +24330,7 @@
}
// GN: //third_party/abseil-cpp/absl/random:seed_gen_exception
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
srcs: [
"third_party/abseil-cpp/absl/random/seed_gen_exception.cc",
@@ -25989,11 +24370,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26022,7 +24398,7 @@
}
// GN: //third_party/abseil-cpp/absl/random:seed_gen_exception__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
srcs: [
"third_party/abseil-cpp/absl/random/seed_gen_exception.cc",
@@ -26058,11 +24434,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26122,29 +24493,13 @@
}
// GN: //third_party/abseil-cpp/absl/random:seed_sequences
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
srcs: [
"third_party/abseil-cpp/absl/random/seed_sequences.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags",
],
defaults: [
"cronet_aml_defaults",
@@ -26181,11 +24536,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26214,31 +24564,15 @@
}
// GN: //third_party/abseil-cpp/absl/random:seed_sequences__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
srcs: [
"third_party/abseil-cpp/absl/random/seed_sequences.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- ],
host_supported: true,
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -26269,11 +24603,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26333,41 +24662,12 @@
}
// GN: //third_party/abseil-cpp/absl/status:status
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_status_status",
srcs: [
"third_party/abseil-cpp/absl/status/status.cc",
"third_party/abseil-cpp/absl/status/status_payload_printer.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -26403,11 +24703,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26436,41 +24731,12 @@
}
// GN: //third_party/abseil-cpp/absl/status:status__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
srcs: [
"third_party/abseil-cpp/absl/status/status.cc",
"third_party/abseil-cpp/absl/status/status_payload_printer.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -26502,11 +24768,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26566,42 +24827,11 @@
}
// GN: //third_party/abseil-cpp/absl/status:statusor
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
srcs: [
"third_party/abseil-cpp/absl/status/statusor.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -26637,11 +24867,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26670,42 +24895,11 @@
}
// GN: //third_party/abseil-cpp/absl/status:statusor__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
srcs: [
"third_party/abseil-cpp/absl/status/statusor.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -26737,11 +24931,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26801,40 +24990,13 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cord
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
srcs: [
"third_party/abseil-cpp/absl/strings/cord.cc",
"third_party/abseil-cpp/absl/strings/cord_analysis.cc",
"third_party/abseil-cpp/absl/strings/cord_buffer.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -26870,11 +25032,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -26903,40 +25060,13 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cord__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
srcs: [
"third_party/abseil-cpp/absl/strings/cord.cc",
"third_party/abseil-cpp/absl/strings/cord_analysis.cc",
"third_party/abseil-cpp/absl/strings/cord_buffer.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -26968,11 +25098,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27032,7 +25157,7 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cord_internal
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/cord_internal.cc",
@@ -27043,16 +25168,6 @@
"third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc",
"third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -27088,11 +25203,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27121,7 +25231,7 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cord_internal__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/cord_internal.cc",
@@ -27132,16 +25242,6 @@
"third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc",
"third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -27173,11 +25273,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27237,16 +25332,11 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cordz_functions
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -27282,11 +25372,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27315,16 +25400,11 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cordz_functions__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -27356,11 +25436,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27420,31 +25495,11 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cordz_handle
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -27480,11 +25535,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27513,31 +25563,11 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cordz_handle__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -27569,11 +25599,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27633,35 +25658,11 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cordz_info
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/cordz_info.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -27697,11 +25698,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27730,35 +25726,11 @@
}
// GN: //third_party/abseil-cpp/absl/strings:cordz_info__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/cordz_info.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -27790,11 +25762,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27854,19 +25821,13 @@
}
// GN: //third_party/abseil-cpp/absl/strings:internal
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/escaping.cc",
"third_party/abseil-cpp/absl/strings/internal/ostringstream.cc",
"third_party/abseil-cpp/absl/strings/internal/utf8.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -27902,11 +25863,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -27935,19 +25891,13 @@
}
// GN: //third_party/abseil-cpp/absl/strings:internal__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/escaping.cc",
"third_party/abseil-cpp/absl/strings/internal/ostringstream.cc",
"third_party/abseil-cpp/absl/strings/internal/utf8.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -27979,11 +25929,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28043,7 +25988,7 @@
}
// GN: //third_party/abseil-cpp/absl/strings:str_format_internal
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/str_format/arg.cc",
@@ -28053,17 +25998,6 @@
"third_party/abseil-cpp/absl/strings/internal/str_format/output.cc",
"third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -28099,11 +26033,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28132,7 +26061,7 @@
}
// GN: //third_party/abseil-cpp/absl/strings:str_format_internal__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
srcs: [
"third_party/abseil-cpp/absl/strings/internal/str_format/arg.cc",
@@ -28142,17 +26071,6 @@
"third_party/abseil-cpp/absl/strings/internal/str_format/output.cc",
"third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -28184,11 +26102,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28248,7 +26161,7 @@
}
// GN: //third_party/abseil-cpp/absl/strings:strings
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
srcs: [
"third_party/abseil-cpp/absl/strings/ascii.cc",
@@ -28265,15 +26178,6 @@
"third_party/abseil-cpp/absl/strings/string_view.cc",
"third_party/abseil-cpp/absl/strings/substitute.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -28309,11 +26213,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28342,7 +26241,7 @@
}
// GN: //third_party/abseil-cpp/absl/strings:strings__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
srcs: [
"third_party/abseil-cpp/absl/strings/ascii.cc",
@@ -28359,15 +26258,6 @@
"third_party/abseil-cpp/absl/strings/string_view.cc",
"third_party/abseil-cpp/absl/strings/substitute.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -28399,11 +26289,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28463,18 +26348,11 @@
}
// GN: //third_party/abseil-cpp/absl/synchronization:graphcycles_internal
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
srcs: [
"third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -28510,11 +26388,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28543,18 +26416,11 @@
}
// GN: //third_party/abseil-cpp/absl/synchronization:graphcycles_internal__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
srcs: [
"third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -28586,11 +26452,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28650,7 +26511,7 @@
}
// GN: //third_party/abseil-cpp/absl/synchronization:synchronization
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
srcs: [
"third_party/abseil-cpp/absl/synchronization/barrier.cc",
@@ -28661,25 +26522,6 @@
"third_party/abseil-cpp/absl/synchronization/mutex.cc",
"third_party/abseil-cpp/absl/synchronization/notification.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -28715,11 +26557,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28748,7 +26585,7 @@
}
// GN: //third_party/abseil-cpp/absl/synchronization:synchronization__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
srcs: [
"third_party/abseil-cpp/absl/synchronization/barrier.cc",
@@ -28759,25 +26596,6 @@
"third_party/abseil-cpp/absl/synchronization/mutex.cc",
"third_party/abseil-cpp/absl/synchronization/notification.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -28809,11 +26627,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28873,7 +26686,7 @@
}
// GN: //third_party/abseil-cpp/absl/time/internal/cctz:civil_time
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
srcs: [
"third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc",
@@ -28913,11 +26726,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -28946,7 +26754,7 @@
}
// GN: //third_party/abseil-cpp/absl/time/internal/cctz:civil_time__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
srcs: [
"third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc",
@@ -28982,11 +26790,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29046,7 +26849,7 @@
}
// GN: //third_party/abseil-cpp/absl/time/internal/cctz:time_zone
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
srcs: [
"third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc",
@@ -29059,9 +26862,6 @@
"third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc",
"third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -29097,11 +26897,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29130,7 +26925,7 @@
}
// GN: //third_party/abseil-cpp/absl/time/internal/cctz:time_zone__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
srcs: [
"third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc",
@@ -29143,9 +26938,6 @@
"third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc",
"third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -29177,11 +26969,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29241,7 +27028,7 @@
}
// GN: //third_party/abseil-cpp/absl/time:time
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_time_time",
srcs: [
"third_party/abseil-cpp/absl/time/civil_time.cc",
@@ -29250,18 +27037,6 @@
"third_party/abseil-cpp/absl/time/format.cc",
"third_party/abseil-cpp/absl/time/time.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -29297,11 +27072,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29330,7 +27100,7 @@
}
// GN: //third_party/abseil-cpp/absl/time:time__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
srcs: [
"third_party/abseil-cpp/absl/time/civil_time.cc",
@@ -29339,18 +27109,6 @@
"third_party/abseil-cpp/absl/time/format.cc",
"third_party/abseil-cpp/absl/time/time.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -29382,11 +27140,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29446,15 +27199,11 @@
}
// GN: //third_party/abseil-cpp/absl/types:bad_optional_access
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
srcs: [
"third_party/abseil-cpp/absl/types/bad_optional_access.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -29490,11 +27239,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29523,15 +27267,11 @@
}
// GN: //third_party/abseil-cpp/absl/types:bad_optional_access__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
srcs: [
"third_party/abseil-cpp/absl/types/bad_optional_access.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -29563,11 +27303,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29627,15 +27362,11 @@
}
// GN: //third_party/abseil-cpp/absl/types:bad_variant_access
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
srcs: [
"third_party/abseil-cpp/absl/types/bad_variant_access.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- ],
defaults: [
"cronet_aml_defaults",
],
@@ -29671,11 +27402,6 @@
"third_party/abseil-cpp/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29704,15 +27430,11 @@
}
// GN: //third_party/abseil-cpp/absl/types:bad_variant_access__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
srcs: [
"third_party/abseil-cpp/absl/types/bad_variant_access.cc",
],
- static_libs: [
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -29744,11 +27466,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29808,7 +27525,7 @@
}
// GN: //third_party/android_ndk:cpu_features
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_android_ndk_cpu_features",
srcs: [
"third_party/android_ndk/sources/android/cpufeatures/cpu-features.c",
@@ -29847,11 +27564,6 @@
"third_party/android_ndk/sources/android/cpufeatures/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29880,7 +27592,7 @@
}
// GN: //third_party/android_ndk:cpu_features__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_android_ndk_cpu_features__testing",
srcs: [
"third_party/android_ndk/sources/android/cpufeatures/cpu-features.c",
@@ -29919,11 +27631,6 @@
"third_party/android_ndk/sources/android/cpufeatures/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -29952,7 +27659,7 @@
}
// GN: //third_party/ashmem:ashmem
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_ashmem_ashmem",
srcs: [
"third_party/ashmem/ashmem-dev.c",
@@ -29993,11 +27700,6 @@
"buildtools/third_party/libc++abi/trunk/include",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -30026,7 +27728,7 @@
}
// GN: //third_party/ashmem:ashmem__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_ashmem_ashmem__testing",
srcs: [
"third_party/ashmem/ashmem-dev.c",
@@ -30067,11 +27769,6 @@
"buildtools/third_party/libc++abi/trunk/include",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
cflags: [
@@ -30103,6 +27800,7 @@
cc_library_static {
name: "cronet_aml_third_party_boringssl_boringssl__testing",
srcs: [
+ ":cronet_aml_third_party_boringssl_boringssl_asm__testing",
"third_party/boringssl/err_data.c",
"third_party/boringssl/src/crypto/asn1/a_bitstr.c",
"third_party/boringssl/src/crypto/asn1/a_bool.c",
@@ -30370,9 +28068,6 @@
"third_party/boringssl/src/ssl/tls_method.cc",
"third_party/boringssl/src/ssl/tls_record.cc",
],
- static_libs: [
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
- ],
host_supported: true,
defaults: [
"cronet_aml_defaults",
@@ -30471,7 +28166,7 @@
}
// GN: //third_party/boringssl:boringssl_asm__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_boringssl_boringssl_asm__testing",
host_supported: true,
defaults: [
@@ -30506,11 +28201,6 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/boringssl/src/include/",
],
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
target: {
android_arm: {
srcs: [
@@ -31052,7 +28742,7 @@
}
// GN: //third_party/googletest:gmock__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_googletest_gmock__testing",
srcs: [
"third_party/googletest/src/googlemock/src/gmock-cardinalities.cc",
@@ -31069,66 +28759,17 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
- "cronet_aml_third_party_googletest_gtest__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
"cronet_aml_third_party_modp_b64_modp_b64__testing",
],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -31174,27 +28815,6 @@
"third_party/googletest/src/googletest/include/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -31223,7 +28843,7 @@
}
// GN: //third_party/googletest:gtest__testing
-cc_library_static {
+cc_object {
name: "cronet_aml_third_party_googletest_gtest__testing",
srcs: [
"third_party/googletest/custom/gtest/internal/custom/chrome_custom_temp_dir.cc",
@@ -31246,65 +28866,17 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
"cronet_aml_third_party_modp_b64_modp_b64__testing",
],
+ generated_headers: [
+ "cronet_aml_build_chromeos_buildflags__testing",
+ ],
defaults: [
"cronet_aml_defaults",
],
@@ -31348,27 +28920,6 @@
"third_party/googletest/src/googletest/include/",
],
cpp_std: "c++17",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- "-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
- "-Wl,-wrap,asprintf",
- "-Wl,-wrap,calloc",
- "-Wl,-wrap,free",
- "-Wl,-wrap,getcwd",
- "-Wl,-wrap,malloc",
- "-Wl,-wrap,malloc_usable_size",
- "-Wl,-wrap,memalign",
- "-Wl,-wrap,posix_memalign",
- "-Wl,-wrap,pvalloc",
- "-Wl,-wrap,realloc",
- "-Wl,-wrap,realpath",
- "-Wl,-wrap,strdup",
- "-Wl,-wrap,strndup",
- "-Wl,-wrap,valloc",
- "-Wl,-wrap,vasprintf",
- ],
target: {
android_arm: {
cflags: [
@@ -34021,14 +31572,14 @@
cc_binary {
name: "cronet_aml_third_party_protobuf_protoc",
srcs: [
+ ":cronet_aml_buildtools_third_party_libc___libc__",
+ ":cronet_aml_buildtools_third_party_libc__abi_libc__abi",
"third_party/protobuf/src/google/protobuf/compiler/main.cc",
],
shared_libs: [
"libz",
],
static_libs: [
- "cronet_aml_buildtools_third_party_libc___libc__",
- "cronet_aml_buildtools_third_party_libc__abi_libc__abi",
"cronet_aml_third_party_protobuf_protobuf_full",
"cronet_aml_third_party_protobuf_protoc_lib",
],
@@ -34234,6 +31785,48 @@
],
}
+// GN: //third_party/quic_trace:quic_trace_proto__testing
+cc_genrule {
+ name: "cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen",
+ srcs: [
+ "third_party/quic_trace/src/quic_trace/quic_trace.proto",
+ ],
+ tools: [
+ "cronet_aml_third_party_protobuf_protoc",
+ ],
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/third_party/quic_trace/src/quic_trace --cpp_out=lite=true:$(genDir)/external/cronet/third_party/quic_trace/src/quic_trace/ $(in)",
+ out: [
+ "external/cronet/third_party/quic_trace/src/quic_trace/quic_trace.pb.cc",
+ ],
+ apex_available: [
+ "com.android.tethering",
+ ],
+}
+
+// GN: //third_party/quic_trace:quic_trace_proto__testing
+cc_genrule {
+ name: "cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers",
+ srcs: [
+ "third_party/quic_trace/src/quic_trace/quic_trace.proto",
+ ],
+ tools: [
+ "cronet_aml_third_party_protobuf_protoc",
+ ],
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/third_party/quic_trace/src/quic_trace --cpp_out=lite=true:$(genDir)/external/cronet/third_party/quic_trace/src/quic_trace/ $(in)",
+ out: [
+ "external/cronet/third_party/quic_trace/src/quic_trace/quic_trace.pb.h",
+ ],
+ export_include_dirs: [
+ ".",
+ "protos",
+ "third_party/quic_trace/src",
+ "third_party/quic_trace/src/quic_trace",
+ ],
+ apex_available: [
+ "com.android.tethering",
+ ],
+}
+
// GN: //url:buildflags
cc_genrule {
name: "cronet_aml_url_buildflags",
@@ -34317,58 +31910,8 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
"cronet_aml_base_base",
"cronet_aml_base_base_static",
- "cronet_aml_base_nodebug_assertion",
"cronet_aml_base_third_party_double_conversion_double_conversion",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
- "cronet_aml_third_party_abseil_cpp_absl_base_base",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences",
- "cronet_aml_third_party_abseil_cpp_absl_status_status",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone",
- "cronet_aml_third_party_abseil_cpp_absl_time_time",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access",
- "cronet_aml_third_party_android_ndk_cpu_features",
- "cronet_aml_third_party_ashmem_ashmem",
"cronet_aml_third_party_icu_icui18n",
"cronet_aml_third_party_icu_icuuc_private",
"cronet_aml_third_party_libevent_libevent",
@@ -34510,60 +32053,9 @@
"cronet_aml_base_allocator_partition_allocator_partition_alloc__testing",
"cronet_aml_base_base__testing",
"cronet_aml_base_base_static__testing",
- "cronet_aml_base_nodebug_assertion__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_base__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_log_severity__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_malloc_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_raw_logging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_spinlock_wait__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_strerror__testing",
- "cronet_aml_third_party_abseil_cpp_absl_base_throw_delegate__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_hashtablez_sampler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_container_raw_hash_set__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_debugging_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_demangle_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_examine_stack__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_failure_signal_handler__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_stacktrace__testing",
- "cronet_aml_third_party_abseil_cpp_absl_debugging_symbolize__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_city__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_hash_low_level_hash__testing",
- "cronet_aml_third_party_abseil_cpp_absl_numeric_int128__testing",
- "cronet_aml_third_party_abseil_cpp_absl_profiling_exponential_biased__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_distributions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_platform__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_pool_urbg__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_hwaes_impl__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_randen_slow__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_internal_seed_material__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_gen_exception__testing",
- "cronet_aml_third_party_abseil_cpp_absl_random_seed_sequences__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_status__testing",
- "cronet_aml_third_party_abseil_cpp_absl_status_statusor__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cord_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_functions__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_handle__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_cordz_info__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_str_format_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_strings_strings__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_graphcycles_internal__testing",
- "cronet_aml_third_party_abseil_cpp_absl_synchronization_synchronization__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_civil_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_internal_cctz_time_zone__testing",
- "cronet_aml_third_party_abseil_cpp_absl_time_time__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_optional_access__testing",
- "cronet_aml_third_party_abseil_cpp_absl_types_bad_variant_access__testing",
- "cronet_aml_third_party_android_ndk_cpu_features__testing",
- "cronet_aml_third_party_ashmem_ashmem__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
- "cronet_aml_third_party_boringssl_boringssl_asm__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
"cronet_aml_third_party_libevent_libevent__testing",
diff --git a/tools/gn2bp/desc_arm.json b/tools/gn2bp/desc_arm.json
index 87b86e3..8087bc9 100644
--- a/tools/gn2bp/desc_arm.json
+++ b/tools/gn2bp/desc_arm.json
Binary files differ
diff --git a/tools/gn2bp/desc_arm64.json b/tools/gn2bp/desc_arm64.json
index 7b8bfe3..99e2332 100644
--- a/tools/gn2bp/desc_arm64.json
+++ b/tools/gn2bp/desc_arm64.json
Binary files differ
diff --git a/tools/gn2bp/desc_x64.json b/tools/gn2bp/desc_x64.json
index df8635a..bba6b56 100644
--- a/tools/gn2bp/desc_x64.json
+++ b/tools/gn2bp/desc_x64.json
Binary files differ
diff --git a/tools/gn2bp/desc_x86.json b/tools/gn2bp/desc_x86.json
index 707b9c7..a5d4891 100644
--- a/tools/gn2bp/desc_x86.json
+++ b/tools/gn2bp/desc_x86.json
Binary files differ
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index b48a05b..b55b9bf 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -49,6 +49,7 @@
DEFAULT_TESTS = [
'//components/cronet/android:cronet_unittests_android__library',
+ '//net:net_unittests__library',
]
EXTRAS_ANDROID_BP_FILE = "Android.extras.bp"
@@ -166,6 +167,21 @@
# Additional arguments to apply to Android.bp rules.
additional_args = {
+ 'cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers': [
+ ('export_include_dirs', {
+ "net/third_party/quiche/src",
+ })
+ ],
+ 'cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers': [
+ ('export_include_dirs', {
+ "net/third_party/quiche/src",
+ })
+ ],
+ 'cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers': [
+ ('export_include_dirs', {
+ "third_party/quic_trace/src",
+ })
+ ],
'cronet_aml_net_net': [
('export_static_lib_headers', {
'cronet_aml_net_third_party_quiche_quiche',
@@ -569,13 +585,7 @@
return self.type == "cc_genrule"
def has_input_files(self):
- if len(self.srcs) > 0:
- return True
- if any([len(target.srcs) > 0 for target in self.target.values()]):
- return True
- # Allow cc_static_library with export_generated_headers as those are crucial for
- # the depending modules
- return len(self.export_generated_headers) > 0
+ return len(self.srcs) > 0 or any([len(target.srcs) > 0 for target in self.target.values()])
def merge_attribute(self, key, source_module, allowed_archs, source_key = None):
"""
@@ -617,8 +627,8 @@
def to_string(self, output):
for m in sorted(self.modules.values(), key=lambda m: m.name):
- if m.type != "cc_library_static" or m.has_input_files():
- # Don't print cc_library_static with empty srcs. These attributes are already
+ if m.type != "cc_object" or m.has_input_files():
+ # Don't print cc_object with empty srcs. These attributes are already
# propagated up the tree. Printing them messes the presubmits because
# every module is compiled while those targets are not reachable in
# a normal compilation path.
@@ -1046,10 +1056,19 @@
return "$(location %s)" % arg.replace("gen/", "")
return arg
+ def _replace_binary(self, arg):
+ if arg in self.binary_to_target:
+ return '$(location %s)' % self.binary
+ return arg
+
+ def _remove_python_args(self):
+ self.target.args = [arg for arg in self.target.args if "python3" not in arg]
+
def _sanitize_args(self):
self._update_all_args(self._sanitize_filepath_with_location_tag)
self._update_all_args(self._replace_gen_with_location_tag)
- self._set_arg_at(0, '$(location %s)' % self.binary)
+ self._update_all_args(self._replace_binary)
+ self._remove_python_args()
super()._sanitize_args()
def get_tools(self):
@@ -1243,7 +1262,8 @@
# don't add script arg for the first source -- create_action_module
# already does this.
if i != 0:
- new_args.append('&& python3 $(location %s)' %
+ new_args.append('&&')
+ new_args.append('python3 $(location %s)' %
gn_utils.label_to_path(target.script))
for arg in target.args:
if '{{source}}' in arg:
@@ -1257,6 +1277,10 @@
for out in target.outputs:
if out.endswith(file_name):
new_args.append('$(location %s)' % out)
+
+ for file in target.sources:
+ if file.endswith(file_name):
+ new_args.append('$(location %s)' % gn_utils.label_to_path(file))
else:
new_args.append(arg)
@@ -1371,9 +1395,10 @@
def set_module_flags(module, module_type, cflags, defines, ldflags, libs):
module.cflags.update(_get_cflags(cflags, defines))
- module.ldflags.update({flag for flag in ldflags
- if flag in ldflag_allowlist or flag.startswith("-Wl,-wrap,")})
- _set_linker_script(module, libs)
+ if module_type != 'cc_object':
+ module.ldflags.update({flag for flag in ldflags
+ if flag in ldflag_allowlist or flag.startswith("-Wl,-wrap,")})
+ _set_linker_script(module, libs)
# TODO: implement proper cflag parsing.
for flag in cflags:
if '-std=' in flag:
@@ -1422,10 +1447,12 @@
# Can be used for both host and device targets.
module_type = 'cc_binary'
module = Module(module_type, bp_module_name, gn_target_name)
- elif target.type in ['static_library', 'source_set']:
+ elif target.type == 'static_library':
module = Module('cc_library_static', bp_module_name, gn_target_name)
elif target.type == 'shared_library':
module = Module('cc_library_shared', bp_module_name, gn_target_name)
+ elif target.type == 'source_set':
+ module = Module('cc_object', bp_module_name, gn_target_name)
elif target.type == 'group':
# "group" targets are resolved recursively by gn_utils.get_target().
# There's nothing we need to do at this level for them.
@@ -1548,21 +1575,27 @@
if not module.is_compiled() or module.is_genrule():
continue
- # Drop compiled modules that doesn't provide any benefit. This is mostly
- # applicable to source_sets when converted to cc_static_library, sometimes
- # the source set only has header files which are dropped so the module becomes empty.
- if dep_module.is_compiled() and not dep_module.has_input_files():
- continue
-
if dep_module.type == 'cc_library_shared':
module.shared_libs.add(dep_module.name)
elif dep_module.type == 'cc_library_static':
module.static_libs.add(dep_module.name)
+ elif dep_module.type == 'cc_object':
+ module.merge_attribute('generated_headers', dep_module, target.arch.keys())
+ if module.type != 'cc_object':
+ if dep_module.has_input_files():
+ # Only add it as part of srcs if the dep_module has input files otherwise
+ # this would throw an error.
+ module.srcs.add(":" + dep_module.name)
+ module.merge_attribute('export_generated_headers', dep_module,
+ target.arch.keys(), 'generated_headers')
elif dep_module.type == 'cc_genrule':
module.merge_attribute('generated_headers', dep_module, [], 'genrule_headers')
module.merge_attribute('srcs', dep_module, [], 'genrule_srcs')
module.merge_attribute('shared_libs', dep_module, [], 'genrule_shared_libs')
module.merge_attribute('header_libs', dep_module, [], 'genrule_header_libs')
+ if module.type not in ["cc_object"]:
+ module.merge_attribute('export_generated_headers', dep_module, [],
+ 'genrule_headers')
elif dep_module.type == 'cc_binary':
continue # Ignore executables deps (used by cmdline integration tests).
else:
@@ -1580,13 +1613,20 @@
# Arch-specific dependencies currently only include cc_library_static.
# Revisit this approach once we need to support more target types.
if dep_module.type == 'cc_library_static':
- if dep_module.has_input_files():
- module.target[arch_name].static_libs.add(dep_module.name)
+ module.target[arch_name].static_libs.add(dep_module.name)
elif dep_module.type == 'cc_genrule':
module.target[arch_name].generated_headers.update(dep_module.genrule_headers)
module.target[arch_name].srcs.update(dep_module.genrule_srcs)
module.target[arch_name].shared_libs.update(dep_module.genrule_shared_libs)
module.target[arch_name].header_libs.update(dep_module.genrule_header_libs)
+ if module.type not in ["cc_object"]:
+ module.target[arch_name].export_generated_headers.update(
+ dep_module.genrule_headers)
+ elif dep_module.type == 'cc_object':
+ if dep_module.has_input_files():
+ # Only add it as part of srcs if the dep_module has input files otherwise
+ # this would throw an error.
+ module.target[arch_name].srcs.add(":" + dep_module.name)
else:
raise Error('Unsupported arch-specific dependency %s of target %s with type %s' %
(dep_module.name, target.name, dep_module.type))
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index 4066673..09a7b80 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -429,6 +429,14 @@
target.transitive_proto_deps.add(dep.name)
target.proto_paths.update(dep.proto_paths)
target.transitive_proto_deps.update(dep.transitive_proto_deps)
+ elif dep.type == 'source_set':
+ target.arch[arch].source_set_deps.add(dep.name)
+ target.arch[arch].source_set_deps.update(dep.arch[arch].source_set_deps)
+ # flatten source_set deps
+ if target.is_linker_unit_type():
+ # This ensure that all transitive source set dependencies are
+ # propagated upward to the linker units.
+ target.arch[arch].deps.update(target.arch[arch].source_set_deps)
elif dep.type == 'group':
target.update(dep, arch) # Bubble up groups's cflags/ldflags etc.
elif dep.type in ['action', 'action_foreach', 'copy']:
@@ -442,11 +450,12 @@
# java_library.
pass
- if dep.type in ['static_library', 'source_set']:
- # Bubble up static_libs and source_set. Necessary, since soong does not propagate
+ # Source set bubble up transitive source sets but can't be combined with this
+ # if they are combined then source sets will bubble up static libraries
+ # while we only want to have source sets bubble up only source sets.
+ if dep.type == 'static_library':
+ # Bubble up static_libs. Necessary, since soong does not propagate
# static_libs up the build tree.
- # Source sets are later translated to static_libraries, so it makes sense
- # to reuse transitive_static_libs_deps.
target.arch[arch].transitive_static_libs_deps.add(dep.name)
if arch in dep.arch: