Merge "switch DscpPolicyTracker from U32 to S32"
diff --git a/framework-t/src/android/net/IIpSecService.aidl b/framework-t/src/android/net/IIpSecService.aidl
index 933256a..88ffd0e 100644
--- a/framework-t/src/android/net/IIpSecService.aidl
+++ b/framework-t/src/android/net/IIpSecService.aidl
@@ -66,6 +66,12 @@
IpSecTransformResponse createTransform(
in IpSecConfig c, in IBinder binder, in String callingPackage);
+ void migrateTransform(
+ int transformId,
+ in String newSourceAddress,
+ in String newDestinationAddress,
+ in String callingPackage);
+
void deleteTransform(int transformId);
void applyTransportModeTransform(
diff --git a/framework-t/src/android/net/IpSecManager.java b/framework-t/src/android/net/IpSecManager.java
index 9cceac2..1c83e09 100644
--- a/framework-t/src/android/net/IpSecManager.java
+++ b/framework-t/src/android/net/IpSecManager.java
@@ -37,6 +37,7 @@
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.build.SdkLevel;
import dalvik.system.CloseGuard;
@@ -65,6 +66,24 @@
private static final String TAG = "IpSecManager";
/**
+ * Feature flag to declare the kernel support of updating IPsec SAs.
+ *
+ * <p>Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device
+ * has the requisite kernel support for migrating IPsec tunnels to new source/destination
+ * addresses.
+ *
+ * <p>This feature implies that the device supports XFRM Migration (CONFIG_XFRM_MIGRATE) and has
+ * the kernel fixes to allow XFRM Migration correctly
+ *
+ * @see android.content.pm.PackageManager#FEATURE_IPSEC_TUNNEL_MIGRATION
+ * @hide
+ */
+ // Redefine this flag here so that IPsec code shipped in a mainline module can build on old
+ // platforms before FEATURE_IPSEC_TUNNEL_MIGRATION API is released.
+ public static final String FEATURE_IPSEC_TUNNEL_MIGRATION =
+ "android.software.ipsec_tunnel_migration";
+
+ /**
* Used when applying a transform to direct traffic through an {@link IpSecTransform}
* towards the host.
*
@@ -988,6 +1007,59 @@
}
/**
+ * Migrate an active Tunnel Mode IPsec Transform to new source/destination addresses.
+ *
+ * <p>Begins the process of migrating a transform and cache the new addresses. To complete the
+ * migration once started, callers MUST apply the same transform to the appropriate tunnel using
+ * {@link IpSecManager#applyTunnelModeTransform}. Otherwise, the address update will not be
+ * committed and the transform will still only process traffic between the current source and
+ * destination address. One common use case is that the control plane will start the migration
+ * process and then hand off the transform to the IPsec caller to perform the actual migration
+ * when the tunnel is ready.
+ *
+ * <p>If this method is called multiple times before {@link
+ * IpSecManager#applyTunnelModeTransform} is called, when the transform is applied, it will be
+ * migrated to the addresses from the last call.
+ *
+ * <p>The provided source and destination addresses MUST share the same address family, but they
+ * can have a different family from the current addresses.
+ *
+ * <p>Transform migration is only supported for tunnel mode transforms. Calling this method on
+ * other types of transforms will throw an {@code UnsupportedOperationException}.
+ *
+ * @see IpSecTunnelInterface#setUnderlyingNetwork
+ * @param transform a tunnel mode {@link IpSecTransform}
+ * @param newSourceAddress the new source address
+ * @param newDestinationAddress the new destination address
+ * @hide
+ */
+ @RequiresFeature(FEATURE_IPSEC_TUNNEL_MIGRATION)
+ @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)
+ public void startMigration(
+ @NonNull IpSecTransform transform,
+ @NonNull InetAddress newSourceAddress,
+ @NonNull InetAddress newDestinationAddress) {
+ if (!SdkLevel.isAtLeastU()) {
+ throw new UnsupportedOperationException(
+ "Transform migration only supported for Android 14+");
+ }
+
+ Objects.requireNonNull(transform, "transform was null");
+ Objects.requireNonNull(newSourceAddress, "newSourceAddress was null");
+ Objects.requireNonNull(newDestinationAddress, "newDestinationAddress was null");
+
+ try {
+ mService.migrateTransform(
+ transform.getResourceId(),
+ newSourceAddress.getHostAddress(),
+ newDestinationAddress.getHostAddress(),
+ mContext.getOpPackageName());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* @hide
*/
public IpSecTransformResponse createTransform(IpSecConfig config, IBinder binder,
diff --git a/service-t/src/com/android/server/IpSecService.java b/service-t/src/com/android/server/IpSecService.java
index 6cee08a..9e71eb3 100644
--- a/service-t/src/com/android/server/IpSecService.java
+++ b/service-t/src/com/android/server/IpSecService.java
@@ -17,6 +17,7 @@
package com.android.server;
import static android.Manifest.permission.DUMP;
+import static android.net.IpSecManager.FEATURE_IPSEC_TUNNEL_MIGRATION;
import static android.net.IpSecManager.INVALID_RESOURCE_ID;
import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.AF_INET6;
@@ -36,6 +37,7 @@
import android.net.IpSecAlgorithm;
import android.net.IpSecConfig;
import android.net.IpSecManager;
+import android.net.IpSecMigrateInfoParcel;
import android.net.IpSecSpiResponse;
import android.net.IpSecTransform;
import android.net.IpSecTransformResponse;
@@ -590,14 +592,19 @@
}
/**
- * Tracks an SA in the kernel, and manages cleanup paths. Once a TransformRecord is
- * created, the SpiRecord that originally tracked the SAs will reliquish the
- * responsibility of freeing the underlying SA to this class via the mOwnedByTransform flag.
+ * Tracks an SA in the kernel, and manages cleanup paths. Once a TransformRecord is created, the
+ * SpiRecord that originally tracked the SAs will reliquish the responsibility of freeing the
+ * underlying SA to this class via the mOwnedByTransform flag.
+ *
+ * <p>This class is not thread-safe, and expects that that users of this class will ensure
+ * synchronization and thread safety by holding the IpSecService.this instance lock
*/
private final class TransformRecord extends OwnedResourceRecord {
private final IpSecConfig mConfig;
private final SpiRecord mSpi;
private final EncapSocketRecord mSocket;
+ private String mNewSourceAddress = null;
+ private String mNewDestinationAddress = null;
TransformRecord(
int resourceId, IpSecConfig config, SpiRecord spi, EncapSocketRecord socket) {
@@ -621,6 +628,51 @@
return mSocket;
}
+ @GuardedBy("IpSecService.this")
+ public String getNewSourceAddress() {
+ return mNewSourceAddress;
+ }
+
+ @GuardedBy("IpSecService.this")
+ public String getNewDestinationAddress() {
+ return mNewDestinationAddress;
+ }
+
+ private void verifyTunnelModeOrThrow() {
+ if (mConfig.getMode() != IpSecTransform.MODE_TUNNEL) {
+ throw new UnsupportedOperationException(
+ "Migration requested/called on non-tunnel-mode transform");
+ }
+ }
+
+ /** Start migrating this transform to new source and destination addresses */
+ @GuardedBy("IpSecService.this")
+ public void startMigration(String newSourceAddress, String newDestinationAddress) {
+ verifyTunnelModeOrThrow();
+ Objects.requireNonNull(newSourceAddress, "newSourceAddress was null");
+ Objects.requireNonNull(newDestinationAddress, "newDestinationAddress was null");
+ mNewSourceAddress = newSourceAddress;
+ mNewDestinationAddress = newDestinationAddress;
+ }
+
+ /** Finish migration and update addresses. */
+ @GuardedBy("IpSecService.this")
+ public void finishMigration() {
+ verifyTunnelModeOrThrow();
+ mConfig.setSourceAddress(mNewSourceAddress);
+ mConfig.setDestinationAddress(mNewDestinationAddress);
+ mNewSourceAddress = null;
+ mNewDestinationAddress = null;
+ }
+
+ /** Return if this transform is going to be migrated. */
+ @GuardedBy("IpSecService.this")
+ public boolean isMigrating() {
+ verifyTunnelModeOrThrow();
+
+ return mNewSourceAddress != null;
+ }
+
/** always guarded by IpSecService#this */
@Override
public void freeUnderlyingResources() {
@@ -1630,6 +1682,14 @@
android.Manifest.permission.MANAGE_IPSEC_TUNNELS, "IpSecService");
}
+ private void enforceMigrateFeature() {
+ if (!mContext.getPackageManager().hasSystemFeature(FEATURE_IPSEC_TUNNEL_MIGRATION)) {
+ throw new UnsupportedOperationException(
+ "IPsec Tunnel migration requires"
+ + " PackageManager.FEATURE_IPSEC_TUNNEL_MIGRATION");
+ }
+ }
+
private void createOrUpdateTransform(
IpSecConfig c, int resourceId, SpiRecord spiRecord, EncapSocketRecord socketRecord)
throws RemoteException {
@@ -1726,6 +1786,45 @@
}
/**
+ * Migrate an active Tunnel Mode IPsec Transform to new source/destination addresses.
+ *
+ * <p>Begins the process of migrating a transform and cache the new addresses. To complete the
+ * migration once started, callers MUST apply the same transform to the appropriate tunnel using
+ * {@link #applyTunnelModeTransform}. Otherwise, the address update will not be committed and
+ * the transform will still only process traffic between the current source and destination
+ * address. One common use case is that the control plane will start the migration process and
+ * then hand off the transform to the IPsec caller to perform the actual migration when the
+ * tunnel is ready.
+ *
+ * <p>If this method is called multiple times before {@link #applyTunnelModeTransform} is
+ * called, when the transform is applied, it will be migrated to the addresses from the last
+ * call.
+ *
+ * <p>The provided source and destination addresses MUST share the same address family, but they
+ * can have a different family from the current addresses.
+ *
+ * <p>Transform migration is only supported for tunnel mode transforms. Calling this method on
+ * other types of transforms will throw an {@code UnsupportedOperationException}.
+ */
+ @Override
+ public synchronized void migrateTransform(
+ int transformId,
+ String newSourceAddress,
+ String newDestinationAddress,
+ String callingPackage) {
+ Objects.requireNonNull(newSourceAddress, "newSourceAddress was null");
+ Objects.requireNonNull(newDestinationAddress, "newDestinationAddress was null");
+
+ enforceTunnelFeatureAndPermissions(callingPackage);
+ enforceMigrateFeature();
+
+ UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid());
+ TransformRecord transformInfo =
+ userRecord.mTransformRecords.getResourceOrThrow(transformId);
+ transformInfo.startMigration(newSourceAddress, newDestinationAddress);
+ }
+
+ /**
* Delete a transport mode transform that was previously allocated by + registered with the
* system server. If this is called on an inactive (or non-existent) transform, it will not
* return an error. It's safe to de-allocate transforms that may have already been deleted for
@@ -1784,12 +1883,15 @@
/**
* Apply an active tunnel mode transform to a TunnelInterface, which will apply the IPsec
- * security association as a correspondent policy to the provided interface
+ * security association as a correspondent policy to the provided interface.
+ *
+ * <p>If the transform is migrating, migrate the IPsec security association to new
+ * source/destination addresses, and mark the migration as finished.
*/
@Override
public synchronized void applyTunnelModeTransform(
- int tunnelResourceId, int direction,
- int transformResourceId, String callingPackage) throws RemoteException {
+ int tunnelResourceId, int direction, int transformResourceId, String callingPackage)
+ throws RemoteException {
enforceTunnelFeatureAndPermissions(callingPackage);
checkDirection(direction);
@@ -1868,6 +1970,32 @@
// Update SA with tunnel mark (ikey or okey based on direction)
createOrUpdateTransform(c, transformResourceId, spiRecord, socketRecord);
+
+ if (transformInfo.isMigrating()) {
+ if (!mContext.getPackageManager()
+ .hasSystemFeature(FEATURE_IPSEC_TUNNEL_MIGRATION)) {
+ Log.wtf(
+ TAG,
+ "Attempted to migrate a transform without"
+ + " FEATURE_IPSEC_TUNNEL_MIGRATION");
+ }
+
+ for (int selAddrFamily : ADDRESS_FAMILIES) {
+ final IpSecMigrateInfoParcel migrateInfo =
+ new IpSecMigrateInfoParcel(
+ Binder.getCallingUid(),
+ selAddrFamily,
+ direction,
+ c.getSourceAddress(),
+ c.getDestinationAddress(),
+ transformInfo.getNewSourceAddress(),
+ transformInfo.getNewDestinationAddress(),
+ c.getXfrmInterfaceId());
+
+ mNetd.ipSecMigrate(migrateInfo);
+ }
+ transformInfo.finishMigration();
+ }
} catch (ServiceSpecificException e) {
if (e.errorCode == EINVAL) {
throw new IllegalArgumentException(e.toString());
diff --git a/tests/unit/java/android/net/IpSecTransformTest.java b/tests/unit/java/android/net/IpSecTransformTest.java
index c1bd719..ec59064 100644
--- a/tests/unit/java/android/net/IpSecTransformTest.java
+++ b/tests/unit/java/android/net/IpSecTransformTest.java
@@ -18,22 +18,92 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import android.content.Context;
import android.os.Build;
+import android.test.mock.MockContext;
import androidx.test.filters.SmallTest;
+import com.android.server.IpSecService;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRunner;
+import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.net.InetAddress;
+
/** Unit tests for {@link IpSecTransform}. */
@SmallTest
@RunWith(DevSdkIgnoreRunner.class)
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
public class IpSecTransformTest {
+ @Rule public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule();
+
+ private static final int DROID_SPI = 0xD1201D;
+ private static final int TEST_RESOURCE_ID = 0x1234;
+
+ private static final InetAddress SRC_ADDRESS = InetAddresses.parseNumericAddress("192.0.2.200");
+ private static final InetAddress DST_ADDRESS = InetAddresses.parseNumericAddress("192.0.2.201");
+ private static final InetAddress SRC_ADDRESS_V6 =
+ InetAddresses.parseNumericAddress("2001:db8::200");
+ private static final InetAddress DST_ADDRESS_V6 =
+ InetAddresses.parseNumericAddress("2001:db8::201");
+
+ private MockContext mMockContext;
+ private IpSecService mMockIpSecService;
+ private IpSecManager mIpSecManager;
+
+ @Before
+ public void setUp() throws Exception {
+ mMockIpSecService = mock(IpSecService.class);
+ mIpSecManager = new IpSecManager(mock(Context.class) /* unused */, mMockIpSecService);
+
+ // Set up mMockContext since IpSecTransform needs an IpSecManager instance and a non-null
+ // package name to create transform
+ mMockContext =
+ new MockContext() {
+ @Override
+ public String getSystemServiceName(Class<?> serviceClass) {
+ if (serviceClass.equals(IpSecManager.class)) {
+ return Context.IPSEC_SERVICE;
+ }
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Object getSystemService(String name) {
+ if (name.equals(Context.IPSEC_SERVICE)) {
+ return mIpSecManager;
+ }
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getOpPackageName() {
+ return "fooPackage";
+ }
+ };
+
+ final IpSecSpiResponse spiResp =
+ new IpSecSpiResponse(IpSecManager.Status.OK, TEST_RESOURCE_ID, DROID_SPI);
+ when(mMockIpSecService.allocateSecurityParameterIndex(any(), anyInt(), any()))
+ .thenReturn(spiResp);
+
+ final IpSecTransformResponse transformResp =
+ new IpSecTransformResponse(IpSecManager.Status.OK, TEST_RESOURCE_ID);
+ when(mMockIpSecService.createTransform(any(), any(), any())).thenReturn(transformResp);
+ }
@Test
public void testCreateTransformCopiesConfig() {
@@ -64,4 +134,32 @@
assertEquals(config1, config2);
}
+
+ private IpSecTransform buildTestTransform() throws Exception {
+ final IpSecManager.SecurityParameterIndex spi =
+ mIpSecManager.allocateSecurityParameterIndex(DST_ADDRESS);
+ return new IpSecTransform.Builder(mMockContext).buildTunnelModeTransform(SRC_ADDRESS, spi);
+ }
+
+ @Test
+ @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ public void testStartMigration() throws Exception {
+ mIpSecManager.startMigration(buildTestTransform(), SRC_ADDRESS_V6, DST_ADDRESS_V6);
+ verify(mMockIpSecService)
+ .migrateTransform(
+ anyInt(),
+ eq(SRC_ADDRESS_V6.getHostAddress()),
+ eq(DST_ADDRESS_V6.getHostAddress()),
+ any());
+ }
+
+ @Test
+ @DevSdkIgnoreRule.IgnoreAfter(Build.VERSION_CODES.TIRAMISU)
+ public void testStartMigrationOnSdkBeforeU() throws Exception {
+ try {
+ mIpSecManager.startMigration(buildTestTransform(), SRC_ADDRESS_V6, DST_ADDRESS_V6);
+ fail("Expect to fail since migration is not supported before U");
+ } catch (UnsupportedOperationException expected) {
+ }
+ }
}
diff --git a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java
index 624071a..1618a62 100644
--- a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java
+++ b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java
@@ -23,6 +23,7 @@
import static android.net.IpSecManager.DIRECTION_FWD;
import static android.net.IpSecManager.DIRECTION_IN;
import static android.net.IpSecManager.DIRECTION_OUT;
+import static android.net.IpSecManager.FEATURE_IPSEC_TUNNEL_MIGRATION;
import static android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK;
import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.AF_INET6;
@@ -30,11 +31,16 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -49,6 +55,7 @@
import android.net.IpSecAlgorithm;
import android.net.IpSecConfig;
import android.net.IpSecManager;
+import android.net.IpSecMigrateInfoParcel;
import android.net.IpSecSpiResponse;
import android.net.IpSecTransform;
import android.net.IpSecTransformResponse;
@@ -130,6 +137,9 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F
};
+ private static final String NEW_SRC_ADDRESS = "2001:db8:2::1";
+ private static final String NEW_DST_ADDRESS = "2001:db8:2::2";
+
AppOpsManager mMockAppOps = mock(AppOpsManager.class);
ConnectivityManager mMockConnectivityMgr = mock(ConnectivityManager.class);
@@ -369,8 +379,8 @@
.ipSecAddSecurityAssociation(
eq(mUid),
eq(config.getMode()),
- eq(config.getSourceAddress()),
- eq(config.getDestinationAddress()),
+ eq(mSourceAddr),
+ eq(mDestinationAddr),
eq((config.getNetwork() != null) ? config.getNetwork().netId : 0),
eq(TEST_SPI),
eq(0),
@@ -910,9 +920,60 @@
}
}
+ @Test
+ @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ public void testApplyAndMigrateTunnelModeTransformOutbound() throws Exception {
+ verifyApplyAndMigrateTunnelModeTransformCommon(false, DIRECTION_OUT);
+ }
+
+ @Test
+ @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ public void testApplyAndMigrateTunnelModeTransformOutboundReleasedSpi() throws Exception {
+ verifyApplyAndMigrateTunnelModeTransformCommon(true, DIRECTION_OUT);
+ }
+
+ @Test
+ @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ public void testApplyAndMigrateTunnelModeTransformInbound() throws Exception {
+ verifyApplyAndMigrateTunnelModeTransformCommon(false, DIRECTION_IN);
+ }
+
+ @Test
+ @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ public void testApplyAndMigrateTunnelModeTransformInboundReleasedSpi() throws Exception {
+ verifyApplyAndMigrateTunnelModeTransformCommon(true, DIRECTION_IN);
+ }
+
+ @Test
+ @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ public void testApplyAndMigrateTunnelModeTransformForward() throws Exception {
+ verifyApplyAndMigrateTunnelModeTransformCommon(false, DIRECTION_FWD);
+ }
+
+ @Test
+ @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ public void testApplyAndMigrateTunnelModeTransformForwardReleasedSpi() throws Exception {
+ verifyApplyAndMigrateTunnelModeTransformCommon(true, DIRECTION_FWD);
+ }
+
public void verifyApplyTunnelModeTransformCommon(boolean closeSpiBeforeApply, int direction)
throws Exception {
- IpSecConfig ipSecConfig = new IpSecConfig();
+ verifyApplyTunnelModeTransformCommon(
+ new IpSecConfig(), closeSpiBeforeApply, false /* isMigrating */, direction);
+ }
+
+ public void verifyApplyAndMigrateTunnelModeTransformCommon(
+ boolean closeSpiBeforeApply, int direction) throws Exception {
+ verifyApplyTunnelModeTransformCommon(
+ new IpSecConfig(), closeSpiBeforeApply, true /* isMigrating */, direction);
+ }
+
+ public int verifyApplyTunnelModeTransformCommon(
+ IpSecConfig ipSecConfig,
+ boolean closeSpiBeforeApply,
+ boolean isMigrating,
+ int direction)
+ throws Exception {
ipSecConfig.setMode(IpSecTransform.MODE_TUNNEL);
addDefaultSpisAndRemoteAddrToIpSecConfig(ipSecConfig);
addAuthAndCryptToIpSecConfig(ipSecConfig);
@@ -928,6 +989,12 @@
int transformResourceId = createTransformResp.resourceId;
int tunnelResourceId = createTunnelResp.resourceId;
+
+ if (isMigrating) {
+ mIpSecService.migrateTransform(
+ transformResourceId, NEW_SRC_ADDRESS, NEW_DST_ADDRESS, BLESSED_PACKAGE);
+ }
+
mIpSecService.applyTunnelModeTransform(
tunnelResourceId, direction, transformResourceId, BLESSED_PACKAGE);
@@ -947,8 +1014,16 @@
ipSecConfig.setXfrmInterfaceId(tunnelResourceId);
verifyTransformNetdCalledForCreatingSA(ipSecConfig, createTransformResp);
- }
+ if (isMigrating) {
+ verify(mMockNetd, times(ADDRESS_FAMILIES.length))
+ .ipSecMigrate(any(IpSecMigrateInfoParcel.class));
+ } else {
+ verify(mMockNetd, never()).ipSecMigrate(any());
+ }
+
+ return tunnelResourceId;
+ }
@Test
public void testApplyTunnelModeTransformWithClosedSpi() throws Exception {
@@ -1023,7 +1098,7 @@
}
@Test
- public void testFeatureFlagVerification() throws Exception {
+ public void testFeatureFlagIpSecTunnelsVerification() throws Exception {
when(mMockPkgMgr.hasSystemFeature(eq(PackageManager.FEATURE_IPSEC_TUNNELS)))
.thenReturn(false);
@@ -1035,4 +1110,17 @@
} catch (UnsupportedOperationException expected) {
}
}
+
+ @Test
+ @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
+ public void testFeatureFlagIpSecTunnelMigrationVerification() throws Exception {
+ when(mMockPkgMgr.hasSystemFeature(eq(FEATURE_IPSEC_TUNNEL_MIGRATION))).thenReturn(false);
+
+ try {
+ mIpSecService.migrateTransform(
+ 1 /* transformId */, NEW_SRC_ADDRESS, NEW_DST_ADDRESS, BLESSED_PACKAGE);
+ fail("Expected UnsupportedOperationException for disabled feature");
+ } catch (UnsupportedOperationException expected) {
+ }
+ }
}
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index f6a17a4..afeffcd 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -17,7 +17,7 @@
// GN: //base/allocator:buildflags
cc_genrule {
name: "cronet_aml_base_allocator_buildflags",
- cmd: "echo '--flags USE_PARTITION_ALLOC=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" USE_BACKUP_REF_PTR=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_PARTITION_ALLOC_AS_GWP_ASAN_STORE=\"false\" USE_MTE_CHECKED_PTR=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\"' | " +
+ cmd: "echo '--flags USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC=\"false\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" USE_BACKUP_REF_PTR=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_PARTITION_ALLOC_AS_GWP_ASAN_STORE=\"false\" USE_MTE_CHECKED_PTR=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\"' | " +
"$(location build/write_buildflag_header.py) --output " +
"$(out) " +
"--rulename " +
@@ -156,7 +156,6 @@
"base/allocator/partition_allocator/partition_alloc_base/memory/ref_counted.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/pkey.cc",
"base/allocator/partition_allocator/partition_alloc_base/posix/safe_strerror.cc",
"base/allocator/partition_allocator/partition_alloc_base/rand_util.cc",
"base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc",
@@ -208,8 +207,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
@@ -217,9 +216,7 @@
"-DPA_PCSCAN_STACK_SUPPORTED",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -231,7 +228,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/android_ndk/sources/android/cpufeatures/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_arm: {
srcs: [
@@ -268,7 +265,7 @@
// GN: //base/allocator/partition_allocator:partition_alloc_buildflags
cc_genrule {
name: "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags",
- cmd: "echo '--flags ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"true\" ENABLE_GWP_ASAN_SUPPORT=\"true\" ENABLE_MTE_CHECKED_PTR_SUPPORT=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" STARSCAN=\"true\" PA_USE_BASE_TRACING=\"true\" ENABLE_PKEYS=\"false\"' | " +
+ cmd: "echo '--flags ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"true\" ENABLE_GWP_ASAN_SUPPORT=\"true\" ENABLE_MTE_CHECKED_PTR_SUPPORT=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" STARSCAN=\"true\" PA_USE_BASE_TRACING=\"true\" ENABLE_PKEYS=\"false\"' | " +
"$(location build/write_buildflag_header.py) --output " +
"$(out) " +
"--rulename " +
@@ -908,8 +905,8 @@
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DBASE_IMPLEMENTATION",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
@@ -922,9 +919,7 @@
"-DU_USING_ICU_NAMESPACE=0",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -940,7 +935,7 @@
"third_party/icu/source/common/",
"third_party/icu/source/i18n/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_arm: {
srcs: [
@@ -1292,16 +1287,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -1312,7 +1305,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -1331,7 +1324,7 @@
cc_genrule {
name: "cronet_aml_base_build_date",
cmd: "$(location build/write_build_date_header.py) $(out) " +
- "1664686800",
+ "1670130000",
out: [
"base/generated_build_date.h",
],
@@ -1346,7 +1339,7 @@
// GN: //base:cfi_buildflags
cc_genrule {
name: "cronet_aml_base_cfi_buildflags",
- cmd: "echo '--flags CFI_CAST_CHECK=\"false && false\" CFI_DIAG=\"false && false\" CFI_ICALL_CHECK=\"false && false\" CFI_ENFORCEMENT_TRAP=\"false && !false\" CFI_ENFORCEMENT_DIAGNOSTIC=\"false && false && !false\"' | " +
+ cmd: "echo '--flags CFI_CAST_CHECK=\"false && false\" CFI_ICALL_CHECK=\"false && false\" CFI_ENFORCEMENT_TRAP=\"false && !false\" CFI_ENFORCEMENT_DIAGNOSTIC=\"false && false && !false\"' | " +
"$(location build/write_buildflag_header.py) --output " +
"$(out) " +
"--rulename " +
@@ -1394,7 +1387,7 @@
name: "cronet_aml_base_debugging_buildflags",
cmd: "if [[ ( $$CC_ARCH == 'x86_64' && $$CC_OS == 'android' ) ]]; " +
"then " +
- "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " +
+ "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" FROM_HERE_USES_LOCATION_BUILTINS=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " +
"$(location build/write_buildflag_header.py) --output " +
"$(out) " +
"--rulename " +
@@ -1406,7 +1399,7 @@
"fi; " +
"if [[ ( $$CC_ARCH == 'x86' && $$CC_OS == 'android' ) ]]; " +
"then " +
- "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " +
+ "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" FROM_HERE_USES_LOCATION_BUILTINS=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " +
"$(location build/write_buildflag_header.py) --output " +
"$(out) " +
"--rulename " +
@@ -1418,7 +1411,7 @@
"fi; " +
"if [[ ( $$CC_ARCH == 'arm' && $$CC_OS == 'android' ) ]]; " +
"then " +
- "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " +
+ "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" FROM_HERE_USES_LOCATION_BUILTINS=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"true\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " +
"$(location build/write_buildflag_header.py) --output " +
"$(out) " +
"--rulename " +
@@ -1430,7 +1423,7 @@
"fi; " +
"if [[ ( $$CC_ARCH == 'arm64' && $$CC_OS == 'android' ) ]]; " +
"then " +
- "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " +
+ "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" FROM_HERE_USES_LOCATION_BUILTINS=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " +
"$(location build/write_buildflag_header.py) --output " +
"$(out) " +
"--rulename " +
@@ -1604,16 +1597,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -1624,7 +1615,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -1835,16 +1826,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -1855,7 +1844,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -1882,16 +1871,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -1900,7 +1887,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -2031,16 +2018,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -2051,7 +2036,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -2187,17 +2172,15 @@
"cronet_aml_defaults",
],
cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DLIBCXX_BUILDING_LIBCXXABI",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_BUILDING_LIBRARY",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
@@ -2285,18 +2268,16 @@
"cronet_aml_defaults",
],
cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DLIBCXXABI_SILENT_TERMINATE",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_BUILDING_LIBRARY",
"-D_LIBCPP_CONSTINIT=constinit",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -2412,6 +2393,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -2433,7 +2415,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -2466,8 +2447,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -2477,9 +2458,7 @@
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -2496,11 +2475,11 @@
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
linker_scripts: [
"base/android/library_loader/anchor_functions.lds",
],
- stem: "libcronet.109.0.5386.0",
+ stem: "libcronet.108.0.5359.128",
target: {
android_x86: {
cflags: [
@@ -2771,13 +2750,6 @@
"components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetController.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetEngine.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetProvider.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlRequest.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlResponse.java",
- "components/cronet/android/fake/java/org/chromium/net/test/ResponseMatcher.java",
- "components/cronet/android/fake/java/org/chromium/net/test/UrlResponseMatcher.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java",
"components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java",
@@ -3080,13 +3052,6 @@
"components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetController.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetEngine.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetProvider.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlRequest.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlResponse.java",
- "components/cronet/android/fake/java/org/chromium/net/test/ResponseMatcher.java",
- "components/cronet/android/fake/java/org/chromium/net/test/UrlResponseMatcher.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java",
"components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java",
@@ -3200,6 +3165,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -3221,7 +3187,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -3242,8 +3207,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -3253,9 +3218,7 @@
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -3274,9 +3237,8 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -3318,7 +3280,7 @@
"-f " +
"$(location build/util/LASTCHANGE) " +
"-e " +
- "'API_LEVEL=20' " +
+ "'API_LEVEL=19' " +
"-o " +
"$(out) " +
"$(location components/cronet/android/java/src/org/chromium/net/impl/ImplVersion.template)",
@@ -3384,7 +3346,7 @@
"-f " +
"$(location build/util/LASTCHANGE) " +
"-e " +
- "'API_LEVEL=20' " +
+ "'API_LEVEL=19' " +
"-o " +
"$(out) " +
"$(location components/cronet/android/api/src/org/chromium/net/ApiVersion.template)",
@@ -3575,6 +3537,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -3596,7 +3559,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -3610,8 +3572,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -3621,9 +3583,7 @@
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -3640,7 +3600,7 @@
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -3667,16 +3627,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -3687,7 +3645,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -3755,16 +3713,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -3777,7 +3733,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -3817,16 +3773,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -3842,7 +3796,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -3874,6 +3828,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -3895,7 +3850,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -3909,8 +3863,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -3920,9 +3874,7 @@
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -3942,7 +3894,7 @@
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -3967,6 +3919,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -3987,7 +3940,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
defaults: [
@@ -3996,8 +3948,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -4007,9 +3959,7 @@
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -4026,7 +3976,7 @@
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -4050,16 +4000,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -4070,7 +4018,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -4120,8 +4068,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -4131,9 +4079,7 @@
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -4147,7 +4093,7 @@
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -4255,16 +4201,14 @@
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DCOMPONENTS_PREFS_IMPLEMENTATION",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -4277,7 +4221,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -4368,16 +4312,14 @@
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
"-DCRYPTO_IMPLEMENTATION",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -4390,7 +4332,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -4454,16 +4396,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -4474,7 +4414,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -4714,13 +4654,6 @@
"components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetController.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetEngine.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetProvider.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlRequest.java",
- "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlResponse.java",
- "components/cronet/android/fake/java/org/chromium/net/test/ResponseMatcher.java",
- "components/cronet/android/fake/java/org/chromium/net/test/UrlResponseMatcher.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java",
"components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java",
@@ -5055,16 +4988,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -5077,7 +5008,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -5163,6 +5094,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -5182,7 +5114,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -5203,8 +5134,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -5216,9 +5147,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -5235,9 +5164,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -5258,6 +5186,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -5277,7 +5206,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -5298,8 +5226,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -5311,9 +5239,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -5330,9 +5256,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -5353,6 +5278,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -5372,7 +5298,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -5393,8 +5318,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -5406,9 +5331,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -5425,9 +5348,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -5448,6 +5370,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -5467,7 +5390,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -5488,8 +5410,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -5501,9 +5423,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -5520,9 +5440,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -5543,6 +5462,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -5562,7 +5482,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -5583,8 +5502,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -5596,9 +5515,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -5615,9 +5532,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -5648,6 +5564,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -5667,7 +5584,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -5688,8 +5604,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -5701,9 +5617,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -5720,9 +5634,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -5765,6 +5678,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -5784,7 +5698,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -5806,8 +5719,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -5819,9 +5732,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -5838,9 +5749,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -5887,9 +5797,9 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/net/base --cpp_out=lite=true:$(genDir)/external/chromium_org/net/base/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/net/base --cpp_out=lite=true:$(genDir)/external/cronet/net/base/ $(in)",
out: [
- "external/chromium_org/net/base/isolation_info.pb.cc",
+ "external/cronet/net/base/isolation_info.pb.cc",
],
apex_available: [
"com.android.tethering",
@@ -5905,9 +5815,9 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/net/base --cpp_out=lite=true:$(genDir)/external/chromium_org/net/base/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/net/base --cpp_out=lite=true:$(genDir)/external/cronet/net/base/ $(in)",
out: [
- "external/chromium_org/net/base/isolation_info.pb.h",
+ "external/cronet/net/base/isolation_info.pb.h",
],
export_include_dirs: [
".",
@@ -6415,6 +6325,7 @@
shared_libs: [
"libandroid",
"liblog",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -6434,7 +6345,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -6475,8 +6385,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -6488,9 +6398,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -6507,9 +6415,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_arm: {
srcs: [
@@ -6550,6 +6457,7 @@
"libandroid",
"liblog",
"libprotobuf-cpp-lite",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -6566,7 +6474,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
],
generated_headers: [
"cronet_aml_base_debugging_buildflags",
@@ -6583,8 +6490,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DENABLE_BUILT_IN_DNS",
@@ -6596,9 +6503,7 @@
"-DNET_IMPLEMENTATION",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -6612,9 +6517,8 @@
"third_party/boringssl/src/include/",
"third_party/brotli/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -6638,16 +6542,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -6658,7 +6560,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -6786,9 +6688,9 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/net/nqe/proto --cpp_out=lite=true:$(genDir)/external/chromium_org/net/nqe/proto/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/net/nqe/proto --cpp_out=lite=true:$(genDir)/external/cronet/net/nqe/proto/ $(in)",
out: [
- "external/chromium_org/net/nqe/proto/network_id_proto.pb.cc",
+ "external/cronet/net/nqe/proto/network_id_proto.pb.cc",
],
apex_available: [
"com.android.tethering",
@@ -6804,9 +6706,9 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/net/nqe/proto --cpp_out=lite=true:$(genDir)/external/chromium_org/net/nqe/proto/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/net/nqe/proto --cpp_out=lite=true:$(genDir)/external/cronet/net/nqe/proto/ $(in)",
out: [
- "external/chromium_org/net/nqe/proto/network_id_proto.pb.h",
+ "external/cronet/net/nqe/proto/network_id_proto.pb.h",
],
export_include_dirs: [
".",
@@ -6829,6 +6731,7 @@
"libandroid",
"liblog",
"libprotobuf-cpp-lite",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -6845,7 +6748,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -6860,8 +6762,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -6871,9 +6773,7 @@
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -6890,7 +6790,7 @@
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -6933,16 +6833,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -6955,7 +6853,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -6981,11 +6879,11 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/net/third_party/quiche/src --cpp_out=lite=true:$(genDir)/external/chromium_org/net/third_party/quiche/src/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/net/third_party/quiche/src --cpp_out=lite=true:$(genDir)/external/cronet/net/third_party/quiche/src/ $(in)",
out: [
- "external/chromium_org/net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.pb.cc",
- "external/chromium_org/net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.pb.cc",
- "external/chromium_org/net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.pb.cc",
+ "external/cronet/net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.pb.cc",
+ "external/cronet/net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.pb.cc",
+ "external/cronet/net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.pb.cc",
],
apex_available: [
"com.android.tethering",
@@ -7003,11 +6901,11 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/net/third_party/quiche/src --cpp_out=lite=true:$(genDir)/external/chromium_org/net/third_party/quiche/src/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/net/third_party/quiche/src --cpp_out=lite=true:$(genDir)/external/cronet/net/third_party/quiche/src/ $(in)",
out: [
- "external/chromium_org/net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.pb.h",
- "external/chromium_org/net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.pb.h",
- "external/chromium_org/net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.pb.h",
+ "external/cronet/net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.pb.h",
+ "external/cronet/net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.pb.h",
+ "external/cronet/net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.pb.h",
],
export_include_dirs: [
".",
@@ -7028,9 +6926,9 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/net/third_party/quiche/src/quiche/quic/test_tools --cpp_out=lite=true:$(genDir)/external/chromium_org/net/third_party/quiche/src/quiche/quic/test_tools/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/net/third_party/quiche/src/quiche/quic/test_tools --cpp_out=lite=true:$(genDir)/external/cronet/net/third_party/quiche/src/quiche/quic/test_tools/ $(in)",
out: [
- "external/chromium_org/net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.cc",
+ "external/cronet/net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.cc",
],
apex_available: [
"com.android.tethering",
@@ -7046,9 +6944,9 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/net/third_party/quiche/src/quiche/quic/test_tools --cpp_out=lite=true:$(genDir)/external/chromium_org/net/third_party/quiche/src/quiche/quic/test_tools/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/net/third_party/quiche/src/quiche/quic/test_tools --cpp_out=lite=true:$(genDir)/external/cronet/net/third_party/quiche/src/quiche/quic/test_tools/ $(in)",
out: [
- "external/chromium_org/net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.h",
+ "external/cronet/net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.h",
],
export_include_dirs: [
".",
@@ -7338,6 +7236,7 @@
"net/third_party/quiche/src/quiche/quic/core/quic_flow_controller.cc",
"net/third_party/quiche/src/quiche/quic/core/quic_framer.cc",
"net/third_party/quiche/src/quiche/quic/core/quic_idle_network_detector.cc",
+ "net/third_party/quiche/src/quiche/quic/core/quic_legacy_version_encapsulator.cc",
"net/third_party/quiche/src/quiche/quic/core/quic_mtu_discovery.cc",
"net/third_party/quiche/src/quiche/quic/core/quic_network_blackhole_detector.cc",
"net/third_party/quiche/src/quiche/quic/core/quic_packet_creator.cc",
@@ -7396,6 +7295,7 @@
"libandroid",
"liblog",
"libprotobuf-cpp-lite",
+ "libz",
],
static_libs: [
"cronet_aml_base_allocator_partition_allocator_partition_alloc",
@@ -7410,7 +7310,6 @@
"cronet_aml_third_party_libevent_libevent",
"cronet_aml_third_party_modp_b64_modp_b64",
"cronet_aml_third_party_protobuf_protobuf_lite",
- "cronet_aml_third_party_zlib_zlib",
"cronet_aml_url_url",
],
generated_headers: [
@@ -7427,8 +7326,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -7439,9 +7338,7 @@
"-DIS_QUICHE_IMPL",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -7457,9 +7354,8 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7505,16 +7401,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -7527,7 +7421,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7570,17 +7464,15 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-DIS_URI_TEMPLATE_IMPL",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -7593,7 +7485,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7620,16 +7512,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -7641,7 +7531,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7666,16 +7556,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -7685,7 +7573,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7710,16 +7598,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -7729,7 +7615,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7754,16 +7640,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -7773,7 +7657,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7805,16 +7689,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -7824,7 +7706,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7849,16 +7731,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -7868,7 +7748,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7893,16 +7773,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -7912,7 +7790,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7937,16 +7815,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -7956,7 +7832,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -7981,16 +7857,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8000,7 +7874,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8025,16 +7899,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8044,7 +7916,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8069,16 +7941,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8088,7 +7958,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8113,16 +7983,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8132,7 +8000,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8157,16 +8025,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8176,7 +8042,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8204,16 +8070,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8223,7 +8087,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8251,16 +8115,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8270,7 +8132,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8295,16 +8157,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8314,7 +8174,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8342,16 +8202,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8361,7 +8219,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8389,16 +8247,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8408,7 +8264,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8436,16 +8292,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8455,7 +8309,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8483,16 +8337,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8502,7 +8354,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8527,16 +8379,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8546,7 +8396,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8571,16 +8421,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8590,7 +8438,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8615,16 +8463,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8634,7 +8480,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8659,16 +8505,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8678,7 +8522,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8703,16 +8547,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8722,7 +8564,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8747,16 +8589,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8766,7 +8606,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8791,16 +8631,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8810,7 +8648,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8835,16 +8673,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8854,7 +8690,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8879,16 +8715,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8898,7 +8732,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8923,16 +8757,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8942,7 +8774,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -8967,16 +8799,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -8986,7 +8816,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9011,16 +8841,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9030,7 +8858,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9055,16 +8883,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9074,7 +8900,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9103,16 +8929,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9122,7 +8946,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9147,16 +8971,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9166,7 +8988,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9191,16 +9013,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9210,7 +9030,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9235,16 +9055,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9254,7 +9072,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9279,16 +9097,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9298,7 +9114,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9323,16 +9139,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9342,7 +9156,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9367,16 +9181,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9386,7 +9198,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9411,16 +9223,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9430,7 +9240,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9458,16 +9268,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9477,7 +9285,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9507,16 +9315,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9526,7 +9332,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9554,16 +9360,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9573,7 +9377,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9601,16 +9405,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9620,7 +9422,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9648,16 +9450,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9667,7 +9467,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9695,16 +9495,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9714,7 +9512,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9742,16 +9540,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9761,7 +9557,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9786,16 +9582,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9805,7 +9599,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9830,16 +9624,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9849,7 +9641,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9874,16 +9666,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9893,7 +9683,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9921,16 +9711,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9940,7 +9728,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -9968,16 +9756,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -9987,7 +9773,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10015,16 +9801,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10034,7 +9818,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10059,16 +9843,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10078,7 +9860,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10103,16 +9885,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10122,7 +9902,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10147,16 +9927,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10166,7 +9944,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10194,16 +9972,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10213,7 +9989,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10238,16 +10014,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10257,7 +10031,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10285,16 +10059,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10304,7 +10076,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10329,16 +10101,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10348,7 +10118,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10377,16 +10147,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10396,7 +10164,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10421,16 +10189,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10440,7 +10206,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10465,16 +10231,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10484,7 +10248,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10509,16 +10273,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10528,7 +10290,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10553,16 +10315,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10572,7 +10332,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10597,16 +10357,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10616,7 +10374,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10644,16 +10402,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10663,7 +10419,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10688,16 +10444,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10707,7 +10461,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10738,16 +10492,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10757,7 +10509,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10788,16 +10540,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10807,7 +10557,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10838,16 +10588,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10857,7 +10605,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10885,16 +10633,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10904,7 +10650,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10935,16 +10681,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -10954,7 +10698,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -10985,16 +10729,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11004,7 +10746,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11035,16 +10777,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11054,7 +10794,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11079,16 +10819,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11098,7 +10836,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11126,16 +10864,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11145,7 +10881,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11170,16 +10906,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11189,7 +10923,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11214,16 +10948,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11233,7 +10965,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11258,16 +10990,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11277,7 +11007,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11305,16 +11035,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11324,7 +11052,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11352,16 +11080,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11371,7 +11097,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11402,16 +11128,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11421,7 +11145,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11450,16 +11174,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11469,7 +11191,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11497,16 +11219,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11516,7 +11236,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11546,16 +11266,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11565,7 +11283,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11599,16 +11317,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11618,7 +11334,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11646,16 +11362,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11665,7 +11379,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11693,16 +11407,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11712,7 +11424,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11740,16 +11452,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11759,7 +11469,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11784,16 +11494,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11803,7 +11511,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11828,16 +11536,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11847,7 +11553,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11872,16 +11578,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11891,7 +11595,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11921,16 +11625,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11940,7 +11642,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -11965,16 +11667,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -11984,7 +11684,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12017,16 +11717,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12036,7 +11734,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12060,7 +11758,6 @@
"third_party/abseil-cpp/absl/strings/escaping.cc",
"third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc",
"third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc",
- "third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.cc",
"third_party/abseil-cpp/absl/strings/internal/memutil.cc",
"third_party/abseil-cpp/absl/strings/match.cc",
"third_party/abseil-cpp/absl/strings/numbers.cc",
@@ -12077,16 +11774,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12096,7 +11791,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12124,16 +11819,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12143,7 +11836,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12168,16 +11861,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12187,7 +11878,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12221,16 +11912,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12240,7 +11929,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12268,16 +11957,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12287,7 +11974,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12323,16 +12010,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12342,7 +12027,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12374,16 +12059,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12393,7 +12076,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12421,16 +12104,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12440,7 +12121,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12468,16 +12149,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12487,7 +12166,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12512,16 +12191,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12531,7 +12208,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12556,16 +12233,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12575,7 +12250,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12600,16 +12275,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12619,7 +12292,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12644,16 +12317,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12663,7 +12334,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12688,16 +12359,14 @@
"-DABSL_ALLOCATOR_NOTHROW=1",
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12707,7 +12376,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/abseil-cpp/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12734,16 +12403,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -12753,7 +12420,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/android_ndk/sources/android/cpufeatures/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -12780,16 +12447,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -12800,7 +12465,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -13096,17 +12761,15 @@
"-DBORINGSSL_ALLOW_CXX_RUNTIME",
"-DBORINGSSL_IMPLEMENTATION",
"-DBORINGSSL_NO_STATIC_INITIALIZER",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-DOPENSSL_SMALL",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -13116,7 +12779,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -13140,16 +12803,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -13161,7 +12822,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_arm: {
srcs: [
@@ -13256,16 +12917,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -13276,7 +12935,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -13308,16 +12967,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -13329,7 +12986,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/brotli/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -13362,16 +13019,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -13381,7 +13036,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/brotli/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -13405,16 +13060,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -13425,7 +13078,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -13694,8 +13347,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_DLOPEN=0",
@@ -13713,9 +13366,7 @@
"-DU_USING_ICU_NAMESPACE=0",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -13726,7 +13377,7 @@
"third_party/icu/source/common/",
"third_party/icu/source/i18n/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
rtti: true,
target: {
android_x86: {
@@ -13952,8 +13603,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_DLOPEN=0",
@@ -13972,9 +13623,7 @@
"-DU_USING_ICU_NAMESPACE=0",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -13985,7 +13634,7 @@
"third_party/icu/source/common/",
"third_party/icu/source/i18n/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
rtti: true,
target: {
android_x86: {
@@ -14010,16 +13659,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -14030,7 +13677,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -14070,17 +13717,15 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_CONFIG_H",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -14090,7 +13735,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/libevent/android/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -14140,35 +13785,35 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/third_party/metrics_proto --cpp_out=lite=true:$(genDir)/external/chromium_org/third_party/metrics_proto/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/third_party/metrics_proto --cpp_out=lite=true:$(genDir)/external/cronet/third_party/metrics_proto/ $(in)",
out: [
- "external/chromium_org/third_party/metrics_proto/call_stack_profile.pb.cc",
- "external/chromium_org/third_party/metrics_proto/cast_logs.pb.cc",
- "external/chromium_org/third_party/metrics_proto/chrome_os_app_list_launch_event.pb.cc",
- "external/chromium_org/third_party/metrics_proto/chrome_searchbox_stats.pb.cc",
- "external/chromium_org/third_party/metrics_proto/chrome_user_metrics_extension.pb.cc",
- "external/chromium_org/third_party/metrics_proto/custom_tab_session.pb.cc",
- "external/chromium_org/third_party/metrics_proto/execution_context.pb.cc",
- "external/chromium_org/third_party/metrics_proto/extension_install.pb.cc",
- "external/chromium_org/third_party/metrics_proto/histogram_event.pb.cc",
- "external/chromium_org/third_party/metrics_proto/omnibox_event.pb.cc",
- "external/chromium_org/third_party/metrics_proto/omnibox_focus_type.pb.cc",
- "external/chromium_org/third_party/metrics_proto/omnibox_input_type.pb.cc",
- "external/chromium_org/third_party/metrics_proto/perf_data.pb.cc",
- "external/chromium_org/third_party/metrics_proto/perf_stat.pb.cc",
- "external/chromium_org/third_party/metrics_proto/printer_event.pb.cc",
- "external/chromium_org/third_party/metrics_proto/reporting_info.pb.cc",
- "external/chromium_org/third_party/metrics_proto/sampled_profile.pb.cc",
- "external/chromium_org/third_party/metrics_proto/structured_data.pb.cc",
- "external/chromium_org/third_party/metrics_proto/system_profile.pb.cc",
- "external/chromium_org/third_party/metrics_proto/trace_log.pb.cc",
- "external/chromium_org/third_party/metrics_proto/translate_event.pb.cc",
- "external/chromium_org/third_party/metrics_proto/ukm/aggregate.pb.cc",
- "external/chromium_org/third_party/metrics_proto/ukm/entry.pb.cc",
- "external/chromium_org/third_party/metrics_proto/ukm/report.pb.cc",
- "external/chromium_org/third_party/metrics_proto/ukm/source.pb.cc",
- "external/chromium_org/third_party/metrics_proto/user_action_event.pb.cc",
- "external/chromium_org/third_party/metrics_proto/user_demographics.pb.cc",
+ "external/cronet/third_party/metrics_proto/call_stack_profile.pb.cc",
+ "external/cronet/third_party/metrics_proto/cast_logs.pb.cc",
+ "external/cronet/third_party/metrics_proto/chrome_os_app_list_launch_event.pb.cc",
+ "external/cronet/third_party/metrics_proto/chrome_searchbox_stats.pb.cc",
+ "external/cronet/third_party/metrics_proto/chrome_user_metrics_extension.pb.cc",
+ "external/cronet/third_party/metrics_proto/custom_tab_session.pb.cc",
+ "external/cronet/third_party/metrics_proto/execution_context.pb.cc",
+ "external/cronet/third_party/metrics_proto/extension_install.pb.cc",
+ "external/cronet/third_party/metrics_proto/histogram_event.pb.cc",
+ "external/cronet/third_party/metrics_proto/omnibox_event.pb.cc",
+ "external/cronet/third_party/metrics_proto/omnibox_focus_type.pb.cc",
+ "external/cronet/third_party/metrics_proto/omnibox_input_type.pb.cc",
+ "external/cronet/third_party/metrics_proto/perf_data.pb.cc",
+ "external/cronet/third_party/metrics_proto/perf_stat.pb.cc",
+ "external/cronet/third_party/metrics_proto/printer_event.pb.cc",
+ "external/cronet/third_party/metrics_proto/reporting_info.pb.cc",
+ "external/cronet/third_party/metrics_proto/sampled_profile.pb.cc",
+ "external/cronet/third_party/metrics_proto/structured_data.pb.cc",
+ "external/cronet/third_party/metrics_proto/system_profile.pb.cc",
+ "external/cronet/third_party/metrics_proto/trace_log.pb.cc",
+ "external/cronet/third_party/metrics_proto/translate_event.pb.cc",
+ "external/cronet/third_party/metrics_proto/ukm/aggregate.pb.cc",
+ "external/cronet/third_party/metrics_proto/ukm/entry.pb.cc",
+ "external/cronet/third_party/metrics_proto/ukm/report.pb.cc",
+ "external/cronet/third_party/metrics_proto/ukm/source.pb.cc",
+ "external/cronet/third_party/metrics_proto/user_action_event.pb.cc",
+ "external/cronet/third_party/metrics_proto/user_demographics.pb.cc",
],
apex_available: [
"com.android.tethering",
@@ -14210,35 +13855,35 @@
tools: [
"cronet_aml_third_party_protobuf_protoc",
],
- cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/chromium_org/third_party/metrics_proto --cpp_out=lite=true:$(genDir)/external/chromium_org/third_party/metrics_proto/ $(in)",
+ cmd: "$(location cronet_aml_third_party_protobuf_protoc) --proto_path=external/cronet/third_party/metrics_proto --cpp_out=lite=true:$(genDir)/external/cronet/third_party/metrics_proto/ $(in)",
out: [
- "external/chromium_org/third_party/metrics_proto/call_stack_profile.pb.h",
- "external/chromium_org/third_party/metrics_proto/cast_logs.pb.h",
- "external/chromium_org/third_party/metrics_proto/chrome_os_app_list_launch_event.pb.h",
- "external/chromium_org/third_party/metrics_proto/chrome_searchbox_stats.pb.h",
- "external/chromium_org/third_party/metrics_proto/chrome_user_metrics_extension.pb.h",
- "external/chromium_org/third_party/metrics_proto/custom_tab_session.pb.h",
- "external/chromium_org/third_party/metrics_proto/execution_context.pb.h",
- "external/chromium_org/third_party/metrics_proto/extension_install.pb.h",
- "external/chromium_org/third_party/metrics_proto/histogram_event.pb.h",
- "external/chromium_org/third_party/metrics_proto/omnibox_event.pb.h",
- "external/chromium_org/third_party/metrics_proto/omnibox_focus_type.pb.h",
- "external/chromium_org/third_party/metrics_proto/omnibox_input_type.pb.h",
- "external/chromium_org/third_party/metrics_proto/perf_data.pb.h",
- "external/chromium_org/third_party/metrics_proto/perf_stat.pb.h",
- "external/chromium_org/third_party/metrics_proto/printer_event.pb.h",
- "external/chromium_org/third_party/metrics_proto/reporting_info.pb.h",
- "external/chromium_org/third_party/metrics_proto/sampled_profile.pb.h",
- "external/chromium_org/third_party/metrics_proto/structured_data.pb.h",
- "external/chromium_org/third_party/metrics_proto/system_profile.pb.h",
- "external/chromium_org/third_party/metrics_proto/trace_log.pb.h",
- "external/chromium_org/third_party/metrics_proto/translate_event.pb.h",
- "external/chromium_org/third_party/metrics_proto/ukm/aggregate.pb.h",
- "external/chromium_org/third_party/metrics_proto/ukm/entry.pb.h",
- "external/chromium_org/third_party/metrics_proto/ukm/report.pb.h",
- "external/chromium_org/third_party/metrics_proto/ukm/source.pb.h",
- "external/chromium_org/third_party/metrics_proto/user_action_event.pb.h",
- "external/chromium_org/third_party/metrics_proto/user_demographics.pb.h",
+ "external/cronet/third_party/metrics_proto/call_stack_profile.pb.h",
+ "external/cronet/third_party/metrics_proto/cast_logs.pb.h",
+ "external/cronet/third_party/metrics_proto/chrome_os_app_list_launch_event.pb.h",
+ "external/cronet/third_party/metrics_proto/chrome_searchbox_stats.pb.h",
+ "external/cronet/third_party/metrics_proto/chrome_user_metrics_extension.pb.h",
+ "external/cronet/third_party/metrics_proto/custom_tab_session.pb.h",
+ "external/cronet/third_party/metrics_proto/execution_context.pb.h",
+ "external/cronet/third_party/metrics_proto/extension_install.pb.h",
+ "external/cronet/third_party/metrics_proto/histogram_event.pb.h",
+ "external/cronet/third_party/metrics_proto/omnibox_event.pb.h",
+ "external/cronet/third_party/metrics_proto/omnibox_focus_type.pb.h",
+ "external/cronet/third_party/metrics_proto/omnibox_input_type.pb.h",
+ "external/cronet/third_party/metrics_proto/perf_data.pb.h",
+ "external/cronet/third_party/metrics_proto/perf_stat.pb.h",
+ "external/cronet/third_party/metrics_proto/printer_event.pb.h",
+ "external/cronet/third_party/metrics_proto/reporting_info.pb.h",
+ "external/cronet/third_party/metrics_proto/sampled_profile.pb.h",
+ "external/cronet/third_party/metrics_proto/structured_data.pb.h",
+ "external/cronet/third_party/metrics_proto/system_profile.pb.h",
+ "external/cronet/third_party/metrics_proto/trace_log.pb.h",
+ "external/cronet/third_party/metrics_proto/translate_event.pb.h",
+ "external/cronet/third_party/metrics_proto/ukm/aggregate.pb.h",
+ "external/cronet/third_party/metrics_proto/ukm/entry.pb.h",
+ "external/cronet/third_party/metrics_proto/ukm/report.pb.h",
+ "external/cronet/third_party/metrics_proto/ukm/source.pb.h",
+ "external/cronet/third_party/metrics_proto/user_action_event.pb.h",
+ "external/cronet/third_party/metrics_proto/user_demographics.pb.h",
],
export_include_dirs: [
".",
@@ -14262,16 +13907,14 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -14282,7 +13925,7 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -14386,8 +14029,8 @@
"third_party/protobuf/src/google/protobuf/wire_format_lite.cc",
"third_party/protobuf/src/google/protobuf/wrappers.pb.cc",
],
- static_libs: [
- "cronet_aml_third_party_zlib_zlib",
+ shared_libs: [
+ "libz",
],
host_supported: true,
device_supported: false,
@@ -14395,8 +14038,8 @@
"cronet_aml_defaults",
],
cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
@@ -14413,9 +14056,7 @@
"-D_GNU_SOURCE",
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-msse3",
],
@@ -14425,7 +14066,6 @@
"buildtools/third_party/libc++/trunk/include",
"buildtools/third_party/libc++abi/trunk/include",
"third_party/protobuf/src/",
- "third_party/zlib/",
],
cpp_std: "c++20",
}
@@ -14476,8 +14116,8 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
@@ -14487,9 +14127,7 @@
"-DHAVE_SYS_UIO_H",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
],
local_include_dirs: [
@@ -14499,7 +14137,7 @@
"buildtools/third_party/libc++abi/trunk/include",
"third_party/protobuf/src/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
@@ -14522,10 +14160,12 @@
":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_third_party_protobuf_protobuf_full",
"cronet_aml_third_party_protobuf_protoc_lib",
- "cronet_aml_third_party_zlib_zlib",
],
host_supported: true,
device_supported: false,
@@ -14533,8 +14173,8 @@
"cronet_aml_defaults",
],
cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
@@ -14550,9 +14190,7 @@
"-D_GNU_SOURCE",
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-msse3",
],
@@ -14656,9 +14294,11 @@
"third_party/protobuf/src/google/protobuf/compiler/subprocess.cc",
"third_party/protobuf/src/google/protobuf/compiler/zip_writer.cc",
],
+ shared_libs: [
+ "libz",
+ ],
static_libs: [
"cronet_aml_third_party_protobuf_protobuf_full",
- "cronet_aml_third_party_zlib_zlib",
],
host_supported: true,
device_supported: false,
@@ -14666,8 +14306,8 @@
"cronet_aml_defaults",
],
cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
@@ -14683,9 +14323,7 @@
"-D_GNU_SOURCE",
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-msse3",
],
@@ -14699,598 +14337,6 @@
cpp_std: "c++20",
}
-// GN: //third_party/zlib:zlib
-cc_library_static {
- name: "cronet_aml_third_party_zlib_zlib",
- srcs: [
- ":cronet_aml_third_party_zlib_zlib_adler32_simd",
- ":cronet_aml_third_party_zlib_zlib_inflate_chunk_simd",
- "third_party/zlib/adler32.c",
- "third_party/zlib/compress.c",
- "third_party/zlib/cpu_features.c",
- "third_party/zlib/crc32.c",
- "third_party/zlib/deflate.c",
- "third_party/zlib/gzclose.c",
- "third_party/zlib/gzlib.c",
- "third_party/zlib/gzread.c",
- "third_party/zlib/gzwrite.c",
- "third_party/zlib/infback.c",
- "third_party/zlib/inffast.c",
- "third_party/zlib/inftrees.c",
- "third_party/zlib/trees.c",
- "third_party/zlib/uncompr.c",
- "third_party/zlib/zutil.c",
- ],
- host_supported: true,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
- "-DDCHECK_ALWAYS_ON=1",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
- "-DZLIB_DEBUG",
- "-DZLIB_IMPLEMENTATION",
- "-D_DEBUG",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- "third_party/zlib/",
- ],
- cpp_std: "c++20",
- target: {
- android_arm: {
- srcs: [
- ":cronet_aml_third_party_android_ndk_cpu_features",
- ":cronet_aml_third_party_zlib_zlib_arm_crc32",
- ],
- cflags: [
- "-DADLER32_SIMD_NEON",
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DARMV8_OS_ANDROID",
- "-DCRC32_ARMV8_CRC32",
- "-DDEFLATE_SLIDE_HASH_NEON",
- "-DHAVE_SYS_UIO_H",
- "-DINFLATE_CHUNK_SIMD_NEON",
- ],
- local_include_dirs: [
- "third_party/android_ndk/sources/android/cpufeatures/",
- ],
- },
- android_arm64: {
- srcs: [
- ":cronet_aml_third_party_android_ndk_cpu_features",
- ":cronet_aml_third_party_zlib_zlib_arm_crc32",
- ],
- cflags: [
- "-DADLER32_SIMD_NEON",
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DARMV8_OS_ANDROID",
- "-DCRC32_ARMV8_CRC32",
- "-DDEFLATE_SLIDE_HASH_NEON",
- "-DHAVE_SYS_UIO_H",
- "-DINFLATE_CHUNK_READ_64LE",
- "-DINFLATE_CHUNK_SIMD_NEON",
- ],
- local_include_dirs: [
- "third_party/android_ndk/sources/android/cpufeatures/",
- ],
- },
- android_x86: {
- srcs: [
- ":cronet_aml_third_party_android_ndk_cpu_features",
- ":cronet_aml_third_party_zlib_zlib_crc32_simd",
- ],
- cflags: [
- "-DADLER32_SIMD_SSSE3",
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCRC32_SIMD_SSE42_PCLMUL",
- "-DDEFLATE_SLIDE_HASH_SSE2",
- "-DHAVE_SYS_UIO_H",
- "-DINFLATE_CHUNK_SIMD_SSE2",
- "-DX86_NOT_WINDOWS",
- "-msse3",
- ],
- local_include_dirs: [
- "third_party/android_ndk/sources/android/cpufeatures/",
- ],
- },
- android_x86_64: {
- srcs: [
- ":cronet_aml_third_party_android_ndk_cpu_features",
- ":cronet_aml_third_party_zlib_zlib_crc32_simd",
- ],
- cflags: [
- "-DADLER32_SIMD_SSSE3",
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCRC32_SIMD_SSE42_PCLMUL",
- "-DDEFLATE_SLIDE_HASH_SSE2",
- "-DHAVE_SYS_UIO_H",
- "-DINFLATE_CHUNK_READ_64LE",
- "-DINFLATE_CHUNK_SIMD_SSE2",
- "-DX86_NOT_WINDOWS",
- "-msse3",
- ],
- local_include_dirs: [
- "third_party/android_ndk/sources/android/cpufeatures/",
- ],
- },
- host: {
- srcs: [
- ":cronet_aml_third_party_zlib_zlib_crc32_simd",
- ],
- cflags: [
- "-DADLER32_SIMD_SSSE3",
- "-DCRC32_SIMD_SSE42_PCLMUL",
- "-DCR_SYSROOT_KEY=20220331T153654Z-0",
- "-DDEFLATE_SLIDE_HASH_SSE2",
- "-DINFLATE_CHUNK_READ_64LE",
- "-DINFLATE_CHUNK_SIMD_SSE2",
- "-DUSE_AURA=1",
- "-DUSE_OZONE=1",
- "-DUSE_UDEV",
- "-DX86_NOT_WINDOWS",
- "-D_FILE_OFFSET_BITS=64",
- "-D_LARGEFILE64_SOURCE",
- "-D_LARGEFILE_SOURCE",
- "-msse3",
- ],
- },
- },
-}
-
-// GN: //third_party/zlib:zlib_adler32_simd
-cc_object {
- name: "cronet_aml_third_party_zlib_zlib_adler32_simd",
- srcs: [
- "third_party/zlib/adler32_simd.c",
- ],
- host_supported: true,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
- "-DDCHECK_ALWAYS_ON=1",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
- "-DZLIB_DEBUG",
- "-DZLIB_IMPLEMENTATION",
- "-D_DEBUG",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++20",
- target: {
- android_arm: {
- cflags: [
- "-DADLER32_SIMD_NEON",
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- ],
- },
- android_arm64: {
- cflags: [
- "-DADLER32_SIMD_NEON",
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- ],
- },
- android_x86: {
- cflags: [
- "-DADLER32_SIMD_SSSE3",
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- "-DX86_NOT_WINDOWS",
- "-msse3",
- "-mssse3",
- ],
- },
- android_x86_64: {
- cflags: [
- "-DADLER32_SIMD_SSSE3",
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- "-DX86_NOT_WINDOWS",
- "-msse3",
- "-mssse3",
- ],
- },
- host: {
- cflags: [
- "-DADLER32_SIMD_SSSE3",
- "-DCR_SYSROOT_KEY=20220331T153654Z-0",
- "-DUSE_AURA=1",
- "-DUSE_OZONE=1",
- "-DUSE_UDEV",
- "-DX86_NOT_WINDOWS",
- "-D_FILE_OFFSET_BITS=64",
- "-D_LARGEFILE64_SOURCE",
- "-D_LARGEFILE_SOURCE",
- "-msse3",
- "-mssse3",
- ],
- },
- },
-}
-
-// GN: //third_party/zlib:zlib_arm_crc32
-cc_object {
- name: "cronet_aml_third_party_zlib_zlib_arm_crc32",
- srcs: [
- "third_party/zlib/crc32_simd.c",
- ],
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DARMV8_OS_ANDROID",
- "-DCRC32_ARMV8_CRC32",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
- "-DDCHECK_ALWAYS_ON=1",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
- "-DHAVE_SYS_UIO_H",
- "-DZLIB_DEBUG",
- "-DZLIB_IMPLEMENTATION",
- "-D_DEBUG",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- "third_party/zlib/",
- ],
- cpp_std: "c++20",
-}
-
-// GN: //third_party/zlib:zlib_common_headers
-cc_object {
- name: "cronet_aml_third_party_zlib_zlib_common_headers",
- host_supported: true,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
- "-DDCHECK_ALWAYS_ON=1",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
- "-D_DEBUG",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++20",
- target: {
- android_arm: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- ],
- },
- android_arm64: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- ],
- },
- android_x86: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- "-msse3",
- ],
- },
- android_x86_64: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- "-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",
- "-msse3",
- ],
- },
- },
-}
-
-// GN: //third_party/zlib:zlib_crc32_simd
-cc_object {
- name: "cronet_aml_third_party_zlib_zlib_crc32_simd",
- srcs: [
- "third_party/zlib/crc32_simd.c",
- "third_party/zlib/crc_folding.c",
- ],
- host_supported: true,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCRC32_SIMD_SSE42_PCLMUL",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
- "-DDCHECK_ALWAYS_ON=1",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
- "-DZLIB_DEBUG",
- "-DZLIB_IMPLEMENTATION",
- "-D_DEBUG",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- "-mpclmul",
- "-msse3",
- "-msse4.2",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++20",
- target: {
- android_x86: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- ],
- },
- android_x86_64: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- ],
- },
- 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",
- ],
- },
- },
-}
-
-// GN: //third_party/zlib:zlib_inflate_chunk_simd
-cc_object {
- name: "cronet_aml_third_party_zlib_zlib_inflate_chunk_simd",
- srcs: [
- "third_party/zlib/contrib/optimizations/inffast_chunk.c",
- "third_party/zlib/contrib/optimizations/inflate.c",
- ],
- host_supported: true,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
- "-DDCHECK_ALWAYS_ON=1",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
- "-DZLIB_DEBUG",
- "-DZLIB_IMPLEMENTATION",
- "-D_DEBUG",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- "third_party/zlib/",
- ],
- cpp_std: "c++20",
- target: {
- android_arm: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- "-DINFLATE_CHUNK_SIMD_NEON",
- ],
- },
- android_arm64: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- "-DINFLATE_CHUNK_READ_64LE",
- "-DINFLATE_CHUNK_SIMD_NEON",
- ],
- },
- android_x86: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- "-DINFLATE_CHUNK_SIMD_SSE2",
- "-msse3",
- ],
- },
- android_x86_64: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DHAVE_SYS_UIO_H",
- "-DINFLATE_CHUNK_READ_64LE",
- "-DINFLATE_CHUNK_SIMD_SSE2",
- "-msse3",
- ],
- },
- host: {
- cflags: [
- "-DCR_SYSROOT_KEY=20220331T153654Z-0",
- "-DINFLATE_CHUNK_READ_64LE",
- "-DINFLATE_CHUNK_SIMD_SSE2",
- "-DUSE_AURA=1",
- "-DUSE_OZONE=1",
- "-DUSE_UDEV",
- "-D_FILE_OFFSET_BITS=64",
- "-D_LARGEFILE64_SOURCE",
- "-D_LARGEFILE_SOURCE",
- "-msse3",
- ],
- },
- },
-}
-
-// GN: //third_party/zlib:zlib_slide_hash_simd
-cc_object {
- name: "cronet_aml_third_party_zlib_zlib_slide_hash_simd",
- host_supported: true,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
- "-DDCHECK_ALWAYS_ON=1",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
- "-DZLIB_DEBUG",
- "-DZLIB_IMPLEMENTATION",
- "-D_DEBUG",
- "-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++20",
- target: {
- android_arm: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DDEFLATE_SLIDE_HASH_NEON",
- "-DHAVE_SYS_UIO_H",
- ],
- },
- android_arm64: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DDEFLATE_SLIDE_HASH_NEON",
- "-DHAVE_SYS_UIO_H",
- ],
- },
- android_x86: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DDEFLATE_SLIDE_HASH_SSE2",
- "-DHAVE_SYS_UIO_H",
- "-msse3",
- ],
- },
- android_x86_64: {
- cflags: [
- "-DANDROID",
- "-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DDEFLATE_SLIDE_HASH_SSE2",
- "-DHAVE_SYS_UIO_H",
- "-msse3",
- ],
- },
- host: {
- cflags: [
- "-DCR_SYSROOT_KEY=20220331T153654Z-0",
- "-DDEFLATE_SLIDE_HASH_SSE2",
- "-DUSE_AURA=1",
- "-DUSE_OZONE=1",
- "-DUSE_UDEV",
- "-D_FILE_OFFSET_BITS=64",
- "-D_LARGEFILE64_SOURCE",
- "-D_LARGEFILE_SOURCE",
- "-msse3",
- ],
- },
- },
-}
-
// GN: //url:buildflags
cc_genrule {
name: "cronet_aml_url_buildflags",
@@ -15377,17 +14423,15 @@
cflags: [
"-DANDROID",
"-DANDROID_NDK_VERSION_ROLL=r23_1",
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
- "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
+ "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
+ "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
"-DDCHECK_ALWAYS_ON=1",
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DHAVE_SYS_UIO_H",
"-DIS_URL_IMPL",
"-D_DEBUG",
"-D_GNU_SOURCE",
- "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1",
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
@@ -15400,7 +14444,7 @@
"third_party/abseil-cpp/",
"third_party/boringssl/src/include/",
],
- cpp_std: "c++20",
+ cpp_std: "c++17",
target: {
android_x86: {
cflags: [
diff --git a/tools/gn2bp/desc_arm.json b/tools/gn2bp/desc_arm.json
index 996b5f5..d3e9ecd 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 dd8e800..980a7a1 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 555f044..d0d9954 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 11e4e95..6d02af7 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 58d7cad..9c0f796 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -42,7 +42,7 @@
# Default targets to translate to the blueprint file.
default_targets = [
'//components/cronet/android:cronet',
- '//components/cronet:cronet_package',
+ '//components/cronet/android:cronet_android_mainline',
]
# Defines a custom init_rc argument to be applied to the corresponding output
@@ -93,11 +93,11 @@
# Include directories that will be removed from all targets.
local_include_dirs_denylist = [
+ 'third_party/zlib/',
]
-android_include_dirs_denylist = [
+experimental_include_dirs_denylist = [
'third_party/brotli/include/',
- 'third_party/zlib/',
]
# Name of the module which settings such as compiler flags for all other
@@ -105,7 +105,7 @@
defaults_module = module_prefix + 'defaults'
# Location of the project in the Android source tree.
-tree_path = 'external/chromium_org'
+tree_path = 'external/cronet'
# Path for the protobuf sources in the standalone build.
buildtools_protobuf_src = '//buildtools/protobuf/src'
@@ -176,23 +176,23 @@
lambda m, a: None, # disable libunwind
'//net/tools/root_store_tool:root_store_tool':
lambda m, a: None,
+ '//third_party/zlib:zlib':
+ enable_zlib,
}
-android_deps = {
+experimental_android_deps = {
'//third_party/brotli:common':
enable_brotli,
'//third_party/brotli:dec':
enable_brotli,
'//third_party/modp_b64:modp_b64':
enable_modp_b64,
- '//third_party/zlib:zlib':
- enable_zlib,
}
# Uncomment the following lines to use Android deps rather than their Chromium
# equivalent:
-#builtin_deps.update(android_deps)
-#local_include_dirs_denylist.extend(android_include_dirs_denylist)
+#builtin_deps.update(experimental_android_deps)
+#local_include_dirs_denylist.extend(experimental_include_dirs_denylist)
# Name of tethering apex module
tethering_apex = "com.android.tethering"