diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index c590850..e59c8e4 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -70,7 +70,10 @@
                 "libservice-connectivity",
                 "libandroid_net_connectivity_com_android_net_module_util_jni",
             ],
-            native_shared_libs: ["libnetd_updatable"],
+            native_shared_libs: [
+                "libcom.android.tethering.connectivity_native",
+                "libnetd_updatable",
+            ],
         },
         both: {
             jni_libs: [
diff --git a/framework/src/android/net/apf/ApfCapabilities.java b/framework/src/android/net/apf/ApfCapabilities.java
index 663c1b3..64f14a1 100644
--- a/framework/src/android/net/apf/ApfCapabilities.java
+++ b/framework/src/android/net/apf/ApfCapabilities.java
@@ -133,9 +133,7 @@
     public static boolean getApfDrop8023Frames() {
         // TODO: deprecate/remove this method (now unused in the platform), as the resource was
         // moved to NetworkStack.
-        final Resources systemRes = Resources.getSystem();
-        final int id = systemRes.getIdentifier("config_apfDrop802_3Frames", "bool", "android");
-        return systemRes.getBoolean(id);
+        return true;
     }
 
     /**
@@ -144,8 +142,6 @@
     public static @NonNull int[] getApfEtherTypeBlackList() {
         // TODO: deprecate/remove this method (now unused in the platform), as the resource was
         // moved to NetworkStack.
-        final Resources systemRes = Resources.getSystem();
-        final int id = systemRes.getIdentifier("config_apfEthTypeBlackList", "array", "android");
-        return systemRes.getIntArray(id);
+        return new int[] { 0x88a2, 0x88a4, 0x88b8, 0x88cd, 0x88e3 };
     }
 }
diff --git a/service/Android.bp b/service/Android.bp
index d850015..326f91b 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -22,7 +22,6 @@
 aidl_interface {
     name: "connectivity_native_aidl_interface",
     local_include_dir: "binder",
-    vendor_available: true,
     srcs: [
         "binder/android/net/connectivity/aidl/*.aidl",
     ],
@@ -179,6 +178,7 @@
         "networkstack-client",
         "PlatformProperties",
         "service-connectivity-protos",
+        "service-connectivity-stats-protos",
         "NetworkStackApiStableShims",
     ],
     apex_available: [
@@ -290,6 +290,20 @@
     installable: true,
 }
 
+java_library_static {
+    name: "service-connectivity-stats-protos",
+    sdk_version: "system_current",
+    min_sdk_version: "30",
+    proto: {
+        type: "lite",
+    },
+    srcs: [
+        "src/com/android/metrics/stats.proto",
+    ],
+    static_libs: ["ConnectivityServiceprotos"],
+    apex_available: ["com.android.tethering"],
+}
+
 genrule {
     name: "connectivity-jarjar-rules",
     defaults: ["jarjar-rules-combine-defaults"],
diff --git a/service/libconnectivity/Android.bp b/service/libconnectivity/Android.bp
new file mode 100644
index 0000000..391ceac
--- /dev/null
+++ b/service/libconnectivity/Android.bp
@@ -0,0 +1,57 @@
+//
+// Copyright (C) 2022 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+cc_library_shared {
+    name: "libcom.android.tethering.connectivity_native",
+    srcs: [
+        "src/**/*.cpp",
+    ],
+    min_sdk_version: "30",
+    static_libs: [
+        "connectivity_native_aidl_interface-V1-ndk",
+    ],
+    export_include_dirs: ["include"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-error=deprecated-declarations",
+    ],
+
+    shared_libs: [
+        "libbinder_ndk",
+    ],
+    llndk: {
+        symbol_file: "libconnectivity_native.map.txt",
+    },
+    stubs: {
+        symbol_file: "libconnectivity_native.map.txt",
+        versions: [
+            "current",
+        ],
+    },
+    header_abi_checker: {
+        enabled: true,
+        symbol_file: "libconnectivity_native.map.txt",
+    },
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
diff --git a/service/libconnectivity/include/connectivity_native.h b/service/libconnectivity/include/connectivity_native.h
new file mode 100644
index 0000000..5a2509a
--- /dev/null
+++ b/service/libconnectivity/include/connectivity_native.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef LIBCONNECTIVITY_CONNECTIVITY_NATIVE_H_
+#define LIBCONNECTIVITY_CONNECTIVITY_NATIVE_H_
+
+#include <sys/cdefs.h>
+#include <netinet/in.h>
+
+// For branches that do not yet have __ANDROID_API_U__ defined, like module
+// release branches.
+#ifndef __ANDROID_API_U__
+#define __ANDROID_API_U__ 34
+#endif
+
+__BEGIN_DECLS
+
+/**
+ * Blocks a port from being assigned during bind(). The caller is responsible for updating
+ * /proc/sys/net/ipv4/ip_local_port_range with the port being blocked so that calls to connect()
+ * will not automatically assign one of the blocked ports.
+ * Will return success even if port was already blocked.
+ *
+ * Returns 0 on success, or a POSIX error code (see errno.h) on failure:
+ *  - EINVAL for invalid port number
+ *  - EPERM if the UID of the client doesn't have network stack permission
+ *  - Other errors as per https://man7.org/linux/man-pages/man2/bpf.2.html
+ *
+ * @param port Int corresponding to port number.
+ */
+int AConnectivityNative_blockPortForBind(in_port_t port) __INTRODUCED_IN(__ANDROID_API_U__);
+
+/**
+ * Unblocks a port that has previously been blocked.
+ * Will return success even if port was already unblocked.
+ *
+ * Returns 0 on success, or a POSIX error code (see errno.h) on failure:
+ *  - EINVAL for invalid port number
+ *  - EPERM if the UID of the client doesn't have network stack permission
+ *  - Other errors as per https://man7.org/linux/man-pages/man2/bpf.2.html
+ *
+ * @param port Int corresponding to port number.
+ */
+int AConnectivityNative_unblockPortForBind(in_port_t port) __INTRODUCED_IN(__ANDROID_API_U__);
+
+/**
+ * Unblocks all ports that have previously been blocked.
+ *
+ * Returns 0 on success, or a POSIX error code (see errno.h) on failure:
+ *  - EINVAL for invalid port number
+ *  - EPERM if the UID of the client doesn't have network stack permission
+ *  - Other errors as per https://man7.org/linux/man-pages/man2/bpf.2.html
+ */
+int AConnectivityNative_unblockAllPortsForBind() __INTRODUCED_IN(__ANDROID_API_U__);
+
+/**
+ * Gets the list of ports that have been blocked.
+ *
+ * Returns 0 on success, or a POSIX error code (see errno.h) on failure:
+ *  - EINVAL for invalid port number
+ *  - EPERM if the UID of the client doesn't have network stack permission
+ *  - Other errors as per https://man7.org/linux/man-pages/man2/bpf.2.html
+ *
+ * @param ports Array of ports that will be filled with the port numbers.
+ * @param count Pointer to the size of the ports array; the value will be set to the total number of
+ *              blocked ports, which may be larger than the ports array that was filled.
+ */
+int AConnectivityNative_getPortsBlockedForBind(in_port_t *ports, size_t *count)
+    __INTRODUCED_IN(__ANDROID_API_U__);
+
+__END_DECLS
+
+
+#endif
diff --git a/service/libconnectivity/libconnectivity_native.map.txt b/service/libconnectivity/libconnectivity_native.map.txt
new file mode 100644
index 0000000..19b1074
--- /dev/null
+++ b/service/libconnectivity/libconnectivity_native.map.txt
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2022 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LIBCONNECTIVITY_NATIVE {
+  global:
+    AConnectivityNative_blockPortForBind; # apex llndk
+    AConnectivityNative_getPortsBlockedForBind; # apex llndk
+    AConnectivityNative_unblockPortForBind; # apex llndk
+    AConnectivityNative_unblockAllPortsForBind; # apex llndk
+  local:
+    *;
+};
diff --git a/service/libconnectivity/src/connectivity_native.cpp b/service/libconnectivity/src/connectivity_native.cpp
new file mode 100644
index 0000000..9545ed1
--- /dev/null
+++ b/service/libconnectivity/src/connectivity_native.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "connectivity_native.h"
+
+#include <android/binder_manager.h>
+#include <aidl/android/net/connectivity/aidl/ConnectivityNative.h>
+
+using aidl::android::net::connectivity::aidl::IConnectivityNative;
+
+
+static std::shared_ptr<IConnectivityNative> getBinder() {
+    static ndk::SpAIBinder sBinder = ndk::SpAIBinder(reinterpret_cast<AIBinder*>(
+        AServiceManager_getService("connectivity_native")));
+    return aidl::android::net::connectivity::aidl::IConnectivityNative::fromBinder(sBinder);
+}
+
+static int getErrno(const ::ndk::ScopedAStatus& status) {
+    switch (status.getExceptionCode()) {
+        case EX_NONE:
+            return 0;
+        case EX_ILLEGAL_ARGUMENT:
+            return EINVAL;
+        case EX_SECURITY:
+            return EPERM;
+        case EX_SERVICE_SPECIFIC:
+            return status.getServiceSpecificError();
+        default:
+            return EPROTO;
+    }
+}
+
+int AConnectivityNative_blockPortForBind(in_port_t port) {
+    std::shared_ptr<IConnectivityNative> c = getBinder();
+    return getErrno(c->blockPortForBind(port));
+}
+
+int AConnectivityNative_unblockPortForBind(in_port_t port) {
+    std::shared_ptr<IConnectivityNative> c = getBinder();
+    return getErrno(c->unblockPortForBind(port));
+}
+
+int AConnectivityNative_unblockAllPortsForBind() {
+    std::shared_ptr<IConnectivityNative> c = getBinder();
+    return getErrno(c->unblockAllPortsForBind());
+}
+
+int AConnectivityNative_getPortsBlockedForBind(in_port_t *ports, size_t *count) {
+    std::shared_ptr<IConnectivityNative> c = getBinder();
+    std::vector<int32_t> actualBlockedPorts;
+    int err = getErrno(c->getPortsBlockedForBind(&actualBlockedPorts));
+    if (err) {
+        return err;
+    }
+
+    for (int i = 0; i < *count && i < actualBlockedPorts.size(); i++) {
+        ports[i] = actualBlockedPorts[i];
+    }
+    *count = actualBlockedPorts.size();
+    return 0;
+}
diff --git a/service/src/com/android/metrics/stats.proto b/service/src/com/android/metrics/stats.proto
new file mode 100644
index 0000000..48b8316
--- /dev/null
+++ b/service/src/com/android/metrics/stats.proto
@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+option java_multiple_files = true;
+
+package com.android.metrics;
+
+import "frameworks/proto_logging/stats/enums/stats/connectivity/connectivity_service.proto";
+
+/**
+ * Logs NSD(Network service discovery) client session
+ *
+ * Log from:
+ *     packages/modules/Connectivity/service-t/src/com/android/server/NsdService
+ */
+message NetworkNsdReported {
+  // Indicate if the device is using the legacy or the new implementation
+  optional bool is_legacy = 1;
+
+  // It is a random number to represent different clients. Each client is an app on the device.
+  optional int32 client_id = 2;
+
+  // It is a increment_number to represent different transactions.
+  // Each transaction is a request from an app client.
+  optional int32 transaction_id = 3;
+
+  // Indicate the service in resolution is a known service in the discovered services cache
+  optional bool is_known_service = 4;
+
+  // Record each NSD session type
+  optional .android.stats.connectivity.NsdEventType type = 5;
+
+  // The process duration of the event in milli-second
+  optional int64 event_duration_millisec = 6;
+
+  // Record each mdns query result
+  optional .android.stats.connectivity.MdnsQueryResult query_result = 7;
+
+  // Count of services in cache at the end of discovery
+  optional int32 found_service_count = 8;
+
+  // Count of found callback when discovery is stopped
+  optional int32 found_callback_count = 9;
+
+  // Count of lost callback when discovery is stopped
+  optional int32 lost_callback_count = 10;
+
+  // Record query service count before unregistered service
+  optional int32 replied_requests_count = 11;
+}
+
+/**
+ * Logs the number of network count on each list of transports
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NetworkCountPerTransports {
+    // the number of network count on each list of transports
+    repeated NetworkCountForTransports network_count_for_transports = 1;
+}
+
+/**
+ * Logs the number of network count and transport type
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NetworkCountForTransports {
+    // Transport types of the network
+    optional int32 transport_types = 1;
+
+    // Number of networks for one list of transport types
+    optional int32 network_count = 2;
+}
+
+/**
+ * Logs a list of networks
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NetworkList {
+    repeated NetworkDescription network_description = 1;
+}
+
+/**
+ * Logs connection duration in seconds and list of transports
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message ConnectionDurationForTransports {
+    // Transport types of the network
+    optional int32 transport_types = 1;
+
+    // Time duration that the device stays connected to the network
+    optional int32 duration_sec = 2;
+}
+
+/**
+ * Logs connection duration on each list of transports, in seconds
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message ConnectionDurationPerTransports {
+    repeated ConnectionDurationForTransports connection_duration_for_transports = 1;
+}
+
+/**
+ * Logs network request count & request type
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message RequestCountForType {
+    // The type of network request
+    optional .android.stats.connectivity.RequestType request_type = 1;
+
+    // Number of network requests
+    optional int32 request_count = 2;
+}
+
+/**
+ * Logs network request count
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NetworkRequestCount {
+    // Network request count for request type
+    repeated RequestCountForType request_count_for_type = 1;
+}
+
+/**
+ * Logs information about a network
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NetworkDescription {
+    // The transport types of the network. A network may include multiple transport types.
+    // Each transfer type is represented by a different bit, defined in
+    // packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java
+    optional int32 transport_types = 1;
+
+    // Indicates the network is metered, non-metered or temporarily-unmetered
+    optional .android.stats.connectivity.MeteredState metered_state = 2;
+
+    // Indicates the network is validated, non-validated, partial or portal
+    optional .android.stats.connectivity.ValidatedState validated_state = 3;
+
+    // Record the bitmask of all the policies applied to this score of network.
+    // Each policy is represented by a different bit, defined in
+    // packages/modules/Connectivity/service/src/com/android/server/connectivity/FullScore.java
+    optional int64 score_policies = 4;
+
+    // The capabilities of the network. A network may include multiple network capabilities.
+    // Each capability is represented by a different bit, defined in
+    // packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java
+    optional int64 capabilities = 5;
+
+    // Bitfield representing the network's enterprise capability identifier, defined in
+    // packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java
+    optional int32 enterprise_id = 6;
+}
+
+/**
+ * Pulls a list of NumberOfRematchesPerReason.
+ *
+ * Pulled from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NumberOfRematchesPerReason {
+    // Number of network rematches for each rematch reason
+    repeated NumberOfRematchesForReason number_of_rematches_per_reason= 1;
+}
+
+/**
+ * Logs number of network rematches for rematch reason
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NumberOfRematchesForReason {
+    // The reason of network rematch
+    optional .android.stats.connectivity.RematchReason rematch_reason = 1;
+
+    // Number of network rematches
+    optional int32 rematch_count = 2;
+};
+
+/**
+ * Pulls information for connectivity stats.
+ *
+ * Pulled from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message ConnectivityStateSample {
+    // Number of networks per list of transports
+    optional NetworkCountPerTransports network_count_per_transports = 1;
+
+    // This is a list of networks with their transports and the duration
+    optional ConnectionDurationPerTransports connection_duration_per_transports = 2;
+
+    // Number of requests per category
+    optional NetworkRequestCount network_request_count  = 3;
+
+    // Full list of network details (slice by transport / meteredness / internet+validated)
+    optional NetworkList networks = 4;
+}
+
+
+/**
+ * Pulls information for network selection rematch info.
+ *
+ * Pulled from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NetworkSelectionRematchReasonsInfo {
+    // Number of rematch per rematch reason
+    optional NumberOfRematchesPerReason number_of_rematches_per_reason = 1;
+}
+
+/**
+ * Logs rematch information for the default network
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message DefaultNetworkRematchInfo {
+    // The session id comes from each reboot, this is used to correlate the statistics of the
+    // networkselect on the same boot
+    optional int64 session_id = 1;
+
+    // The information of old device default network
+    optional NetworkDescription old_network = 2;
+
+    // The information of new device default network
+    optional NetworkDescription new_network = 3;
+
+    // The reason of network rematch
+    optional .android.stats.connectivity.RematchReason rematch_reason = 4;
+
+    // The time duration the device kept the old network as the default in seconds
+    optional int32 time_duration_on_old_network_sec = 5;
+}
+
+/**
+ * Logs network selection performance
+ *
+ * Logs from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message NetworkSelectionPerformance {
+    // Number of network requests
+    optional int32 number_of_network_requests = 1;
+
+    // List of networks right now
+    // (slice by transport / meteredness / internet+validated)
+    optional NetworkList networks = 2;
+
+    // The latency of selection computed in milli-second
+    optional int32 selection_computed_latency_milli = 3;
+
+    // The latency of selection applied in milli-second
+    optional int32 selection_applied_latency_milli = 4;
+
+    // The latency of selection issued in milli-second
+    optional int32 selection_issued_latency_milli = 5;
+}
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 9b1fa45..d52f411 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -6101,14 +6101,12 @@
     }
 
     private void onUserAdded(@NonNull final UserHandle user) {
-        mPermissionMonitor.onUserAdded(user);
         if (mOemNetworkPreferences.getNetworkPreferences().size() > 0) {
             handleSetOemNetworkPreference(mOemNetworkPreferences, null);
         }
     }
 
     private void onUserRemoved(@NonNull final UserHandle user) {
-        mPermissionMonitor.onUserRemoved(user);
         // If there was a network preference for this user, remove it.
         handleSetProfileNetworkPreference(
                 List.of(new ProfileNetworkPreferenceList.Preference(user, null, true)),
diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java
index fd1ed60..eee7f3a 100755
--- a/service/src/com/android/server/connectivity/PermissionMonitor.java
+++ b/service/src/com/android/server/connectivity/PermissionMonitor.java
@@ -175,6 +175,22 @@
                 final String[] pkgList =
                         intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
                 onExternalApplicationsAvailable(pkgList);
+            } else if (Intent.ACTION_USER_ADDED.equals(action)) {
+                final UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER);
+                // User should be filled for below intents, check the existence.
+                if (user == null) {
+                    Log.wtf(TAG, action + " broadcast without EXTRA_USER");
+                    return;
+                }
+                onUserAdded(user);
+            } else if (Intent.ACTION_USER_REMOVED.equals(action)) {
+                final UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER);
+                // User should be filled for below intents, check the existence.
+                if (user == null) {
+                    Log.wtf(TAG, action + " broadcast without EXTRA_USER");
+                    return;
+                }
+                onUserRemoved(user);
             } else {
                 Log.wtf(TAG, "received unexpected intent: " + action);
             }
@@ -408,6 +424,14 @@
                 mIntentReceiver, externalIntentFilter, null /* broadcastPermission */,
                 null /* scheduler */);
 
+        // Listen for user add/remove.
+        final IntentFilter userIntentFilter = new IntentFilter();
+        userIntentFilter.addAction(Intent.ACTION_USER_ADDED);
+        userIntentFilter.addAction(Intent.ACTION_USER_REMOVED);
+        userAllContext.registerReceiver(
+                mIntentReceiver, userIntentFilter, null /* broadcastPermission */,
+                null /* scheduler */);
+
         // Register UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer
         mDeps.registerContentObserver(
                 userAllContext,
@@ -547,7 +571,8 @@
      *
      * @hide
      */
-    public synchronized void onUserAdded(@NonNull UserHandle user) {
+    @VisibleForTesting
+    synchronized void onUserAdded(@NonNull UserHandle user) {
         mUsers.add(user);
 
         final List<PackageInfo> apps = getInstalledPackagesAsUser(user);
@@ -578,7 +603,8 @@
      *
      * @hide
      */
-    public synchronized void onUserRemoved(@NonNull UserHandle user) {
+    @VisibleForTesting
+    synchronized void onUserRemoved(@NonNull UserHandle user) {
         mUsers.remove(user);
 
         // Remove uids network permissions that belongs to the user.
@@ -758,7 +784,8 @@
      *
      * @hide
      */
-    public synchronized void onPackageAdded(@NonNull final String packageName, final int uid) {
+    @VisibleForTesting
+    synchronized void onPackageAdded(@NonNull final String packageName, final int uid) {
         // Update uid permission.
         updateAppIdTrafficPermission(uid);
         // Get the appId permission from all users then send the latest permission to netd.
@@ -821,7 +848,8 @@
      *
      * @hide
      */
-    public synchronized void onPackageRemoved(@NonNull final String packageName, final int uid) {
+    @VisibleForTesting
+    synchronized void onPackageRemoved(@NonNull final String packageName, final int uid) {
         // Update uid permission.
         updateAppIdTrafficPermission(uid);
         // Get the appId permission from all users then send the latest permission to netd.
diff --git a/tests/common/java/android/net/apf/ApfCapabilitiesTest.java b/tests/common/java/android/net/apf/ApfCapabilitiesTest.java
index fa4adcb..8c2ec40 100644
--- a/tests/common/java/android/net/apf/ApfCapabilitiesTest.java
+++ b/tests/common/java/android/net/apf/ApfCapabilitiesTest.java
@@ -33,6 +33,7 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.testutils.DevSdkIgnoreRule;
+import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
 
 import org.junit.Before;
@@ -83,7 +84,11 @@
         assertTrue(caps.hasDataAccess());
     }
 
-    @Test
+    // the property is deleted in U, on S & T getApfDrop8023Frames() is mainline and
+    // hardcoded to return true, so this simply verifies the unused property is also true,
+    // as modifying it would not take effect.  For S+ change NetworkStack's
+    // config_apfDrop802_3Frames instead.
+    @Test @IgnoreAfter(Build.VERSION_CODES.TIRAMISU)
     public void testGetApfDrop8023Frames() {
         // Get com.android.internal.R.bool.config_apfDrop802_3Frames. The test cannot directly
         // use R.bool.config_apfDrop802_3Frames because that is not a stable resource ID.
@@ -105,7 +110,11 @@
                 ApfCapabilities.getApfDrop8023Frames());
     }
 
-    @Test
+    // the property is deleted in U, on S & T getApfEtherTypeBlackList() is mainline and
+    // hardcoded to return a specific default set of ethertypes, so this simply verifies
+    // that the unused property hasn't been changed away from the default, as it would
+    // not take effect.  For S+ change NetworkStack's config_apfEthTypeDenyList instead.
+    @Test @IgnoreAfter(Build.VERSION_CODES.TIRAMISU)
     public void testGetApfEtherTypeBlackList() {
         // Get com.android.internal.R.array.config_apfEthTypeBlackList. The test cannot directly
         // use R.array.config_apfEthTypeBlackList because that is not a stable resource ID.
diff --git a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
index 8940075..db13c49 100644
--- a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
+++ b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
@@ -105,6 +105,7 @@
 
 private const val TAG = "DscpPolicyTest"
 private const val PACKET_TIMEOUT_MS = 2_000L
+private const val IPV6_ADDRESS_WAIT_TIME_MS = 10_000L
 
 @AppModeFull(reason = "Instant apps cannot create test networks")
 @RunWith(AndroidJUnit4::class)
@@ -222,7 +223,7 @@
         var inet6Addr: Inet6Address? = null
         val onLinkPrefix = raResponder.prefix
         val startTime = SystemClock.elapsedRealtime()
-        while (SystemClock.elapsedRealtime() - startTime < PACKET_TIMEOUT_MS) {
+        while (SystemClock.elapsedRealtime() - startTime < IPV6_ADDRESS_WAIT_TIME_MS) {
             SystemClock.sleep(50 /* ms */)
             val sock = Os.socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP)
             try {
diff --git a/tests/native/connectivity_native_test/Android.bp b/tests/native/connectivity_native_test/Android.bp
index 7d43aa8..8825aa4 100644
--- a/tests/native/connectivity_native_test/Android.bp
+++ b/tests/native/connectivity_native_test/Android.bp
@@ -10,7 +10,7 @@
         "vts",
     ],
     test_config_template: "AndroidTestTemplate.xml",
-    min_sdk_version: "31",
+    min_sdk_version: "34",
     tidy: false,
     srcs: [
         "connectivity_native_test.cpp",
diff --git a/tests/native/connectivity_native_test/connectivity_native_test.cpp b/tests/native/connectivity_native_test/connectivity_native_test.cpp
index 3db5265..27a9d35 100644
--- a/tests/native/connectivity_native_test/connectivity_native_test.cpp
+++ b/tests/native/connectivity_native_test/connectivity_native_test.cpp
@@ -14,62 +14,81 @@
  * limitations under the License.
  */
 
-#include <aidl/android/net/connectivity/aidl/ConnectivityNative.h>
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 #include <android-modules-utils/sdk_level.h>
 #include <cutils/misc.h>  // FIRST_APPLICATION_UID
+#include <dlfcn.h>
 #include <gtest/gtest.h>
 #include <netinet/in.h>
 
 #include "bpf/BpfUtils.h"
 
-using aidl::android::net::connectivity::aidl::IConnectivityNative;
+typedef int (*GetPortsBlockedForBind)(in_port_t*, size_t*);
+GetPortsBlockedForBind getPortsBlockedForBind;
+typedef int (*BlockPortForBind)(in_port_t);
+BlockPortForBind blockPortForBind;
+typedef int (*UnblockPortForBind)(in_port_t);
+UnblockPortForBind unblockPortForBind;
+typedef int (*UnblockAllPortsForBind)();
+UnblockAllPortsForBind unblockAllPortsForBind;
 
 class ConnectivityNativeBinderTest : public ::testing::Test {
   public:
-    std::vector<int32_t> mActualBlockedPorts;
-
-    ConnectivityNativeBinderTest() {
-        AIBinder* binder = AServiceManager_getService("connectivity_native");
-        ndk::SpAIBinder sBinder = ndk::SpAIBinder(binder);
-        mService = aidl::android::net::connectivity::aidl::IConnectivityNative::fromBinder(sBinder);
-    }
+    in_port_t mActualBlockedPorts[65535];
+    size_t mActualBlockedPortsCount = 65535;
+    bool restoreBlockedPorts;
 
     void SetUp() override {
-        // Skip test case if not on T.
-        if (!android::modules::sdklevel::IsAtLeastT()) GTEST_SKIP() <<
+        restoreBlockedPorts = false;
+        // Skip test case if not on U.
+        if (!android::modules::sdklevel::IsAtLeastU()) GTEST_SKIP() <<
                 "Should be at least T device.";
 
         // Skip test case if not on 5.4 kernel which is required by bpf prog.
         if (!android::bpf::isAtLeastKernelVersion(5, 4, 0)) GTEST_SKIP() <<
                 "Kernel should be at least 5.4.";
 
-        ASSERT_NE(nullptr, mService.get());
+        // Necessary to use dlopen/dlsym since the lib is only available on U and there
+        // is no Sdk34ModuleController in tradefed yet.
+        // TODO: link against the library directly and add Sdk34ModuleController to
+        // AndroidTest.txml when available.
+        void* nativeLib = dlopen("libcom.android.tethering.connectivity_native.so", RTLD_NOW);
+        ASSERT_NE(nullptr, nativeLib);
+        getPortsBlockedForBind = reinterpret_cast<GetPortsBlockedForBind>(
+                dlsym(nativeLib, "AConnectivityNative_getPortsBlockedForBind"));
+        ASSERT_NE(nullptr, getPortsBlockedForBind);
+        blockPortForBind = reinterpret_cast<BlockPortForBind>(
+                dlsym(nativeLib, "AConnectivityNative_blockPortForBind"));
+        ASSERT_NE(nullptr, blockPortForBind);
+        unblockPortForBind = reinterpret_cast<UnblockPortForBind>(
+                dlsym(nativeLib, "AConnectivityNative_unblockPortForBind"));
+        ASSERT_NE(nullptr, unblockPortForBind);
+        unblockAllPortsForBind = reinterpret_cast<UnblockAllPortsForBind>(
+                dlsym(nativeLib, "AConnectivityNative_unblockAllPortsForBind"));
+        ASSERT_NE(nullptr, unblockAllPortsForBind);
 
         // If there are already ports being blocked on device unblockAllPortsForBind() store
         // the currently blocked ports and add them back at the end of the test. Do this for
         // every test case so additional test cases do not forget to add ports back.
-        ndk::ScopedAStatus status = mService->getPortsBlockedForBind(&mActualBlockedPorts);
-        EXPECT_TRUE(status.isOk()) << status.getDescription ();
-
+        int err = getPortsBlockedForBind(mActualBlockedPorts, &mActualBlockedPortsCount);
+        EXPECT_EQ(err, 0);
+        restoreBlockedPorts = true;
     }
 
     void TearDown() override {
-        ndk::ScopedAStatus status;
-        if (mActualBlockedPorts.size() > 0) {
-            for (int i : mActualBlockedPorts) {
-                mService->blockPortForBind(i);
-                EXPECT_TRUE(status.isOk()) << status.getDescription ();
+        int err;
+        if (mActualBlockedPortsCount > 0 && restoreBlockedPorts) {
+            for (int i=0; i < mActualBlockedPortsCount; i++) {
+                err = blockPortForBind(mActualBlockedPorts[i]);
+                EXPECT_EQ(err, 0);
             }
         }
     }
 
   protected:
-    std::shared_ptr<IConnectivityNative> mService;
-
     void runSocketTest (sa_family_t family, const int type, bool blockPort) {
-        ndk::ScopedAStatus status;
+        int err;
         in_port_t port = 0;
         int sock, sock2;
         // Open two sockets with SO_REUSEADDR and expect they can both bind to port.
@@ -79,16 +98,16 @@
         int blockedPort = 0;
         if (blockPort) {
             blockedPort = ntohs(port);
-            status = mService->blockPortForBind(blockedPort);
-            EXPECT_TRUE(status.isOk()) << status.getDescription ();
+            err = blockPortForBind(blockedPort);
+            EXPECT_EQ(err, 0);
         }
 
         int sock3 = openSocket(&port, family, type, blockPort /* expectBindFail */);
 
         if (blockPort) {
             EXPECT_EQ(-1, sock3);
-            status = mService->unblockPortForBind(blockedPort);
-            EXPECT_TRUE(status.isOk()) << status.getDescription ();
+            err = unblockPortForBind(blockedPort);
+            EXPECT_EQ(err, 0);
         } else {
             EXPECT_NE(-1, sock3);
         }
@@ -177,110 +196,74 @@
 }
 
 TEST_F(ConnectivityNativeBinderTest, BlockPortTwice) {
-    ndk::ScopedAStatus status = mService->blockPortForBind(5555);
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
-    status = mService->blockPortForBind(5555);
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
-    status = mService->unblockPortForBind(5555);
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
+    int err = blockPortForBind(5555);
+    EXPECT_EQ(err, 0);
+    err = blockPortForBind(5555);
+    EXPECT_EQ(err, 0);
+    err = unblockPortForBind(5555);
+    EXPECT_EQ(err, 0);
 }
 
 TEST_F(ConnectivityNativeBinderTest, GetBlockedPorts) {
-    ndk::ScopedAStatus status;
-    std::vector<int> blockedPorts{1, 100, 1220, 1333, 2700, 5555, 5600, 65000};
-    for (int i : blockedPorts) {
-        status = mService->blockPortForBind(i);
-        EXPECT_TRUE(status.isOk()) << status.getDescription ();
+    int err;
+    in_port_t blockedPorts[8] = {1, 100, 1220, 1333, 2700, 5555, 5600, 65000};
+
+    if (mActualBlockedPortsCount > 0) {
+        err = unblockAllPortsForBind();
     }
-    std::vector<int32_t> actualBlockedPorts;
-    status = mService->getPortsBlockedForBind(&actualBlockedPorts);
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
-    EXPECT_FALSE(actualBlockedPorts.empty());
-    EXPECT_EQ(blockedPorts, actualBlockedPorts);
+
+    for (int i : blockedPorts) {
+        err = blockPortForBind(i);
+        EXPECT_EQ(err, 0);
+    }
+    size_t actualBlockedPortsCount = 8;
+    in_port_t actualBlockedPorts[actualBlockedPortsCount];
+    err = getPortsBlockedForBind((in_port_t*) actualBlockedPorts, &actualBlockedPortsCount);
+    EXPECT_EQ(err, 0);
+    EXPECT_NE(actualBlockedPortsCount, 0);
+    for (int i=0; i < actualBlockedPortsCount; i++) {
+        EXPECT_EQ(blockedPorts[i], actualBlockedPorts[i]);
+    }
 
     // Remove the ports we added.
-    status = mService->unblockAllPortsForBind();
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
-    status = mService->getPortsBlockedForBind(&actualBlockedPorts);
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
-    EXPECT_TRUE(actualBlockedPorts.empty());
+    err = unblockAllPortsForBind();
+    EXPECT_EQ(err, 0);
+    err = getPortsBlockedForBind(actualBlockedPorts, &actualBlockedPortsCount);
+    EXPECT_EQ(err, 0);
+    EXPECT_EQ(actualBlockedPortsCount, 0);
 }
 
 TEST_F(ConnectivityNativeBinderTest, UnblockAllPorts) {
-    ndk::ScopedAStatus status;
-    std::vector<int> blockedPorts{1, 100, 1220, 1333, 2700, 5555, 5600, 65000};
+    int err;
+    in_port_t blockedPorts[8] = {1, 100, 1220, 1333, 2700, 5555, 5600, 65000};
 
-    if (mActualBlockedPorts.size() > 0) {
-        status = mService->unblockAllPortsForBind();
+    if (mActualBlockedPortsCount > 0) {
+        err = unblockAllPortsForBind();
     }
 
     for (int i : blockedPorts) {
-        status = mService->blockPortForBind(i);
-        EXPECT_TRUE(status.isOk()) << status.getDescription ();
+        err = blockPortForBind(i);
+        EXPECT_EQ(err, 0);
     }
 
-    std::vector<int32_t> actualBlockedPorts;
-    status = mService->getPortsBlockedForBind(&actualBlockedPorts);
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
-    EXPECT_FALSE(actualBlockedPorts.empty());
+    size_t actualBlockedPortsCount = 8;
+    in_port_t actualBlockedPorts[actualBlockedPortsCount];
+    err = getPortsBlockedForBind((in_port_t*) actualBlockedPorts, &actualBlockedPortsCount);
+    EXPECT_EQ(err, 0);
+    EXPECT_EQ(actualBlockedPortsCount, 8);
 
-    status = mService->unblockAllPortsForBind();
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
-    status = mService->getPortsBlockedForBind(&actualBlockedPorts);
-    EXPECT_TRUE(status.isOk()) << status.getDescription ();
-    EXPECT_TRUE(actualBlockedPorts.empty());
+    err = unblockAllPortsForBind();
+    EXPECT_EQ(err, 0);
+    err = getPortsBlockedForBind((in_port_t*) actualBlockedPorts, &actualBlockedPortsCount);
+    EXPECT_EQ(err, 0);
+    EXPECT_EQ(actualBlockedPortsCount, 0);
     // If mActualBlockedPorts is not empty, ports will be added back in teardown.
 }
 
-TEST_F(ConnectivityNativeBinderTest, BlockNegativePort) {
-    int retry = 0;
-    ndk::ScopedAStatus status;
-    do {
-        status = mService->blockPortForBind(-1);
-        // TODO: find out why transaction failed is being thrown on the first attempt.
-    } while (status.getExceptionCode() == EX_TRANSACTION_FAILED && retry++ < 5);
-    EXPECT_EQ(EX_ILLEGAL_ARGUMENT, status.getExceptionCode());
-}
-
-TEST_F(ConnectivityNativeBinderTest, UnblockNegativePort) {
-    int retry = 0;
-    ndk::ScopedAStatus status;
-    do {
-        status = mService->unblockPortForBind(-1);
-        // TODO: find out why transaction failed is being thrown on the first attempt.
-    } while (status.getExceptionCode() == EX_TRANSACTION_FAILED && retry++ < 5);
-    EXPECT_EQ(EX_ILLEGAL_ARGUMENT, status.getExceptionCode());
-}
-
-TEST_F(ConnectivityNativeBinderTest, BlockMaxPort) {
-    int retry = 0;
-    ndk::ScopedAStatus status;
-    do {
-        status = mService->blockPortForBind(65536);
-        // TODO: find out why transaction failed is being thrown on the first attempt.
-    } while (status.getExceptionCode() == EX_TRANSACTION_FAILED && retry++ < 5);
-    EXPECT_EQ(EX_ILLEGAL_ARGUMENT, status.getExceptionCode());
-}
-
-TEST_F(ConnectivityNativeBinderTest, UnblockMaxPort) {
-    int retry = 0;
-    ndk::ScopedAStatus status;
-    do {
-        status = mService->unblockPortForBind(65536);
-        // TODO: find out why transaction failed is being thrown on the first attempt.
-    } while (status.getExceptionCode() == EX_TRANSACTION_FAILED && retry++ < 5);
-    EXPECT_EQ(EX_ILLEGAL_ARGUMENT, status.getExceptionCode());
-}
-
 TEST_F(ConnectivityNativeBinderTest, CheckPermission) {
-    int retry = 0;
     int curUid = getuid();
     EXPECT_EQ(0, seteuid(FIRST_APPLICATION_UID + 2000)) << "seteuid failed: " << strerror(errno);
-    ndk::ScopedAStatus status;
-    do {
-        status = mService->blockPortForBind(5555);
-        // TODO: find out why transaction failed is being thrown on the first attempt.
-    } while (status.getExceptionCode() == EX_TRANSACTION_FAILED && retry++ < 5);
-    EXPECT_EQ(EX_SECURITY, status.getExceptionCode());
+    int err = blockPortForBind((in_port_t) 5555);
+    EXPECT_EQ(EPERM, err);
     EXPECT_EQ(0, seteuid(curUid)) << "seteuid failed: " << strerror(errno);
 }
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index 2d35330..083f34d 100755
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -3477,7 +3477,12 @@
             final int uid, final String packageName) throws Exception {
         doReturn(buildPackageInfo(true /* hasSystemPermission */, uid)).when(mPackageManager)
                 .getPackageInfo(eq(packageName), eq(GET_PERMISSIONS));
-        mService.mPermissionMonitor.onPackageAdded(packageName, uid);
+
+        // Send a broadcast indicating a package was installed.
+        final Intent addedIntent = new Intent(ACTION_PACKAGE_ADDED);
+        addedIntent.putExtra(Intent.EXTRA_UID, uid);
+        addedIntent.setData(Uri.parse("package:" + packageName));
+        processBroadcast(addedIntent);
     }
 
     @Test
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index a86eea4..e4e967c 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -289,6 +289,7 @@
         "base/android_runtime_jni_headers/Runtime_jni.h",
     ],
     tool_files: [
+        "base/android/jni_generator/android_jar.classes",
         "base/android/jni_generator/jni_generator.py",
         "build/android/gyp/util/__init__.py",
         "build/android/gyp/util/build_utils.py",
@@ -1229,6 +1230,7 @@
         "base/base_jni_headers/UnguessableToken_jni.h",
     ],
     tool_files: [
+        "base/android/jni_generator/android_jar.classes",
         "base/android/jni_generator/jni_generator.py",
         "build/android/gyp/util/__init__.py",
         "build/android/gyp/util/build_utils.py",
@@ -1391,405 +1393,6 @@
     ],
 }
 
-// GN: //base:jni_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_base_jni_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location build/android/build_java.build_config.json)\", \"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/base/jni_java.build_config.json " +
-         "--gn-target " +
-         "//base:jni_java " +
-         "--device-jar-path " +
-         "$(location base/jni_java.processed.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/base/jni_java.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location base/jni_java.processed.jar) " +
-         "--interface-jar-path " +
-         "$(location base/jni_java.turbine.jar) " +
-         "--dex-path " +
-         "obj/base/jni_java.dex.jar " +
-         "--supports-android " +
-         "--java-sources-file " +
-         "gen/base/jni_java.sources " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "base/jni_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //base:jni_java__compile_java
-genrule {
-    name: "cronet_aml_base_jni_java__compile_java",
-    srcs: [
-        "base/android/java/src/org/chromium/base/JniException.java",
-        "base/android/java/src/org/chromium/base/JniStaticTestMocker.java",
-        "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java",
-        "base/android/java/src/org/chromium/base/annotations/AccessedByNative.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNative.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNativeForTesting.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java",
-        "base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java",
-        "base/android/java/src/org/chromium/base/annotations/JNINamespace.java",
-        "base/android/java/src/org/chromium/base/annotations/JniIgnoreNatives.java",
-        "base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java",
-        "base/android/java/src/org/chromium/base/annotations/NativeMethods.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/base/jni_java__compile_java.d " +
-         "--generated-dir " +
-         "gen/base/jni_java/generated_java " +
-         "--jar-path " +
-         "obj/base/jni_java.processed.jar " +
-         "--java-srcjars " +
-         "[\"gen/base/jni_java.generated.srcjar\"] " +
-         "--target-name " +
-         "//base:jni_java__compile_java " +
-         "--header-jar " +
-         "obj/base/jni_java.turbine.jar " +
-         "--classpath " +
-         "[\"obj/base/jni_java.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/base/jni_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "@gen/base/jni_java.sources",
-    out: [
-        "//out/test/obj/base/jni_java.processed.jar",
-        "//out/test/obj/base/jni_java.processed.jar.info",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/base/jni_java.build_config.json",
-        "out/test/gen/base/jni_java.generated.srcjar",
-        "out/test/gen/base/jni_java.sources",
-        "out/test/obj/base/jni_java.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //base:jni_java__dex
-genrule {
-    name: "cronet_aml_base_jni_java__dex",
-    cmd: "$(location build/android/gyp/dex.py) --depfile " +
-         "gen/base/jni_java__dex.d " +
-         "--output " +
-         "obj/base/jni_java.dex.jar " +
-         "--min-api " +
-         "19 " +
-         "--r8-jar-path " +
-         "../../third_party/r8/lib/r8.jar " +
-         "--custom-d8-jar-path " +
-         "../../third_party/r8/custom_d8.jar " +
-         "--incremental-dir " +
-         "obj/base/jni_java__dex " +
-         "--library " +
-         "--class-inputs " +
-         "[\"obj/base/jni_java.processed.jar\"] " +
-         "--desugar " +
-         "--desugar-jdk-libs-json " +
-         "../../third_party/r8/desugar_jdk_libs.json " +
-         "--show-desugar-default-interface-warnings " +
-         "--classpath " +
-         "obj/base/jni_java.processed.jar " +
-         "--desugar-dependencies " +
-         "gen/base/jni_java__dex.desugardeps " +
-         "--bootclasspath " +
-         "@FileArg(gen/base/jni_java.build_config.json:android:sdk_jars) " +
-         "--classpath " +
-         "@FileArg(gen/base/jni_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--force-enable-assertions",
-    out: [
-        "//out/test/obj/base/jni_java.dex.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/dex.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/zipalign.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/obj/base/jni_java.processed.jar",
-        "third_party/r8/custom_d8.jar",
-        "third_party/r8/d8/lib/r8.jar",
-        "third_party/r8/desugar_jdk_libs.json",
-    ],
-}
-
-// GN: //base:jni_java__errorprone
-genrule {
-    name: "cronet_aml_base_jni_java__errorprone",
-    srcs: [
-        "base/android/java/src/org/chromium/base/JniException.java",
-        "base/android/java/src/org/chromium/base/JniStaticTestMocker.java",
-        "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java",
-        "base/android/java/src/org/chromium/base/annotations/AccessedByNative.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNative.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNativeForTesting.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java",
-        "base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java",
-        "base/android/java/src/org/chromium/base/annotations/JNINamespace.java",
-        "base/android/java/src/org/chromium/base/annotations/JniIgnoreNatives.java",
-        "base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java",
-        "base/android/java/src/org/chromium/base/annotations/NativeMethods.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/base/jni_java__errorprone.d " +
-         "--generated-dir " +
-         "gen/base/jni_java/generated_java " +
-         "--jar-path " +
-         "obj/base/jni_java__errorprone.errorprone.stamp " +
-         "--java-srcjars " +
-         "[\"gen/base/jni_java.generated.srcjar\"] " +
-         "--target-name " +
-         "//base:jni_java__errorprone " +
-         "--header-jar " +
-         "obj/base/jni_java.turbine.jar " +
-         "--classpath " +
-         "[\"obj/base/jni_java.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/base/jni_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "--processorpath " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:deps_info:host_classpath) " +
-         "--enable-errorprone " +
-         "@gen/base/jni_java.sources",
-    out: [
-        "//out/test/obj/base/jni_java__errorprone.errorprone.stamp",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/base/jni_java.build_config.json",
-        "out/test/gen/base/jni_java.generated.srcjar",
-        "out/test/gen/base/jni_java.sources",
-        "out/test/obj/base/jni_java.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //base:jni_java__header
-genrule {
-    name: "cronet_aml_base_jni_java__header",
-    srcs: [
-        "base/android/java/src/org/chromium/base/JniException.java",
-        "base/android/java/src/org/chromium/base/JniStaticTestMocker.java",
-        "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java",
-        "base/android/java/src/org/chromium/base/annotations/AccessedByNative.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNative.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNativeForTesting.java",
-        "base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java",
-        "base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java",
-        "base/android/java/src/org/chromium/base/annotations/JNINamespace.java",
-        "base/android/java/src/org/chromium/base/annotations/JniIgnoreNatives.java",
-        "base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java",
-        "base/android/java/src/org/chromium/base/annotations/NativeMethods.java",
-    ],
-    cmd: "$(location build/android/gyp/turbine.py) --depfile " +
-         "gen/base/jni_java__header.d " +
-         "--generated-dir " +
-         "gen/base/jni_java/generated_java " +
-         "--jar-path " +
-         "obj/base/jni_java.turbine.jar " +
-         "--java-srcjars " +
-         "[] " +
-         "--target-name " +
-         "//base:jni_java__header " +
-         "--classpath " +
-         "@FileArg(gen/base/jni_java.build_config.json:javac:interface_classpath) " +
-         "--processorpath " +
-         "@FileArg(gen/base/jni_java.build_config.json:javac:processor_classpath) " +
-         "--processors " +
-         "@FileArg(gen/base/jni_java.build_config.json:javac:processor_classes) " +
-         "--turbine-jar-path " +
-         "../../third_party/turbine/turbine.jar " +
-         "--generated-jar-path " +
-         "gen/base/jni_java.generated.srcjar " +
-         "--chromium-code " +
-         "1 " +
-         "@gen/base/jni_java.sources",
-    out: [
-        "//out/test/obj/base/jni_java.turbine.jar",
-        "base/jni_java.generated.srcjar",
-    ],
-    tool_files: [
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/turbine.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "out/test/gen/base/jni_java.build_config.json",
-        "out/test/gen/base/jni_java.sources",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "third_party/turbine/turbine.jar",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //base:jni_java__host
-genrule {
-    name: "cronet_aml_base_jni_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "obj/base/jni_java.processed.jar " +
-         "--output " +
-         "lib.java/base/jni_java.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/base/jni_java.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/obj/base/jni_java.processed.jar",
-    ],
-}
-
-// GN: //base:jni_java__validate
-genrule {
-    name: "cronet_aml_base_jni_java__validate",
-    cmd: "$(location build/android/gyp/bytecode_processor.py) --target-name " +
-         "//base:jni_java__validate " +
-         "--script " +
-         "bin/helper/bytecode_processor " +
-         "--gn-target " +
-         "//base:jni_java " +
-         "--input-jar " +
-         "obj/base/jni_java.processed.jar " +
-         "--stamp " +
-         "obj/base/jni_java__validate.bytecode.stamp " +
-         "--direct-classpath-jars " +
-         "@FileArg(gen/base/jni_java.build_config.json:javac:classpath) " +
-         "--full-classpath-jars " +
-         "@FileArg(gen/base/jni_java.build_config.json:deps_info:javac_full_classpath) " +
-         "--full-classpath-gn-targets " +
-         "@FileArg(gen/base/jni_java.build_config.json:deps_info:javac_full_classpath_targets)",
-    out: [
-        "//out/test/obj/base/jni_java__validate.bytecode.stamp",
-    ],
-    tool_files: [
-        "build/android/gyp/bytecode_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/gn_helpers.py",
-        "out/test/bin/helper/bytecode_processor",
-        "out/test/gen/base/jni_java.build_config.json",
-        "out/test/obj/base/jni_java.processed.jar",
-    ],
-}
-
 // GN: //base:logging_buildflags
 genrule {
     name: "cronet_aml_base_logging_buildflags",
@@ -2052,834 +1655,6 @@
     ],
 }
 
-// GN: //build/android:build_config_gen
-genrule {
-    name: "cronet_aml_build_android_build_config_gen",
-    tools: [
-        "soong_zip",
-    ],
-    cmd: "echo " +
-         "\"package org.chromium.build;\n " +
-         "public class BuildConfig {\n " +
-         "public static boolean IS_MULTIDEX_ENABLED ;\n " +
-         "public static boolean ENABLE_ASSERTS = true;\n " +
-         "public static boolean IS_UBSAN ;\n " +
-         "public static boolean IS_CHROME_BRANDED ;\n " +
-         "public static int R_STRING_PRODUCT_VERSION ;\n " +
-         "public static int MIN_SDK_VERSION = 1;\n " +
-         "public static boolean BUNDLES_SUPPORTED ;\n " +
-         "public static boolean IS_INCREMENTAL_INSTALL ;\n " +
-         "public static boolean ISOLATED_SPLITS_ENABLED ;\n " +
-         "public static boolean IS_FOR_TEST ;\n " +
-         "}\n\" " +
-         "> $(genDir)/BuildConfig.java && " +
-         "$(location soong_zip) -o $(out) -srcjar -f $(genDir)/BuildConfig.java",
-    out: [
-        "build/android/build_config_gen.srcjar",
-    ],
-}
-
-// GN: //build/android:build_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_build_android_build_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/build/android/build_java.build_config.json " +
-         "--gn-target " +
-         "//build/android:build_java " +
-         "--device-jar-path " +
-         "$(location build/android/build_java.processed.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/build/android/build_java.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location build/android/build_java.javac.jar) " +
-         "--interface-jar-path " +
-         "$(location build/android/build_java.turbine.jar) " +
-         "--dex-path " +
-         "obj/build/android/build_java.dex.jar " +
-         "--supports-android " +
-         "--java-sources-file " +
-         "gen/build/android/build_java.sources " +
-         "--bundled-srcjars " +
-         "[\"$(location build/android/build_config_gen.srcjar)\", \"$(location build/android/native_libraries_gen.srcjar)\"] " +
-         "--proguard-configs " +
-         "[$(location build/android/chromium_annotations.flags)]",
-    out: [
-        "build/android/build_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/chromium_annotations.flags",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //build/android:build_java__compile_java
-genrule {
-    name: "cronet_aml_build_android_build_java__compile_java",
-    srcs: [
-        "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java",
-        "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
-        "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java",
-        "build/android/java/src/org/chromium/build/annotations/DoNotInline.java",
-        "build/android/java/src/org/chromium/build/annotations/IdentifierNameString.java",
-        "build/android/java/src/org/chromium/build/annotations/MainDex.java",
-        "build/android/java/src/org/chromium/build/annotations/MockedInTests.java",
-        "build/android/java/src/org/chromium/build/annotations/UsedByReflection.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/build/android/build_java__compile_java.d " +
-         "--generated-dir " +
-         "gen/build/android/build_java/generated_java " +
-         "--jar-path " +
-         "obj/build/android/build_java.javac.jar " +
-         "--java-srcjars " +
-         "[\"gen/build/android/build_config_gen.srcjar\", \"gen/build/android/native_libraries_gen.srcjar\", \"gen/build/android/build_java.generated.srcjar\"] " +
-         "--target-name " +
-         "//build/android:build_java__compile_java " +
-         "--header-jar " +
-         "obj/build/android/build_java.turbine.jar " +
-         "--classpath " +
-         "[\"obj/build/android/build_java.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/build/android/build_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "--jar-info-exclude-globs " +
-         "[\"*/build/BuildConfig.class\", \"*/NativeLibraries.class\"] " +
-         "@gen/build/android/build_java.sources",
-    out: [
-        "//out/test/obj/build/android/build_java.javac.jar",
-        "//out/test/obj/build/android/build_java.javac.jar.info",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/build/android/build_config_gen.srcjar",
-        "out/test/gen/build/android/build_java.build_config.json",
-        "out/test/gen/build/android/build_java.generated.srcjar",
-        "out/test/gen/build/android/build_java.sources",
-        "out/test/gen/build/android/native_libraries_gen.srcjar",
-        "out/test/obj/build/android/build_java.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //build/android:build_java__dex
-genrule {
-    name: "cronet_aml_build_android_build_java__dex",
-    cmd: "$(location build/android/gyp/dex.py) --depfile " +
-         "gen/build/android/build_java__dex.d " +
-         "--output " +
-         "obj/build/android/build_java.dex.jar " +
-         "--min-api " +
-         "19 " +
-         "--r8-jar-path " +
-         "../../third_party/r8/lib/r8.jar " +
-         "--custom-d8-jar-path " +
-         "../../third_party/r8/custom_d8.jar " +
-         "--incremental-dir " +
-         "obj/build/android/build_java__dex " +
-         "--library " +
-         "--class-inputs " +
-         "[\"obj/build/android/build_java.processed.jar\"] " +
-         "--desugar " +
-         "--desugar-jdk-libs-json " +
-         "../../third_party/r8/desugar_jdk_libs.json " +
-         "--show-desugar-default-interface-warnings " +
-         "--classpath " +
-         "obj/build/android/build_java.javac.jar " +
-         "--desugar-dependencies " +
-         "gen/build/android/build_java__dex.desugardeps " +
-         "--bootclasspath " +
-         "@FileArg(gen/build/android/build_java.build_config.json:android:sdk_jars) " +
-         "--classpath " +
-         "@FileArg(gen/build/android/build_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--force-enable-assertions",
-    out: [
-        "//out/test/obj/build/android/build_java.dex.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/dex.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/zipalign.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/obj/build/android/build_java.javac.jar",
-        "out/test/obj/build/android/build_java.processed.jar",
-        "third_party/r8/custom_d8.jar",
-        "third_party/r8/d8/lib/r8.jar",
-        "third_party/r8/desugar_jdk_libs.json",
-    ],
-}
-
-// GN: //build/android:build_java__errorprone
-genrule {
-    name: "cronet_aml_build_android_build_java__errorprone",
-    srcs: [
-        "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java",
-        "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
-        "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java",
-        "build/android/java/src/org/chromium/build/annotations/DoNotInline.java",
-        "build/android/java/src/org/chromium/build/annotations/IdentifierNameString.java",
-        "build/android/java/src/org/chromium/build/annotations/MainDex.java",
-        "build/android/java/src/org/chromium/build/annotations/MockedInTests.java",
-        "build/android/java/src/org/chromium/build/annotations/UsedByReflection.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/build/android/build_java__errorprone.d " +
-         "--generated-dir " +
-         "gen/build/android/build_java/generated_java " +
-         "--jar-path " +
-         "obj/build/android/build_java__errorprone.errorprone.stamp " +
-         "--java-srcjars " +
-         "[\"gen/build/android/build_java.generated.srcjar\"] " +
-         "--target-name " +
-         "//build/android:build_java__errorprone " +
-         "--header-jar " +
-         "obj/build/android/build_java.turbine.jar " +
-         "--classpath " +
-         "[\"obj/build/android/build_java.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/build/android/build_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "--jar-info-exclude-globs " +
-         "[\"*/build/BuildConfig.class\", \"*/NativeLibraries.class\"] " +
-         "--processorpath " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:deps_info:host_classpath) " +
-         "--enable-errorprone " +
-         "@gen/build/android/build_java.sources",
-    out: [
-        "//out/test/obj/build/android/build_java__errorprone.errorprone.stamp",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/build/android/build_java.build_config.json",
-        "out/test/gen/build/android/build_java.generated.srcjar",
-        "out/test/gen/build/android/build_java.sources",
-        "out/test/obj/build/android/build_java.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //build/android:build_java__header
-genrule {
-    name: "cronet_aml_build_android_build_java__header",
-    srcs: [
-        "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java",
-        "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
-        "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java",
-        "build/android/java/src/org/chromium/build/annotations/DoNotInline.java",
-        "build/android/java/src/org/chromium/build/annotations/IdentifierNameString.java",
-        "build/android/java/src/org/chromium/build/annotations/MainDex.java",
-        "build/android/java/src/org/chromium/build/annotations/MockedInTests.java",
-        "build/android/java/src/org/chromium/build/annotations/UsedByReflection.java",
-    ],
-    cmd: "$(location build/android/gyp/turbine.py) --depfile " +
-         "gen/build/android/build_java__header.d " +
-         "--generated-dir " +
-         "gen/build/android/build_java/generated_java " +
-         "--jar-path " +
-         "obj/build/android/build_java.turbine.jar " +
-         "--java-srcjars " +
-         "[\"gen/build/android/build_config_gen.srcjar\", \"gen/build/android/native_libraries_gen.srcjar\"] " +
-         "--target-name " +
-         "//build/android:build_java__header " +
-         "--classpath " +
-         "@FileArg(gen/build/android/build_java.build_config.json:javac:interface_classpath) " +
-         "--processorpath " +
-         "@FileArg(gen/build/android/build_java.build_config.json:javac:processor_classpath) " +
-         "--processors " +
-         "@FileArg(gen/build/android/build_java.build_config.json:javac:processor_classes) " +
-         "--turbine-jar-path " +
-         "../../third_party/turbine/turbine.jar " +
-         "--generated-jar-path " +
-         "gen/build/android/build_java.generated.srcjar " +
-         "--chromium-code " +
-         "1 " +
-         "--jar-info-exclude-globs " +
-         "[\"*/build/BuildConfig.class\", \"*/NativeLibraries.class\"] " +
-         "@gen/build/android/build_java.sources",
-    out: [
-        "//out/test/obj/build/android/build_java.turbine.jar",
-        "build/android/build_java.generated.srcjar",
-    ],
-    tool_files: [
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/turbine.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "out/test/gen/build/android/build_config_gen.srcjar",
-        "out/test/gen/build/android/build_java.build_config.json",
-        "out/test/gen/build/android/build_java.sources",
-        "out/test/gen/build/android/native_libraries_gen.srcjar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "third_party/turbine/turbine.jar",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //build/android:build_java__host
-genrule {
-    name: "cronet_aml_build_android_build_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "obj/build/android/build_java.javac.jar " +
-         "--output " +
-         "lib.java/build/android/build_java.jar " +
-         "--exclude-globs " +
-         "[\"*/build/BuildConfig.class\", \"*/NativeLibraries.class\"] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/build/android/build_java.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/obj/build/android/build_java.javac.jar",
-    ],
-}
-
-// GN: //build/android:build_java__process_device
-genrule {
-    name: "cronet_aml_build_android_build_java__process_device",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "obj/build/android/build_java.javac.jar " +
-         "--output " +
-         "obj/build/android/build_java.processed.jar " +
-         "--exclude-globs " +
-         "[\"*/build/BuildConfig.class\", \"*/NativeLibraries.class\"] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/obj/build/android/build_java.processed.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/obj/build/android/build_java.javac.jar",
-    ],
-}
-
-// GN: //build/android:build_java__validate
-genrule {
-    name: "cronet_aml_build_android_build_java__validate",
-    cmd: "$(location build/android/gyp/bytecode_processor.py) --target-name " +
-         "//build/android:build_java__validate " +
-         "--script " +
-         "bin/helper/bytecode_processor " +
-         "--gn-target " +
-         "//build/android:build_java " +
-         "--input-jar " +
-         "obj/build/android/build_java.javac.jar " +
-         "--stamp " +
-         "obj/build/android/build_java__validate.bytecode.stamp " +
-         "--direct-classpath-jars " +
-         "@FileArg(gen/build/android/build_java.build_config.json:javac:classpath) " +
-         "--full-classpath-jars " +
-         "@FileArg(gen/build/android/build_java.build_config.json:deps_info:javac_full_classpath) " +
-         "--full-classpath-gn-targets " +
-         "@FileArg(gen/build/android/build_java.build_config.json:deps_info:javac_full_classpath_targets)",
-    out: [
-        "//out/test/obj/build/android/build_java__validate.bytecode.stamp",
-    ],
-    tool_files: [
-        "build/android/gyp/bytecode_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/gn_helpers.py",
-        "out/test/bin/helper/bytecode_processor",
-        "out/test/gen/build/android/build_java.build_config.json",
-        "out/test/obj/build/android/build_java.javac.jar",
-    ],
-}
-
-// GN: //build/android/bytecode:bytecode_processor__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_build_android_bytecode_bytecode_processor__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_binary " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location build/android/bytecode/bytecode_processor_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/build/android/bytecode/bytecode_processor.build_config.json " +
-         "--gn-target " +
-         "//build/android/bytecode:bytecode_processor " +
-         "--bundled-srcjars " +
-         "[] " +
-         "--main-class " +
-         "org.chromium.bytecode.ByteCodeProcessor",
-    out: [
-        "build/android/bytecode/bytecode_processor.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //build/android/bytecode:bytecode_processor__java_binary_script
-genrule {
-    name: "cronet_aml_build_android_bytecode_bytecode_processor__java_binary_script",
-    cmd: "$(location build/android/gyp/create_java_binary_script.py) --output " +
-         "bin/helper/bytecode_processor " +
-         "--main-class " +
-         "org.chromium.bytecode.ByteCodeProcessor " +
-         "--classpath " +
-         "@FileArg(gen/build/android/bytecode/bytecode_processor.build_config.json:deps_info:host_classpath) " +
-         "--noverify",
-    out: [
-        "//out/test/bin/helper/bytecode_processor",
-    ],
-    tool_files: [
-        "build/android/gyp/create_java_binary_script.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/gen/build/android/bytecode/bytecode_processor.build_config.json",
-    ],
-}
-
-// GN: //build/android/bytecode:bytecode_processor_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_build_android_bytecode_bytecode_processor_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/org_ow2_asm_asm_java.build_config.json)\", \"$(location third_party/android_deps/org_ow2_asm_asm_util_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/build/android/bytecode/bytecode_processor_java.build_config.json " +
-         "--gn-target " +
-         "//build/android/bytecode:bytecode_processor_java " +
-         "--host-jar-path " +
-         "$(location lib.java/build/android/bytecode/bytecode_processor_java.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location build/android/bytecode/bytecode_processor_java.javac.jar) " +
-         "--interface-jar-path " +
-         "$(location build/android/bytecode/bytecode_processor_java.turbine.jar) " +
-         "--java-sources-file " +
-         "gen/build/android/bytecode/bytecode_processor_java.sources " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "build/android/bytecode/bytecode_processor_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //build/android/bytecode:bytecode_processor_java__compile_java
-genrule {
-    name: "cronet_aml_build_android_bytecode_bytecode_processor_java__compile_java",
-    srcs: [
-        "build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java",
-        "build/android/bytecode/java/org/chromium/bytecode/ClassPathValidator.java",
-        "build/android/bytecode/java/org/chromium/bytecode/TypeUtils.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/build/android/bytecode/bytecode_processor_java__compile_java.d " +
-         "--generated-dir " +
-         "gen/build/android/bytecode/bytecode_processor_java/generated_java " +
-         "--jar-path " +
-         "obj/build/android/bytecode/bytecode_processor_java.javac.jar " +
-         "--java-srcjars " +
-         "[\"gen/build/android/bytecode/bytecode_processor_java.generated.srcjar\"] " +
-         "--target-name " +
-         "//build/android/bytecode:bytecode_processor_java__compile_java " +
-         "--header-jar " +
-         "obj/build/android/bytecode/bytecode_processor_java.turbine.jar " +
-         "--classpath " +
-         "[\"obj/build/android/bytecode/bytecode_processor_java.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/build/android/bytecode/bytecode_processor_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "@gen/build/android/bytecode/bytecode_processor_java.sources",
-    out: [
-        "//out/test/obj/build/android/bytecode/bytecode_processor_java.javac.jar",
-        "//out/test/obj/build/android/bytecode/bytecode_processor_java.javac.jar.info",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/build/android/bytecode/bytecode_processor_java.build_config.json",
-        "out/test/gen/build/android/bytecode/bytecode_processor_java.generated.srcjar",
-        "out/test/gen/build/android/bytecode/bytecode_processor_java.sources",
-        "out/test/obj/build/android/bytecode/bytecode_processor_java.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //build/android/bytecode:bytecode_processor_java__errorprone
-genrule {
-    name: "cronet_aml_build_android_bytecode_bytecode_processor_java__errorprone",
-    srcs: [
-        "build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java",
-        "build/android/bytecode/java/org/chromium/bytecode/ClassPathValidator.java",
-        "build/android/bytecode/java/org/chromium/bytecode/TypeUtils.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/build/android/bytecode/bytecode_processor_java__errorprone.d " +
-         "--generated-dir " +
-         "gen/build/android/bytecode/bytecode_processor_java/generated_java " +
-         "--jar-path " +
-         "obj/build/android/bytecode/bytecode_processor_java__errorprone.errorprone.stamp " +
-         "--java-srcjars " +
-         "[\"gen/build/android/bytecode/bytecode_processor_java.generated.srcjar\"] " +
-         "--target-name " +
-         "//build/android/bytecode:bytecode_processor_java__errorprone " +
-         "--header-jar " +
-         "obj/build/android/bytecode/bytecode_processor_java.turbine.jar " +
-         "--classpath " +
-         "[\"obj/build/android/bytecode/bytecode_processor_java.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/build/android/bytecode/bytecode_processor_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "--processorpath " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:deps_info:host_classpath) " +
-         "--enable-errorprone " +
-         "@gen/build/android/bytecode/bytecode_processor_java.sources",
-    out: [
-        "//out/test/obj/build/android/bytecode/bytecode_processor_java__errorprone.errorprone.stamp",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/build/android/bytecode/bytecode_processor_java.build_config.json",
-        "out/test/gen/build/android/bytecode/bytecode_processor_java.generated.srcjar",
-        "out/test/gen/build/android/bytecode/bytecode_processor_java.sources",
-        "out/test/obj/build/android/bytecode/bytecode_processor_java.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //build/android/bytecode:bytecode_processor_java__header
-genrule {
-    name: "cronet_aml_build_android_bytecode_bytecode_processor_java__header",
-    srcs: [
-        "build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java",
-        "build/android/bytecode/java/org/chromium/bytecode/ClassPathValidator.java",
-        "build/android/bytecode/java/org/chromium/bytecode/TypeUtils.java",
-    ],
-    cmd: "$(location build/android/gyp/turbine.py) --depfile " +
-         "gen/build/android/bytecode/bytecode_processor_java__header.d " +
-         "--generated-dir " +
-         "gen/build/android/bytecode/bytecode_processor_java/generated_java " +
-         "--jar-path " +
-         "obj/build/android/bytecode/bytecode_processor_java.turbine.jar " +
-         "--java-srcjars " +
-         "[] " +
-         "--target-name " +
-         "//build/android/bytecode:bytecode_processor_java__header " +
-         "--classpath " +
-         "@FileArg(gen/build/android/bytecode/bytecode_processor_java.build_config.json:javac:interface_classpath) " +
-         "--processorpath " +
-         "@FileArg(gen/build/android/bytecode/bytecode_processor_java.build_config.json:javac:processor_classpath) " +
-         "--processors " +
-         "@FileArg(gen/build/android/bytecode/bytecode_processor_java.build_config.json:javac:processor_classes) " +
-         "--turbine-jar-path " +
-         "../../third_party/turbine/turbine.jar " +
-         "--generated-jar-path " +
-         "gen/build/android/bytecode/bytecode_processor_java.generated.srcjar " +
-         "--chromium-code " +
-         "1 " +
-         "@gen/build/android/bytecode/bytecode_processor_java.sources",
-    out: [
-        "//out/test/obj/build/android/bytecode/bytecode_processor_java.turbine.jar",
-        "build/android/bytecode/bytecode_processor_java.generated.srcjar",
-    ],
-    tool_files: [
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/turbine.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "out/test/gen/build/android/bytecode/bytecode_processor_java.build_config.json",
-        "out/test/gen/build/android/bytecode/bytecode_processor_java.sources",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "third_party/turbine/turbine.jar",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //build/android/bytecode:bytecode_processor_java__host
-genrule {
-    name: "cronet_aml_build_android_bytecode_bytecode_processor_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "obj/build/android/bytecode/bytecode_processor_java.javac.jar " +
-         "--output " +
-         "lib.java/build/android/bytecode/bytecode_processor_java.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/build/android/bytecode/bytecode_processor_java.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/obj/build/android/bytecode/bytecode_processor_java.javac.jar",
-    ],
-}
-
-// GN: //build/android:native_libraries_gen
-genrule {
-    name: "cronet_aml_build_android_native_libraries_gen",
-    cmd: "$(location build/android/gyp/write_native_libraries_java.py) --output " +
-         "$(out) " +
-         "--cpu-family " +
-         "CPU_FAMILY_X86",
-    out: [
-        "build/android/native_libraries_gen.srcjar",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/write_native_libraries_java.py",
-        "build/gn_helpers.py",
-    ],
-}
-
 // GN: //build:branding_buildflags
 genrule {
     name: "cronet_aml_build_branding_buildflags",
@@ -3088,6 +1863,34 @@
     name: "cronet_aml_ipc_param_traits",
 }
 
+// GN: //gn:java
+java_library {
+    name: "cronet_aml_java",
+    srcs: [
+        "base/android/java/src/org/chromium/base/JniException.java",
+        "base/android/java/src/org/chromium/base/JniStaticTestMocker.java",
+        "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java",
+        "base/android/java/src/org/chromium/base/annotations/AccessedByNative.java",
+        "base/android/java/src/org/chromium/base/annotations/CalledByNative.java",
+        "base/android/java/src/org/chromium/base/annotations/CalledByNativeForTesting.java",
+        "base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java",
+        "base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java",
+        "base/android/java/src/org/chromium/base/annotations/JNINamespace.java",
+        "base/android/java/src/org/chromium/base/annotations/JniIgnoreNatives.java",
+        "base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java",
+        "base/android/java/src/org/chromium/base/annotations/NativeMethods.java",
+        "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java",
+        "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
+        "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java",
+        "build/android/java/src/org/chromium/build/annotations/DoNotInline.java",
+        "build/android/java/src/org/chromium/build/annotations/IdentifierNameString.java",
+        "build/android/java/src/org/chromium/build/annotations/MainDex.java",
+        "build/android/java/src/org/chromium/build/annotations/MockedInTests.java",
+        "build/android/java/src/org/chromium/build/annotations/UsedByReflection.java",
+        "url/android/java/src/org/chromium/url/IDNStringUtil.java",
+    ],
+}
+
 // GN: //net/base/registry_controlled_domains:registry_controlled_domains
 genrule {
     name: "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains",
@@ -3160,54 +1963,6 @@
 }
 
 // GN: //net/cert:root_store_proto_full
-cc_library_static {
-    name: "cronet_aml_net_cert_root_store_proto_full",
-    srcs: [
-        "out/test/clang_x64/gen/net/cert/root_store_proto_full/root_store.pb.cc",
-    ],
-    static_libs: [
-        "cronet_aml_third_party_protobuf_protobuf_full",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
-        "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
-        "-DCR_SYSROOT_KEY=20220331T153654Z-0",
-        "-DDCHECK_ALWAYS_ON=1",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
-        "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
-        "-DGOOGLE_PROTOBUF_NO_RTTI",
-        "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
-        "-DHAVE_PTHREAD",
-        "-DUSE_AURA=1",
-        "-DUSE_OZONE=1",
-        "-DUSE_UDEV",
-        "-D_DEBUG",
-        "-D_FILE_OFFSET_BITS=64",
-        "-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",
-        "-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/protobuf/src/",
-        "build/linux/debian_bullseye_amd64-sysroot/usr/include",
-    ],
-    cpp_std: "c++20",
-}
-
-// GN: //net/cert:root_store_proto_full_gen
 genrule {
     name: "cronet_aml_net_cert_root_store_proto_full_gen",
     srcs: [
@@ -3216,22 +1971,28 @@
     tools: [
         "aprotoc",
     ],
-    cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) root_store.proto " +
-         "--protoc " +
-         "$(location aprotoc) " +
-         "--proto-in-dir " +
-         "`dirname $(location net/cert/root_store.proto)` " +
-         "--cc-out-dir " +
-         "clang_x64/gen/net/cert/root_store_proto_full/ " +
-         "--py-out-dir " +
-         "$(genDir)/clang_x64/pyproto/net/cert/root_store_proto_full/",
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
     out: [
-        "clang_x64/pyproto/net/cert/root_store_proto_full/root_store_pb2.py",
-        "net/cert/root_store_proto_full/root_store.pb.cc",
-        "net/cert/root_store_proto_full/root_store.pb.h",
+        "external/chromium_org/net/cert/root_store.pb.cc",
     ],
-    tool_files: [
-        "tools/protoc_wrapper/protoc_wrapper.py",
+}
+
+// GN: //net/cert:root_store_proto_full
+genrule {
+    name: "cronet_aml_net_cert_root_store_proto_full_gen_headers",
+    srcs: [
+        "net/cert/root_store.proto",
+    ],
+    tools: [
+        "aprotoc",
+    ],
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
+    out: [
+        "external/chromium_org/net/cert/root_store.pb.h",
+    ],
+    export_include_dirs: [
+        ".",
+        "protos",
     ],
 }
 
@@ -3371,53 +2132,6 @@
 }
 
 // GN: //net:isolation_info_proto
-cc_library_static {
-    name: "cronet_aml_net_isolation_info_proto",
-    srcs: [
-        "out/test/gen/net/base/isolation_info.pb.cc",
-    ],
-    shared_libs: [
-        "liblog",
-    ],
-    static_libs: [
-        "cronet_aml_third_party_protobuf_protobuf_lite",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DANDROID",
-        "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
-        "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
-        "-DDCHECK_ALWAYS_ON=1",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
-        "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
-        "-DGOOGLE_PROTOBUF_NO_RTTI",
-        "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
-        "-DHAVE_PTHREAD",
-        "-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",
-    ],
-    local_include_dirs: [
-        "./",
-        "buildtools/third_party/libc++/",
-        "buildtools/third_party/libc++/trunk/include",
-        "buildtools/third_party/libc++abi/trunk/include",
-        "third_party/protobuf/src/",
-        "third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
-    ],
-    cpp_std: "c++20",
-}
-
-// GN: //net:isolation_info_proto_gen
 genrule {
     name: "cronet_aml_net_isolation_info_proto_gen",
     srcs: [
@@ -3426,22 +2140,28 @@
     tools: [
         "aprotoc",
     ],
-    cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) isolation_info.proto " +
-         "--protoc " +
-         "$(location aprotoc) " +
-         "--proto-in-dir " +
-         "`dirname $(location net/base/isolation_info.proto)` " +
-         "--cc-out-dir " +
-         "$(genDir)/net/base " +
-         "--py-out-dir " +
-         "$(genDir)/pyproto/net/base",
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
     out: [
-        "net/base/isolation_info.pb.cc",
-        "net/base/isolation_info.pb.h",
-        "pyproto/net/base/isolation_info_pb2.py",
+        "external/chromium_org/net/base/isolation_info.pb.cc",
     ],
-    tool_files: [
-        "tools/protoc_wrapper/protoc_wrapper.py",
+}
+
+// GN: //net:isolation_info_proto
+genrule {
+    name: "cronet_aml_net_isolation_info_proto_gen_headers",
+    srcs: [
+        "net/base/isolation_info.proto",
+    ],
+    tools: [
+        "aprotoc",
+    ],
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
+    out: [
+        "external/chromium_org/net/base/isolation_info.pb.h",
+    ],
+    export_include_dirs: [
+        ".",
+        "protos",
     ],
 }
 
@@ -3457,10 +2177,13 @@
         ":cronet_aml_net_dns_mdns_client",
         ":cronet_aml_net_dns_public_public",
         ":cronet_aml_net_http_transport_security_state_generated_files",
+        ":cronet_aml_net_isolation_info_proto_gen",
         ":cronet_aml_net_net_deps",
         ":cronet_aml_net_net_export_header",
+        ":cronet_aml_net_net_nqe_proto_gen",
         ":cronet_aml_net_net_public_deps",
         ":cronet_aml_net_net_resources",
+        ":cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen",
         ":cronet_aml_net_traffic_annotation_traffic_annotation",
         "net/android/android_http_util.cc",
         "net/android/cert_verify_result_android.cc",
@@ -3949,15 +2672,13 @@
     shared_libs: [
         "libandroid",
         "liblog",
+        "libprotobuf-cpp-lite",
     ],
     static_libs: [
         "cronet_aml_base_base",
         "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations",
         "cronet_aml_crypto_crypto",
-        "cronet_aml_net_isolation_info_proto",
-        "cronet_aml_net_net_nqe_proto",
         "cronet_aml_net_preload_decoder",
-        "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto",
         "cronet_aml_net_third_party_quiche_quiche",
         "cronet_aml_net_uri_template",
         "cronet_aml_third_party_boringssl_boringssl",
@@ -3973,7 +2694,10 @@
         "cronet_aml_build_chromeos_buildflags",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_ios_cronet_buildflags",
+        "cronet_aml_net_isolation_info_proto_gen_headers",
         "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_nqe_proto_gen_headers",
+        "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_tools_grit_grit_sources",
         "cronet_aml_tools_gritsettings_default_resource_ids",
         "cronet_aml_url_buildflags",
@@ -3985,7 +2709,10 @@
         "cronet_aml_build_chromeos_buildflags",
         "cronet_aml_net_buildflags",
         "cronet_aml_net_ios_cronet_buildflags",
+        "cronet_aml_net_isolation_info_proto_gen_headers",
         "cronet_aml_net_net_jni_headers",
+        "cronet_aml_net_net_nqe_proto_gen_headers",
+        "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
         "cronet_aml_tools_grit_grit_sources",
         "cronet_aml_tools_gritsettings_default_resource_ids",
         "cronet_aml_url_buildflags",
@@ -4142,6 +2869,7 @@
         "net/net_jni_headers/X509Util_jni.h",
     ],
     tool_files: [
+        "base/android/jni_generator/android_jar.classes",
         "base/android/jni_generator/jni_generator.py",
         "build/android/gyp/util/__init__.py",
         "build/android/gyp/util/build_utils.py",
@@ -4150,85 +2878,36 @@
 }
 
 // GN: //net:net_nqe_proto
-cc_library_static {
-    name: "cronet_aml_net_net_nqe_proto",
-    srcs: [
-        ":cronet_aml_net_net_export_header",
-        "out/test/gen/net/nqe/proto/network_id_proto.pb.cc",
-    ],
-    shared_libs: [
-        "liblog",
-    ],
-    static_libs: [
-        "cronet_aml_third_party_protobuf_protobuf_lite",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DANDROID",
-        "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
-        "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
-        "-DDCHECK_ALWAYS_ON=1",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
-        "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
-        "-DGOOGLE_PROTOBUF_NO_RTTI",
-        "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
-        "-DHAVE_PTHREAD",
-        "-DHAVE_SYS_UIO_H",
-        "-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",
-    ],
-    local_include_dirs: [
-        "./",
-        "buildtools/third_party/libc++/",
-        "buildtools/third_party/libc++/trunk/include",
-        "buildtools/third_party/libc++abi/trunk/include",
-        "third_party/protobuf/src/",
-        "third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
-    ],
-    cpp_std: "c++20",
-}
-
-// GN: //net:net_nqe_proto_gen
 genrule {
     name: "cronet_aml_net_net_nqe_proto_gen",
     srcs: [
-        "net/base/net_export.h",
         "net/nqe/proto/network_id_proto.proto",
     ],
     tools: [
         "aprotoc",
     ],
-    cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) network_id_proto.proto " +
-         "--protoc " +
-         "$(location aprotoc) " +
-         "--proto-in-dir " +
-         "`dirname $(location net/nqe/proto/network_id_proto.proto)` " +
-         "--cc-out-dir " +
-         "$(genDir)/net/nqe/proto " +
-         "--cc-options " +
-         "dllexport_decl=NET_EXPORT_PRIVATE: " +
-         " " +
-         "--include " +
-         "$(location net/base/net_export.h) " +
-         "--py-out-dir " +
-         "$(genDir)/pyproto/net/nqe/proto",
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
     out: [
-        "net/nqe/proto/network_id_proto.pb.cc",
-        "net/nqe/proto/network_id_proto.pb.h",
-        "pyproto/net/nqe/proto/network_id_proto_pb2.py",
+        "external/chromium_org/net/nqe/proto/network_id_proto.pb.cc",
     ],
-    tool_files: [
-        "tools/protoc_wrapper/protoc_wrapper.py",
+}
+
+// GN: //net:net_nqe_proto
+genrule {
+    name: "cronet_aml_net_net_nqe_proto_gen_headers",
+    srcs: [
+        "net/nqe/proto/network_id_proto.proto",
+    ],
+    tools: [
+        "aprotoc",
+    ],
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
+    out: [
+        "external/chromium_org/net/nqe/proto/network_id_proto.pb.h",
+    ],
+    export_include_dirs: [
+        ".",
+        "protos",
     ],
 }
 
@@ -4246,14 +2925,14 @@
 genrule {
     name: "cronet_aml_net_net_resources_grit",
     cmd: "$(location tools/grit/grit.py) -i " +
-         "../../net/base/net_resources.grd " +
+         "$(location net/base/net_resources.grd) " +
          "build " +
          "-o " +
-         "gen/net " +
+         "$(genDir)/net " +
          "--depdir " +
          ". " +
-         "--depfile " +
-         "gen/net/net_resources_grit.d " +
+         "  " +
+         "  " +
          "--write-only-new " +
          "1 " +
          "--depend-on-stamp " +
@@ -4318,6 +2997,8 @@
         "net/base/net_resources.grd",
         "out/test/gen/tools/gritsettings/default_resource_ids",
         "out/test/obj/net/net_resources_expected_outputs.txt",
+        "third_party/six/src/six.py",
+        "tools/grit/**/*.py",
         "tools/grit/grit.py",
     ],
 }
@@ -4368,64 +3049,9 @@
 }
 
 // GN: //net/third_party/quiche:net_quic_proto
-cc_library_static {
-    name: "cronet_aml_net_third_party_quiche_net_quic_proto",
-    srcs: [
-        "out/test/gen/net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.pb.cc",
-        "out/test/gen/net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.pb.cc",
-        "out/test/gen/net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.pb.cc",
-    ],
-    shared_libs: [
-        "libandroid",
-        "liblog",
-    ],
-    static_libs: [
-        "cronet_aml_base_base",
-        "cronet_aml_third_party_protobuf_protobuf_lite",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DANDROID",
-        "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
-        "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
-        "-DDCHECK_ALWAYS_ON=1",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
-        "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
-        "-DGOOGLE_PROTOBUF_NO_RTTI",
-        "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
-        "-DHAVE_PTHREAD",
-        "-DHAVE_SYS_UIO_H",
-        "-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",
-    ],
-    local_include_dirs: [
-        "./",
-        "buildtools/third_party/libc++/",
-        "buildtools/third_party/libc++/trunk/include",
-        "buildtools/third_party/libc++abi/trunk/include",
-        "third_party/abseil-cpp/",
-        "third_party/boringssl/src/include/",
-        "third_party/protobuf/src/",
-        "third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
-    ],
-    cpp_std: "c++20",
-}
-
-// GN: //net/third_party/quiche:net_quic_proto_gen
 genrule {
     name: "cronet_aml_net_third_party_quiche_net_quic_proto_gen",
     srcs: [
-        "base/component_export.h",
         "net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.proto",
         "net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.proto",
         "net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.proto",
@@ -4433,118 +3059,68 @@
     tools: [
         "aprotoc",
     ],
-    cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) quiche/quic/core/proto/cached_network_parameters.proto " +
-         "quiche/quic/core/proto/crypto_server_config.proto " +
-         "quiche/quic/core/proto/source_address_token.proto " +
-         "--protoc " +
-         "$(location aprotoc) " +
-         "--proto-in-dir " +
-         "`dirname $(location net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.proto)`/../../../../ " +
-         "--cc-out-dir " +
-         "$(genDir)/net/third_party/quiche/src " +
-         "--cc-options " +
-         "dllexport_decl=COMPONENT_EXPORT(QUICHE): " +
-         " " +
-         "--include " +
-         "$(location base/component_export.h) " +
-         "--py-out-dir " +
-         "$(genDir)/pyproto/net/third_party/quiche/src",
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
     out: [
-        "net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.pb.cc",
-        "net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.pb.h",
-        "net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.pb.cc",
-        "net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.pb.h",
-        "net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.pb.cc",
-        "net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.pb.h",
-        "pyproto/net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters_pb2.py",
-        "pyproto/net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config_pb2.py",
-        "pyproto/net/third_party/quiche/src/quiche/quic/core/proto/source_address_token_pb2.py",
+        "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",
     ],
-    tool_files: [
-        "tools/protoc_wrapper/protoc_wrapper.py",
+}
+
+// GN: //net/third_party/quiche:net_quic_proto
+genrule {
+    name: "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
+    srcs: [
+        "net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.proto",
+        "net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.proto",
+        "net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.proto",
+    ],
+    tools: [
+        "aprotoc",
+    ],
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(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",
+    ],
+    export_include_dirs: [
+        ".",
+        "protos",
     ],
 }
 
 // GN: //net/third_party/quiche:net_quic_test_tools_proto
-cc_library_static {
-    name: "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto",
-    srcs: [
-        ":cronet_aml_net_net_export_header",
-        "out/test/gen/net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.cc",
-    ],
-    shared_libs: [
-        "liblog",
-    ],
-    static_libs: [
-        "cronet_aml_third_party_protobuf_protobuf_lite",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DANDROID",
-        "-DANDROID_NDK_VERSION_ROLL=r23_1",
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
-        "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
-        "-DDCHECK_ALWAYS_ON=1",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
-        "-DGOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0",
-        "-DGOOGLE_PROTOBUF_NO_RTTI",
-        "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
-        "-DHAVE_PTHREAD",
-        "-DHAVE_SYS_UIO_H",
-        "-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",
-    ],
-    local_include_dirs: [
-        "./",
-        "buildtools/third_party/libc++/",
-        "buildtools/third_party/libc++/trunk/include",
-        "buildtools/third_party/libc++abi/trunk/include",
-        "third_party/protobuf/src/",
-        "third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
-    ],
-    cpp_std: "c++20",
-}
-
-// GN: //net/third_party/quiche:net_quic_test_tools_proto_gen
 genrule {
     name: "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen",
     srcs: [
-        "net/base/net_export.h",
         "net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.proto",
     ],
     tools: [
         "aprotoc",
     ],
-    cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) send_algorithm_test_result.proto " +
-         "--protoc " +
-         "$(location aprotoc) " +
-         "--proto-in-dir " +
-         "`dirname $(location net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.proto)` " +
-         "--cc-out-dir " +
-         "$(genDir)/net/third_party/quiche/src/quiche/quic/test_tools " +
-         "--cc-options " +
-         "dllexport_decl=NET_EXPORT_PRIVATE: " +
-         " " +
-         "--include " +
-         "$(location net/base/net_export.h) " +
-         "--py-out-dir " +
-         "$(genDir)/pyproto/net/third_party/quiche/src/quiche/quic/test_tools",
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
     out: [
-        "net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.cc",
-        "net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.h",
-        "pyproto/net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result_pb2.py",
+        "external/chromium_org/net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.cc",
     ],
-    tool_files: [
-        "tools/protoc_wrapper/protoc_wrapper.py",
+}
+
+// GN: //net/third_party/quiche:net_quic_test_tools_proto
+genrule {
+    name: "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers",
+    srcs: [
+        "net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.proto",
+    ],
+    tools: [
+        "aprotoc",
+    ],
+    cmd: "mkdir -p $(genDir)/external/chromium_org/ && $(location aprotoc) --proto_path=external/chromium_org --cpp_out=lite=true:$(genDir)/external/chromium_org/ $(in)",
+    out: [
+        "external/chromium_org/net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.pb.h",
+    ],
+    export_include_dirs: [
+        ".",
+        "protos",
     ],
 }
 
@@ -4552,6 +3128,7 @@
 cc_library_static {
     name: "cronet_aml_net_third_party_quiche_quiche",
     srcs: [
+        ":cronet_aml_net_third_party_quiche_net_quic_proto_gen",
         ":cronet_aml_third_party_abseil_cpp_absl",
         ":cronet_aml_third_party_abseil_cpp_absl_algorithm_algorithm",
         ":cronet_aml_third_party_abseil_cpp_absl_algorithm_container",
@@ -4946,10 +3523,10 @@
     shared_libs: [
         "libandroid",
         "liblog",
+        "libprotobuf-cpp-lite",
     ],
     static_libs: [
         "cronet_aml_base_base",
-        "cronet_aml_net_third_party_quiche_net_quic_proto",
         "cronet_aml_net_uri_template",
         "cronet_aml_third_party_boringssl_boringssl",
         "cronet_aml_third_party_protobuf_protobuf_lite",
@@ -4958,9 +3535,11 @@
     ],
     generated_headers: [
         "cronet_aml_build_chromeos_buildflags",
+        "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
     ],
     export_generated_headers: [
         "cronet_aml_build_chromeos_buildflags",
+        "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers",
     ],
     defaults: [
         "cronet_aml_defaults",
@@ -5011,14 +3590,20 @@
     srcs: [
         ":cronet_aml_buildtools_third_party_libc___libc__",
         ":cronet_aml_buildtools_third_party_libc__abi_libc__abi",
+        ":cronet_aml_net_cert_root_store_proto_full_gen",
         "net/tools/root_store_tool/root_store_tool.cc",
     ],
+    shared_libs: [
+        "libprotobuf-cpp-lite",
+    ],
     static_libs: [
         "cronet_aml_base_base",
         "cronet_aml_crypto_crypto",
-        "cronet_aml_net_cert_root_store_proto_full",
         "cronet_aml_third_party_boringssl_boringssl",
     ],
+    generated_headers: [
+        "cronet_aml_net_cert_root_store_proto_full_gen_headers",
+    ],
     defaults: [
         "cronet_aml_defaults",
     ],
@@ -5871,2798 +4456,6 @@
     name: "cronet_aml_third_party_abseil_cpp_absl_utility_utility",
 }
 
-// GN: //third_party/android_deps:auto_service_processor__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_auto_service_processor__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_annotation_processor " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_google_auto_service_auto_service_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/auto_service_processor.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:auto_service_processor " +
-         "--non-chromium-code " +
-         "--bundled-srcjars " +
-         "[] " +
-         "--main-class " +
-         "com.google.auto.service.processor.AutoServiceProcessor",
-    out: [
-        "third_party/android_deps/auto_service_processor.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_github_ben_manes_caffeine_caffeine_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json)\", \"$(location third_party/android_deps/org_checkerframework_checker_qual_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_github_ben_manes_caffeine_caffeine_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_github_ben_manes_caffeine_caffeine_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_github_ben_manes_caffeine_caffeine.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/caffeine-2.8.8.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_github_ben_manes_caffeine_caffeine.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_github_ben_manes_caffeine_caffeine_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_github_ben_manes_caffeine_caffeine_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/caffeine-2.8.8.jar " +
-         "obj/third_party/android_deps/com_github_ben_manes_caffeine_caffeine.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_github_ben_manes_caffeine_caffeine.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/caffeine-2.8.8.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_github_ben_manes_caffeine_caffeine_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/caffeine-2.8.8.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_github_ben_manes_caffeine_caffeine.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_github_ben_manes_caffeine_caffeine.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/caffeine-2.8.8.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_github_kevinstern_software_and_algorithms_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_github_kevinstern_software_and_algorithms_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_github_kevinstern_software_and_algorithms_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_github_kevinstern_software_and_algorithms.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms/software-and-algorithms-1.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_github_kevinstern_software_and_algorithms.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_github_kevinstern_software_and_algorithms_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_github_kevinstern_software_and_algorithms_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms/software-and-algorithms-1.0.jar " +
-         "obj/third_party/android_deps/com_github_kevinstern_software_and_algorithms.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_github_kevinstern_software_and_algorithms.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms/software-and-algorithms-1.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_github_kevinstern_software_and_algorithms_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms/software-and-algorithms-1.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_github_kevinstern_software_and_algorithms.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_github_kevinstern_software_and_algorithms.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms/software-and-algorithms-1.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_auto_common_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_google_guava_guava_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_auto_auto_common_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_auto_auto_common_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_auto_auto_common.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_auto_auto_common/auto-common-1.2.1.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_auto_auto_common.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_auto_auto_common_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_auto_common_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_auto_auto_common/auto-common-1.2.1.jar " +
-         "obj/third_party/android_deps/com_google_auto_auto_common.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_auto_auto_common.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_auto_auto_common/auto-common-1.2.1.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_auto_common_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_auto_auto_common/auto-common-1.2.1.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_auto_auto_common.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_auto_auto_common.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_auto_auto_common/auto-common-1.2.1.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_service_auto_service_annotations_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_auto_service_auto_service_annotations_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_auto_service_auto_service_annotations_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_auto_service_auto_service_annotations.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_auto_service_auto_service_annotations/auto-service-annotations-1.0-rc6.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_auto_service_auto_service_annotations.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_auto_service_auto_service_annotations_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_service_auto_service_annotations_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_auto_service_auto_service_annotations/auto-service-annotations-1.0-rc6.jar " +
-         "obj/third_party/android_deps/com_google_auto_service_auto_service_annotations.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_auto_service_auto_service_annotations.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_auto_service_auto_service_annotations/auto-service-annotations-1.0-rc6.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_service_auto_service_annotations_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_auto_service_auto_service_annotations/auto-service-annotations-1.0-rc6.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_auto_service_auto_service_annotations.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_auto_service_auto_service_annotations.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_auto_service_auto_service_annotations/auto-service-annotations-1.0-rc6.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_service_auto_service_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_google_auto_auto_common_java.build_config.json)\", \"$(location third_party/android_deps/com_google_auto_service_auto_service_annotations_java.build_config.json)\", \"$(location third_party/android_deps/com_google_guava_guava_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_auto_service_auto_service_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_auto_service_auto_service_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_auto_service_auto_service.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_auto_service_auto_service/auto-service-1.0-rc6.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_auto_service_auto_service.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_auto_service_auto_service_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_service_auto_service_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_auto_service_auto_service/auto-service-1.0-rc6.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_auto_service_auto_service.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_auto_service_auto_service.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_auto_service_auto_service/auto-service-1.0-rc6.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_value_auto_value_annotations_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_auto_value_auto_value_annotations_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_auto_value_auto_value_annotations_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_auto_value_auto_value_annotations.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_auto_value_auto_value_annotations/auto-value-annotations-1.9.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_auto_value_auto_value_annotations.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_auto_value_auto_value_annotations_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_value_auto_value_annotations_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_auto_value_auto_value_annotations/auto-value-annotations-1.9.jar " +
-         "obj/third_party/android_deps/com_google_auto_value_auto_value_annotations.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_auto_value_auto_value_annotations.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_auto_value_auto_value_annotations/auto-value-annotations-1.9.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_auto_value_auto_value_annotations_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_auto_value_auto_value_annotations/auto-value-annotations-1.9.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_auto_value_auto_value_annotations.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_auto_value_auto_value_annotations.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_auto_value_auto_value_annotations/auto-value-annotations-1.9.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_code_findbugs_jsr305_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_code_findbugs_jsr305_java " +
-         "--non-chromium-code " +
-         "--device-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_code_findbugs_jsr305.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_code_findbugs_jsr305.ijar.jar) " +
-         "--dex-path " +
-         "obj/third_party/android_deps/com_google_code_findbugs_jsr305_java.dex.jar " +
-         "--supports-android " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_code_findbugs_jsr305_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar " +
-         "obj/third_party/android_deps/com_google_code_findbugs_jsr305.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_code_findbugs_jsr305.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_code_findbugs_jsr305_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_code_findbugs_jsr305.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_code_findbugs_jsr305.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_annotation_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_google_guava_guava_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_errorprone_error_prone_annotation_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_errorprone_error_prone_annotation_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_errorprone_error_prone_annotation.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.11.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_errorprone_error_prone_annotation.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_errorprone_error_prone_annotation_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_annotation_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.11.0.jar " +
-         "obj/third_party/android_deps/com_google_errorprone_error_prone_annotation.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_errorprone_error_prone_annotation.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.11.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_annotation_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.11.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_errorprone_error_prone_annotation.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_errorprone_error_prone_annotation.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.11.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_annotations_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java " +
-         "--non-chromium-code " +
-         "--device-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.14.0.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_errorprone_error_prone_annotations.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.14.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_errorprone_error_prone_annotations.ijar.jar) " +
-         "--dex-path " +
-         "obj/third_party/android_deps/com_google_errorprone_error_prone_annotations_java.dex.jar " +
-         "--supports-android " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_annotations_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.14.0.jar " +
-         "obj/third_party/android_deps/com_google_errorprone_error_prone_annotations.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_errorprone_error_prone_annotations.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.14.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_annotations_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.14.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_errorprone_error_prone_annotations.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_errorprone_error_prone_annotations.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.14.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_check_api_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_github_ben_manes_caffeine_caffeine_java.build_config.json)\", \"$(location third_party/android_deps/com_github_kevinstern_software_and_algorithms_java.build_config.json)\", \"$(location third_party/android_deps/com_google_auto_value_auto_value_annotations_java.build_config.json)\", \"$(location third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_annotation_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json)\", \"$(location third_party/android_deps/io_github_java_diff_utils_java_diff_utils_java.build_config.json)\", \"$(location third_party/android_deps/org_checkerframework_dataflow_errorprone_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_errorprone_error_prone_check_api_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_errorprone_error_prone_check_api_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_errorprone_error_prone_check_api.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.11.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_errorprone_error_prone_check_api.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_errorprone_error_prone_check_api_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_check_api_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.11.0.jar " +
-         "obj/third_party/android_deps/com_google_errorprone_error_prone_check_api.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_errorprone_error_prone_check_api.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.11.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_check_api_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.11.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_errorprone_error_prone_check_api.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_errorprone_error_prone_check_api.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.11.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_core_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_google_auto_auto_common_java.build_config.json)\", \"$(location third_party/android_deps/com_google_auto_service_auto_service_annotations_java.build_config.json)\", \"$(location third_party/android_deps/com_google_auto_value_auto_value_annotations_java.build_config.json)\", \"$(location third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_annotation_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_check_api_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_type_annotations_java.build_config.json)\", \"$(location third_party/android_deps/com_google_guava_guava_java.build_config.json)\", \"$(location third_party/android_deps/com_google_protobuf_protobuf_java_java.build_config.json)\", \"$(location third_party/android_deps/org_checkerframework_dataflow_errorprone_java.build_config.json)\", \"$(location third_party/android_deps/org_pcollections_pcollections_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_errorprone_error_prone_core_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_errorprone_error_prone_core_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_errorprone_error_prone_core.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_errorprone_error_prone_core/error_prone_core-2.11.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_errorprone_error_prone_core.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_errorprone_error_prone_core_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_core_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_core/error_prone_core-2.11.0.jar " +
-         "obj/third_party/android_deps/com_google_errorprone_error_prone_core.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_errorprone_error_prone_core.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_core/error_prone_core-2.11.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_core_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_core/error_prone_core-2.11.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_errorprone_error_prone_core.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_errorprone_error_prone_core.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_core/error_prone_core-2.11.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_type_annotations_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_errorprone_error_prone_type_annotations_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_errorprone_error_prone_type_annotations_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_errorprone_error_prone_type_annotations.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.11.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_errorprone_error_prone_type_annotations.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_errorprone_error_prone_type_annotations_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_type_annotations_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.11.0.jar " +
-         "obj/third_party/android_deps/com_google_errorprone_error_prone_type_annotations.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_errorprone_error_prone_type_annotations.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.11.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_error_prone_type_annotations_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.11.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_errorprone_error_prone_type_annotations.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_errorprone_error_prone_type_annotations.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.11.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_javac_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_errorprone_javac_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_errorprone_javac_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_errorprone_javac.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_errorprone_javac/javac-9+181-r4173-1.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_errorprone_javac.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_errorprone_javac_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_javac_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_errorprone_javac/javac-9+181-r4173-1.jar " +
-         "obj/third_party/android_deps/com_google_errorprone_javac.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_errorprone_javac.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_errorprone_javac/javac-9+181-r4173-1.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_errorprone_javac_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_errorprone_javac/javac-9+181-r4173-1.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_errorprone_javac.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_errorprone_javac.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_errorprone_javac/javac-9+181-r4173-1.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_failureaccess_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_guava_failureaccess_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_guava_failureaccess_java " +
-         "--non-chromium-code " +
-         "--device-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_guava_failureaccess/failureaccess-1.0.1.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_guava_failureaccess.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_guava_failureaccess/failureaccess-1.0.1.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_guava_failureaccess.ijar.jar) " +
-         "--dex-path " +
-         "obj/third_party/android_deps/com_google_guava_failureaccess_java.dex.jar " +
-         "--supports-android " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_guava_failureaccess_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_failureaccess_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_guava_failureaccess/failureaccess-1.0.1.jar " +
-         "obj/third_party/android_deps/com_google_guava_failureaccess.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_guava_failureaccess.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_guava_failureaccess/failureaccess-1.0.1.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_failureaccess_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_guava_failureaccess/failureaccess-1.0.1.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_guava_failureaccess.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_guava_failureaccess.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_guava_failureaccess/failureaccess-1.0.1.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_guava_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_guava_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_google_code_findbugs_jsr305_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_annotations_java.build_config.json)\", \"$(location third_party/android_deps/com_google_guava_failureaccess_java.build_config.json)\", \"$(location third_party/android_deps/com_google_guava_listenablefuture_java.build_config.json)\", \"$(location third_party/android_deps/com_google_j2objc_j2objc_annotations_java.build_config.json)\", \"$(location third_party/android_deps/org_checkerframework_checker_qual_java.build_config.json)\", \"$(location third_party/android_deps/com_google_guava_listenablefuture_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_guava_guava_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_guava_guava_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_guava_guava.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_guava_guava/guava-31.0.1-jre.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_guava_guava.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_guava_guava_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_guava_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_guava_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_guava_guava/guava-31.0.1-jre.jar " +
-         "obj/third_party/android_deps/com_google_guava_guava.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_guava_guava.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_guava_guava/guava-31.0.1-jre.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_guava_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_guava_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_guava_guava/guava-31.0.1-jre.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_guava_guava.jar " +
-         "--exclude-globs " +
-         "[\"*/ListenableFuture.class\"] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_guava_guava.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_guava_guava/guava-31.0.1-jre.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_listenablefuture_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_guava_listenablefuture_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_guava_listenablefuture_java " +
-         "--non-chromium-code " +
-         "--device-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_guava_listenablefuture/listenablefuture-1.0.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_guava_listenablefuture.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_guava_listenablefuture/listenablefuture-1.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_guava_listenablefuture.ijar.jar) " +
-         "--dex-path " +
-         "obj/third_party/android_deps/com_google_guava_listenablefuture_java.dex.jar " +
-         "--supports-android " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_guava_listenablefuture_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_listenablefuture_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_guava_listenablefuture/listenablefuture-1.0.jar " +
-         "obj/third_party/android_deps/com_google_guava_listenablefuture.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_guava_listenablefuture.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_guava_listenablefuture/listenablefuture-1.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_guava_listenablefuture_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_guava_listenablefuture/listenablefuture-1.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_guava_listenablefuture.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_guava_listenablefuture.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_guava_listenablefuture/listenablefuture-1.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_j2objc_j2objc_annotations_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_j2objc_j2objc_annotations_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_j2objc_j2objc_annotations_java " +
-         "--non-chromium-code " +
-         "--device-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.3.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_j2objc_j2objc_annotations.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.3.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_j2objc_j2objc_annotations.ijar.jar) " +
-         "--dex-path " +
-         "obj/third_party/android_deps/com_google_j2objc_j2objc_annotations_java.dex.jar " +
-         "--supports-android " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_j2objc_j2objc_annotations_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_j2objc_j2objc_annotations_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.3.jar " +
-         "obj/third_party/android_deps/com_google_j2objc_j2objc_annotations.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_j2objc_j2objc_annotations.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.3.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_j2objc_j2objc_annotations_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.3.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_j2objc_j2objc_annotations.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_j2objc_j2objc_annotations.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.3.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_protobuf_protobuf_java_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/com_google_protobuf_protobuf_java_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:com_google_protobuf_protobuf_java_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/com_google_protobuf_protobuf_java.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/com_google_protobuf_protobuf_java/protobuf-java-3.19.2.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/com_google_protobuf_protobuf_java.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/com_google_protobuf_protobuf_java_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_protobuf_protobuf_java_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/com_google_protobuf_protobuf_java/protobuf-java-3.19.2.jar " +
-         "obj/third_party/android_deps/com_google_protobuf_protobuf_java.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/com_google_protobuf_protobuf_java.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/com_google_protobuf_protobuf_java/protobuf-java-3.19.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:com_google_protobuf_protobuf_java_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/com_google_protobuf_protobuf_java/protobuf-java-3.19.2.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/com_google_protobuf_protobuf_java.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/com_google_protobuf_protobuf_java.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/com_google_protobuf_protobuf_java/protobuf-java-3.19.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:io_github_java_diff_utils_java_diff_utils_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/io_github_java_diff_utils_java_diff_utils_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:io_github_java_diff_utils_java_diff_utils_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/io_github_java_diff_utils_java_diff_utils.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils/java-diff-utils-4.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/io_github_java_diff_utils_java_diff_utils.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/io_github_java_diff_utils_java_diff_utils_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:io_github_java_diff_utils_java_diff_utils_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils/java-diff-utils-4.0.jar " +
-         "obj/third_party/android_deps/io_github_java_diff_utils_java_diff_utils.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/io_github_java_diff_utils_java_diff_utils.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils/java-diff-utils-4.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:io_github_java_diff_utils_java_diff_utils_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils/java-diff-utils-4.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/io_github_java_diff_utils_java_diff_utils.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/io_github_java_diff_utils_java_diff_utils.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils/java-diff-utils-4.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_checkerframework_checker_qual_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/org_checkerframework_checker_qual_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:org_checkerframework_checker_qual_java " +
-         "--non-chromium-code " +
-         "--device-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_checkerframework_checker_qual/checker-qual-3.25.0.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/org_checkerframework_checker_qual.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_checkerframework_checker_qual/checker-qual-3.25.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/org_checkerframework_checker_qual.ijar.jar) " +
-         "--dex-path " +
-         "obj/third_party/android_deps/org_checkerframework_checker_qual_java.dex.jar " +
-         "--supports-android " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/org_checkerframework_checker_qual_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:org_checkerframework_checker_qual_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/org_checkerframework_checker_qual/checker-qual-3.25.0.jar " +
-         "obj/third_party/android_deps/org_checkerframework_checker_qual.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/org_checkerframework_checker_qual.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/org_checkerframework_checker_qual/checker-qual-3.25.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_checkerframework_checker_qual_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/org_checkerframework_checker_qual/checker-qual-3.25.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/org_checkerframework_checker_qual.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/org_checkerframework_checker_qual.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/org_checkerframework_checker_qual/checker-qual-3.25.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_checkerframework_dataflow_errorprone_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/org_checkerframework_dataflow_errorprone_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:org_checkerframework_dataflow_errorprone_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/org_checkerframework_dataflow_errorprone.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_checkerframework_dataflow_errorprone/dataflow-errorprone-3.15.0.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/org_checkerframework_dataflow_errorprone.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/org_checkerframework_dataflow_errorprone_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:org_checkerframework_dataflow_errorprone_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/org_checkerframework_dataflow_errorprone/dataflow-errorprone-3.15.0.jar " +
-         "obj/third_party/android_deps/org_checkerframework_dataflow_errorprone.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/org_checkerframework_dataflow_errorprone.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/org_checkerframework_dataflow_errorprone/dataflow-errorprone-3.15.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_checkerframework_dataflow_errorprone_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/org_checkerframework_dataflow_errorprone/dataflow-errorprone-3.15.0.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/org_checkerframework_dataflow_errorprone.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/org_checkerframework_dataflow_errorprone.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/org_checkerframework_dataflow_errorprone/dataflow-errorprone-3.15.0.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_eclipse_jgit_org_eclipse_jgit_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:org_eclipse_jgit_org_eclipse_jgit_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit/org.eclipse.jgit-4.4.1.201607150455-r.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:org_eclipse_jgit_org_eclipse_jgit_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit/org.eclipse.jgit-4.4.1.201607150455-r.jar " +
-         "obj/third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit/org.eclipse.jgit-4.4.1.201607150455-r.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_eclipse_jgit_org_eclipse_jgit_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit/org.eclipse.jgit-4.4.1.201607150455-r.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/org_eclipse_jgit_org_eclipse_jgit.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit/org.eclipse.jgit-4.4.1.201607150455-r.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_analysis_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/org_ow2_asm_asm_tree_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/org_ow2_asm_asm_analysis_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:org_ow2_asm_asm_analysis_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/org_ow2_asm_asm_analysis.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_ow2_asm_asm_analysis/asm-analysis-9.2.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/org_ow2_asm_asm_analysis.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/org_ow2_asm_asm_analysis_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_analysis_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/org_ow2_asm_asm_analysis/asm-analysis-9.2.jar " +
-         "obj/third_party/android_deps/org_ow2_asm_asm_analysis.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/org_ow2_asm_asm_analysis.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/org_ow2_asm_asm_analysis/asm-analysis-9.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_analysis_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/org_ow2_asm_asm_analysis/asm-analysis-9.2.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/org_ow2_asm_asm_analysis.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/org_ow2_asm_asm_analysis.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/org_ow2_asm_asm_analysis/asm-analysis-9.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/org_ow2_asm_asm_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:org_ow2_asm_asm_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/org_ow2_asm_asm.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_ow2_asm_asm/asm-9.2.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/org_ow2_asm_asm.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/org_ow2_asm_asm_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/org_ow2_asm_asm/asm-9.2.jar " +
-         "obj/third_party/android_deps/org_ow2_asm_asm.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/org_ow2_asm_asm.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/org_ow2_asm_asm/asm-9.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/org_ow2_asm_asm/asm-9.2.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/org_ow2_asm_asm.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/org_ow2_asm_asm.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/org_ow2_asm_asm/asm-9.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_tree_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/org_ow2_asm_asm_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/org_ow2_asm_asm_tree_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:org_ow2_asm_asm_tree_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/org_ow2_asm_asm_tree.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_ow2_asm_asm_tree/asm-tree-9.2.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/org_ow2_asm_asm_tree.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/org_ow2_asm_asm_tree_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_tree_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/org_ow2_asm_asm_tree/asm-tree-9.2.jar " +
-         "obj/third_party/android_deps/org_ow2_asm_asm_tree.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/org_ow2_asm_asm_tree.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/org_ow2_asm_asm_tree/asm-tree-9.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_tree_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/org_ow2_asm_asm_tree/asm-tree-9.2.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/org_ow2_asm_asm_tree.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/org_ow2_asm_asm_tree.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/org_ow2_asm_asm_tree/asm-tree-9.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_util_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/org_ow2_asm_asm_analysis_java.build_config.json)\", \"$(location third_party/android_deps/org_ow2_asm_asm_java.build_config.json)\", \"$(location third_party/android_deps/org_ow2_asm_asm_tree_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/org_ow2_asm_asm_util_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:org_ow2_asm_asm_util_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/org_ow2_asm_asm_util.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_ow2_asm_asm_util/asm-util-9.2.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/org_ow2_asm_asm_util.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/org_ow2_asm_asm_util_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_util_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/org_ow2_asm_asm_util/asm-util-9.2.jar " +
-         "obj/third_party/android_deps/org_ow2_asm_asm_util.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/org_ow2_asm_asm_util.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/org_ow2_asm_asm_util/asm-util-9.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_ow2_asm_asm_util_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/org_ow2_asm_asm_util/asm-util-9.2.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/org_ow2_asm_asm_util.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/org_ow2_asm_asm_util.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/org_ow2_asm_asm_util/asm-util-9.2.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_pcollections_pcollections_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_deps/org_pcollections_pcollections_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_deps:org_pcollections_pcollections_java " +
-         "--non-chromium-code " +
-         "--host-jar-path " +
-         "$(location lib.java/third_party/android_deps/org_pcollections_pcollections.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_deps/libs/org_pcollections_pcollections/pcollections-3.1.4.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_deps/org_pcollections_pcollections.ijar.jar) " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_deps/org_pcollections_pcollections_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_deps:org_pcollections_pcollections_java__header
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_deps/libs/org_pcollections_pcollections/pcollections-3.1.4.jar " +
-         "obj/third_party/android_deps/org_pcollections_pcollections.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_deps/org_pcollections_pcollections.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_deps/libs/org_pcollections_pcollections/pcollections-3.1.4.jar",
-    ],
-}
-
-// GN: //third_party/android_deps:org_pcollections_pcollections_java__host
-genrule {
-    name: "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "../../third_party/android_deps/libs/org_pcollections_pcollections/pcollections-3.1.4.jar " +
-         "--output " +
-         "lib.java/third_party/android_deps/org_pcollections_pcollections.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/third_party/android_deps/org_pcollections_pcollections.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "third_party/android_deps/libs/org_pcollections_pcollections/pcollections-3.1.4.jar",
-    ],
-}
-
 // GN: //third_party/android_ndk:cpu_features
 filegroup {
     name: "cronet_aml_third_party_android_ndk_cpu_features",
@@ -8671,83 +4464,6 @@
     ],
 }
 
-// GN: //third_party/android_sdk:android_sdk_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_third_party_android_sdk_android_sdk_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "system_java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/third_party/android_sdk/android_sdk_java.build_config.json " +
-         "--gn-target " +
-         "//third_party/android_sdk:android_sdk_java " +
-         "--non-chromium-code " +
-         "--unprocessed-jar-path " +
-         "$(location ../../third_party/android_sdk/public/platforms/android-33/android.jar) " +
-         "--interface-jar-path " +
-         "$(location third_party/android_sdk/android.ijar.jar) " +
-         "--supports-android " +
-         "--is-prebuilt " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "third_party/android_sdk/android_sdk_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //third_party/android_sdk:android_sdk_java__header
-genrule {
-    name: "cronet_aml_third_party_android_sdk_android_sdk_java__header",
-    cmd: "$(location build/android/gyp/ijar.py) clang_x64/ijar " +
-         "../../third_party/android_sdk/public/platforms/android-33/android.jar " +
-         "obj/third_party/android_sdk/android.ijar.jar",
-    out: [
-        "//out/test/obj/third_party/android_sdk/android.ijar.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/ijar.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/clang_x64/ijar",
-        "third_party/android_sdk/public/platforms/android-33/android.jar",
-    ],
-}
-
 // GN: //third_party/ashmem:ashmem
 filegroup {
     name: "cronet_aml_third_party_ashmem_ashmem",
@@ -9270,66 +4986,6 @@
     name: "cronet_aml_third_party_icu_icuuc_public",
 }
 
-// GN: //third_party/ijar:ijar
-cc_binary {
-    name: "cronet_aml_third_party_ijar_ijar",
-    srcs: [
-        ":cronet_aml_buildtools_third_party_libc___libc__",
-        ":cronet_aml_buildtools_third_party_libc__abi_libc__abi",
-        "third_party/ijar/classfile.cc",
-        "third_party/ijar/ijar.cc",
-        "third_party/ijar/mapped_file_unix.cc",
-        "third_party/ijar/platform_utils.cc",
-        "third_party/ijar/zip.cc",
-        "third_party/ijar/zlib_client.cc",
-    ],
-    static_libs: [
-        "cronet_aml_third_party_zlib_zlib",
-    ],
-    defaults: [
-        "cronet_aml_defaults",
-    ],
-    cflags: [
-        "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
-        "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
-        "-DCR_SYSROOT_KEY=20220331T153654Z-0",
-        "-DDCHECK_ALWAYS_ON=1",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
-        "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
-        "-DLIBCXXABI_SILENT_TERMINATE",
-        "-DLIBCXX_BUILDING_LIBCXXABI",
-        "-DNDEBUG",
-        "-DNVALGRIND",
-        "-DUSE_AURA=1",
-        "-DUSE_OZONE=1",
-        "-DUSE_UDEV",
-        "-D_DEBUG",
-        "-D_FILE_OFFSET_BITS=64",
-        "-D_GNU_SOURCE",
-        "-D_LARGEFILE64_SOURCE",
-        "-D_LARGEFILE_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_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))",
-        "-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++/trunk/src/",
-        "buildtools/third_party/libc++abi/trunk/include",
-        "third_party/zlib/",
-        "build/linux/debian_bullseye_amd64-sysroot/usr/include",
-    ],
-    cpp_std: "c++20",
-}
-
 // GN: //third_party/libevent:libevent
 cc_library_static {
     name: "cronet_aml_third_party_libevent_libevent",
@@ -9623,6 +5279,7 @@
 cc_library_static {
     name: "cronet_aml_third_party_zlib_zlib",
     srcs: [
+        ":cronet_aml_third_party_android_ndk_cpu_features",
         ":cronet_aml_third_party_zlib_zlib_adler32_simd",
         ":cronet_aml_third_party_zlib_zlib_common_headers",
         ":cronet_aml_third_party_zlib_zlib_crc32_simd",
@@ -9649,26 +5306,22 @@
     ],
     cflags: [
         "-DADLER32_SIMD_SSSE3",
+        "-DANDROID",
+        "-DANDROID_NDK_VERSION_ROLL=r23_1",
         "-DCRC32_SIMD_SSE42_PCLMUL",
         "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"",
         "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc",
-        "-DCR_SYSROOT_KEY=20220331T153654Z-0",
         "-DDCHECK_ALWAYS_ON=1",
         "-DDEFLATE_SLIDE_HASH_SSE2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
+        "-DHAVE_SYS_UIO_H",
         "-DINFLATE_CHUNK_READ_64LE",
         "-DINFLATE_CHUNK_SIMD_SSE2",
-        "-DUSE_AURA=1",
-        "-DUSE_OZONE=1",
-        "-DUSE_UDEV",
         "-DX86_NOT_WINDOWS",
         "-DZLIB_DEBUG",
         "-DZLIB_IMPLEMENTATION",
         "-D_DEBUG",
-        "-D_FILE_OFFSET_BITS=64",
         "-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",
@@ -9681,8 +5334,9 @@
         "buildtools/third_party/libc++/",
         "buildtools/third_party/libc++/trunk/include",
         "buildtools/third_party/libc++abi/trunk/include",
+        "third_party/android_ndk/sources/android/cpufeatures/",
         "third_party/zlib/",
-        "build/linux/debian_bullseye_amd64-sysroot/usr/include",
+        "third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
     ],
     cpp_std: "c++20",
 }
@@ -9723,257 +5377,6 @@
     name: "cronet_aml_third_party_zlib_zlib_slide_hash_simd",
 }
 
-// GN: //tools/android/errorprone_plugin:errorprone_plugin__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_binary " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location third_party/android_deps/com_google_auto_service_auto_service_annotations_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_annotation_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_check_api_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_error_prone_core_java.build_config.json)\", \"$(location third_party/android_deps/com_google_errorprone_javac_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/tools/android/errorprone_plugin/errorprone_plugin.build_config.json " +
-         "--gn-target " +
-         "//tools/android/errorprone_plugin:errorprone_plugin " +
-         "--host-jar-path " +
-         "$(location lib.java/tools/android/errorprone_plugin/errorprone_plugin.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location tools/android/errorprone_plugin/errorprone_plugin.javac.jar) " +
-         "--interface-jar-path " +
-         "$(location tools/android/errorprone_plugin/errorprone_plugin.turbine.jar) " +
-         "--annotation-processor-configs " +
-         "[\"gen/third_party/android_deps/auto_service_processor.build_config.json\"] " +
-         "--java-sources-file " +
-         "gen/tools/android/errorprone_plugin/errorprone_plugin.sources " +
-         "--bundled-srcjars " +
-         "[] " +
-         "--main-class " +
-         "<ignore>",
-    out: [
-        "tools/android/errorprone_plugin/errorprone_plugin.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //tools/android/errorprone_plugin:errorprone_plugin__compile_java
-genrule {
-    name: "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__compile_java",
-    srcs: [
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/AndroidNullableCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoAndroidAsyncTaskCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoDynamicStringsInTraceEventCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoRedundantFieldInitCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoSynchronizedMethodCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoSynchronizedThisCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/TestClassNameCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/UseNetworkAnnotations.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/tools/android/errorprone_plugin/errorprone_plugin__compile_java.d " +
-         "--generated-dir " +
-         "gen/tools/android/errorprone_plugin/errorprone_plugin/generated_java " +
-         "--jar-path " +
-         "obj/tools/android/errorprone_plugin/errorprone_plugin.javac.jar " +
-         "--java-srcjars " +
-         "[\"gen/tools/android/errorprone_plugin/errorprone_plugin.generated.srcjar\"] " +
-         "--target-name " +
-         "//tools/android/errorprone_plugin:errorprone_plugin__compile_java " +
-         "--header-jar " +
-         "obj/tools/android/errorprone_plugin/errorprone_plugin.turbine.jar " +
-         "--classpath " +
-         "[\"obj/tools/android/errorprone_plugin/errorprone_plugin.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "@gen/tools/android/errorprone_plugin/errorprone_plugin.sources",
-    out: [
-        "//out/test/obj/tools/android/errorprone_plugin/errorprone_plugin.javac.jar",
-        "//out/test/obj/tools/android/errorprone_plugin/errorprone_plugin.javac.jar.info",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json",
-        "out/test/gen/tools/android/errorprone_plugin/errorprone_plugin.generated.srcjar",
-        "out/test/gen/tools/android/errorprone_plugin/errorprone_plugin.sources",
-        "out/test/obj/tools/android/errorprone_plugin/errorprone_plugin.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //tools/android/errorprone_plugin:errorprone_plugin__header
-genrule {
-    name: "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__header",
-    srcs: [
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/AndroidNullableCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoAndroidAsyncTaskCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoDynamicStringsInTraceEventCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoRedundantFieldInitCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoSynchronizedMethodCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/NoSynchronizedThisCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/TestClassNameCheck.java",
-        "tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/UseNetworkAnnotations.java",
-    ],
-    cmd: "$(location build/android/gyp/turbine.py) --depfile " +
-         "gen/tools/android/errorprone_plugin/errorprone_plugin__header.d " +
-         "--generated-dir " +
-         "gen/tools/android/errorprone_plugin/errorprone_plugin/generated_java " +
-         "--jar-path " +
-         "obj/tools/android/errorprone_plugin/errorprone_plugin.turbine.jar " +
-         "--java-srcjars " +
-         "[] " +
-         "--target-name " +
-         "//tools/android/errorprone_plugin:errorprone_plugin__header " +
-         "--classpath " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:javac:interface_classpath) " +
-         "--processorpath " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:javac:processor_classpath) " +
-         "--processors " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:javac:processor_classes) " +
-         "--turbine-jar-path " +
-         "../../third_party/turbine/turbine.jar " +
-         "--generated-jar-path " +
-         "gen/tools/android/errorprone_plugin/errorprone_plugin.generated.srcjar " +
-         "--chromium-code " +
-         "1 " +
-         "@gen/tools/android/errorprone_plugin/errorprone_plugin.sources",
-    out: [
-        "//out/test/obj/tools/android/errorprone_plugin/errorprone_plugin.turbine.jar",
-        "tools/android/errorprone_plugin/errorprone_plugin.generated.srcjar",
-    ],
-    tool_files: [
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/turbine.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "out/test/gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json",
-        "out/test/gen/tools/android/errorprone_plugin/errorprone_plugin.sources",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "third_party/turbine/turbine.jar",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //tools/android/errorprone_plugin:errorprone_plugin__host
-genrule {
-    name: "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__host",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "obj/tools/android/errorprone_plugin/errorprone_plugin.javac.jar " +
-         "--output " +
-         "lib.java/tools/android/errorprone_plugin/errorprone_plugin.jar " +
-         "--exclude-globs " +
-         "[] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/lib.java/tools/android/errorprone_plugin/errorprone_plugin.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/obj/tools/android/errorprone_plugin/errorprone_plugin.javac.jar",
-    ],
-}
-
-// GN: //tools/android/errorprone_plugin:errorprone_plugin__java_binary_script
-genrule {
-    name: "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__java_binary_script",
-    cmd: "$(location build/android/gyp/create_java_binary_script.py) --output " +
-         "bin/bin/helper/errorprone_plugin " +
-         "--main-class " +
-         "<ignore> " +
-         "--classpath " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:deps_info:host_classpath) " +
-         "--noverify",
-    out: [
-        "//out/test/bin/bin/helper/errorprone_plugin",
-    ],
-    tool_files: [
-        "build/android/gyp/create_java_binary_script.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json",
-    ],
-}
-
 // GN: //tools/grit:grit_sources
 genrule {
     name: "cronet_aml_tools_grit_grit_sources",
@@ -9994,16 +5397,18 @@
     name: "cronet_aml_tools_gritsettings_default_resource_ids",
     cmd: "$(location tools/grit/grit.py) update_resource_ids " +
          "-o " +
-         "gen/tools/gritsettings/default_resource_ids " +
+         "$(location tools/gritsettings/default_resource_ids) " +
          "--add-header " +
-         "--depfile " +
-         "gen/tools/gritsettings/default_resource_ids.d " +
+         "  " +
+         "  " +
          "--input " +
-         "../../tools/gritsettings/resource_ids.spec",
+         "$(location tools/gritsettings/resource_ids.spec)",
     out: [
         "tools/gritsettings/default_resource_ids",
     ],
     tool_files: [
+        "third_party/six/src/six.py",
+        "tools/grit/**/*.py",
         "tools/grit/grit.py",
         "tools/gritsettings/resource_ids.spec",
     ],
@@ -10067,246 +5472,16 @@
     ],
     generated_headers: [
         "cronet_aml_base_debugging_buildflags",
-        "cronet_aml_base_jni_java__build_config_crbug_908819",
-        "cronet_aml_base_jni_java__compile_java",
-        "cronet_aml_base_jni_java__errorprone",
-        "cronet_aml_base_jni_java__header",
-        "cronet_aml_base_jni_java__host",
-        "cronet_aml_base_jni_java__validate",
         "cronet_aml_base_logging_buildflags",
-        "cronet_aml_build_android_build_config_gen",
-        "cronet_aml_build_android_build_java__build_config_crbug_908819",
-        "cronet_aml_build_android_build_java__compile_java",
-        "cronet_aml_build_android_build_java__errorprone",
-        "cronet_aml_build_android_build_java__header",
-        "cronet_aml_build_android_build_java__host",
-        "cronet_aml_build_android_build_java__process_device",
-        "cronet_aml_build_android_build_java__validate",
-        "cronet_aml_build_android_bytecode_bytecode_processor__build_config_crbug_908819",
-        "cronet_aml_build_android_bytecode_bytecode_processor__java_binary_script",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__build_config_crbug_908819",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__compile_java",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__errorprone",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__header",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__host",
-        "cronet_aml_build_android_native_libraries_gen",
         "cronet_aml_build_chromeos_buildflags",
-        "cronet_aml_third_party_android_deps_auto_service_processor__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__header",
-        "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__host",
-        "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__header",
-        "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__host",
-        "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__header",
-        "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__host",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_java__host",
-        "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__header",
-        "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__host",
-        "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__header",
-        "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__host",
-        "cronet_aml_third_party_android_deps_com_google_guava_guava_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_guava_guava_java__header",
-        "cronet_aml_third_party_android_deps_com_google_guava_guava_java__host",
-        "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__header",
-        "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__host",
-        "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__header",
-        "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__host",
-        "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__header",
-        "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__host",
-        "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__header",
-        "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__host",
-        "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__header",
-        "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__host",
-        "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__header",
-        "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__host",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__header",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__host",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__header",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__host",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__header",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__host",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__header",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__host",
-        "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__header",
-        "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__host",
-        "cronet_aml_third_party_android_sdk_android_sdk_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_sdk_android_sdk_java__header",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__build_config_crbug_908819",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__compile_java",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__header",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__host",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__java_binary_script",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_java__build_config_crbug_908819",
-        "cronet_aml_url_url_java__compile_java",
-        "cronet_aml_url_url_java__errorprone",
-        "cronet_aml_url_url_java__header",
-        "cronet_aml_url_url_java__process_device",
         "cronet_aml_url_url_jni_headers",
     ],
     export_generated_headers: [
         "cronet_aml_base_debugging_buildflags",
-        "cronet_aml_base_jni_java__build_config_crbug_908819",
-        "cronet_aml_base_jni_java__compile_java",
-        "cronet_aml_base_jni_java__errorprone",
-        "cronet_aml_base_jni_java__header",
-        "cronet_aml_base_jni_java__host",
-        "cronet_aml_base_jni_java__validate",
         "cronet_aml_base_logging_buildflags",
-        "cronet_aml_build_android_build_config_gen",
-        "cronet_aml_build_android_build_java__build_config_crbug_908819",
-        "cronet_aml_build_android_build_java__compile_java",
-        "cronet_aml_build_android_build_java__errorprone",
-        "cronet_aml_build_android_build_java__header",
-        "cronet_aml_build_android_build_java__host",
-        "cronet_aml_build_android_build_java__process_device",
-        "cronet_aml_build_android_build_java__validate",
-        "cronet_aml_build_android_bytecode_bytecode_processor__build_config_crbug_908819",
-        "cronet_aml_build_android_bytecode_bytecode_processor__java_binary_script",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__build_config_crbug_908819",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__compile_java",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__errorprone",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__header",
-        "cronet_aml_build_android_bytecode_bytecode_processor_java__host",
-        "cronet_aml_build_android_native_libraries_gen",
         "cronet_aml_build_chromeos_buildflags",
-        "cronet_aml_third_party_android_deps_auto_service_processor__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__header",
-        "cronet_aml_third_party_android_deps_com_github_ben_manes_caffeine_caffeine_java__host",
-        "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__header",
-        "cronet_aml_third_party_android_deps_com_github_kevinstern_software_and_algorithms_java__host",
-        "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__header",
-        "cronet_aml_third_party_android_deps_com_google_auto_auto_common_java__host",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_auto_service_auto_service_java__host",
-        "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_auto_value_auto_value_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__header",
-        "cronet_aml_third_party_android_deps_com_google_code_findbugs_jsr305_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotation_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_check_api_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_core_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_error_prone_type_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__header",
-        "cronet_aml_third_party_android_deps_com_google_errorprone_javac_java__host",
-        "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__header",
-        "cronet_aml_third_party_android_deps_com_google_guava_failureaccess_java__host",
-        "cronet_aml_third_party_android_deps_com_google_guava_guava_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_guava_guava_java__header",
-        "cronet_aml_third_party_android_deps_com_google_guava_guava_java__host",
-        "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__header",
-        "cronet_aml_third_party_android_deps_com_google_guava_listenablefuture_java__host",
-        "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__header",
-        "cronet_aml_third_party_android_deps_com_google_j2objc_j2objc_annotations_java__host",
-        "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__header",
-        "cronet_aml_third_party_android_deps_com_google_protobuf_protobuf_java_java__host",
-        "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__header",
-        "cronet_aml_third_party_android_deps_io_github_java_diff_utils_java_diff_utils_java__host",
-        "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__header",
-        "cronet_aml_third_party_android_deps_org_checkerframework_checker_qual_java__host",
-        "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__header",
-        "cronet_aml_third_party_android_deps_org_checkerframework_dataflow_errorprone_java__host",
-        "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__header",
-        "cronet_aml_third_party_android_deps_org_eclipse_jgit_org_eclipse_jgit_java__host",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__header",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_analysis_java__host",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__header",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_java__host",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__header",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_tree_java__host",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__header",
-        "cronet_aml_third_party_android_deps_org_ow2_asm_asm_util_java__host",
-        "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__header",
-        "cronet_aml_third_party_android_deps_org_pcollections_pcollections_java__host",
-        "cronet_aml_third_party_android_sdk_android_sdk_java__build_config_crbug_908819",
-        "cronet_aml_third_party_android_sdk_android_sdk_java__header",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__build_config_crbug_908819",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__compile_java",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__header",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__host",
-        "cronet_aml_tools_android_errorprone_plugin_errorprone_plugin__java_binary_script",
         "cronet_aml_url_buildflags",
-        "cronet_aml_url_url_java__build_config_crbug_908819",
-        "cronet_aml_url_url_java__compile_java",
-        "cronet_aml_url_url_java__errorprone",
-        "cronet_aml_url_url_java__header",
-        "cronet_aml_url_url_java__process_device",
         "cronet_aml_url_url_jni_headers",
     ],
     defaults: [
@@ -10345,388 +5520,6 @@
     cpp_std: "c++20",
 }
 
-// GN: //url:url_java__build_config_crbug_908819
-genrule {
-    name: "cronet_aml_url_url_java__build_config_crbug_908819",
-    cmd: "$(location build/android/gyp/write_build_config.py) --type " +
-         "java_library " +
-         " " +
-         " " +
-         "--deps-configs " +
-         "[\"$(location base/jni_java.build_config.json)\", \"$(location third_party/android_sdk/android_sdk_java.build_config.json)\"] " +
-         "--public-deps-configs " +
-         "[] " +
-         "--build-config " +
-         "$(genDir)/url/url_java.build_config.json " +
-         "--gn-target " +
-         "//url:url_java " +
-         "--device-jar-path " +
-         "$(location url/url_java.processed.jar) " +
-         "--host-jar-path " +
-         "$(location lib.java/url/url_java.jar) " +
-         "--unprocessed-jar-path " +
-         "$(location url/url_java.javac.jar) " +
-         "--interface-jar-path " +
-         "$(location url/url_java.turbine.jar) " +
-         "--dex-path " +
-         "obj/url/url_java.dex.jar " +
-         "--supports-android " +
-         "--requires-android " +
-         "--java-sources-file " +
-         "gen/url/url_java.sources " +
-         "--bundled-srcjars " +
-         "[]",
-    out: [
-        "url/url_java.build_config.json",
-    ],
-    tool_files: [
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/resource_utils.py",
-        "build/android/gyp/write_build_config.py",
-        "build/gn_helpers.py",
-        "third_party/jinja2/__init__.py",
-        "third_party/jinja2/_compat.py",
-        "third_party/jinja2/_identifier.py",
-        "third_party/jinja2/bccache.py",
-        "third_party/jinja2/compiler.py",
-        "third_party/jinja2/defaults.py",
-        "third_party/jinja2/environment.py",
-        "third_party/jinja2/exceptions.py",
-        "third_party/jinja2/filters.py",
-        "third_party/jinja2/idtracking.py",
-        "third_party/jinja2/lexer.py",
-        "third_party/jinja2/loaders.py",
-        "third_party/jinja2/nodes.py",
-        "third_party/jinja2/optimizer.py",
-        "third_party/jinja2/parser.py",
-        "third_party/jinja2/runtime.py",
-        "third_party/jinja2/tests.py",
-        "third_party/jinja2/utils.py",
-        "third_party/jinja2/visitor.py",
-        "third_party/markupsafe/__init__.py",
-        "third_party/markupsafe/_compat.py",
-        "third_party/markupsafe/_native.py",
-    ],
-}
-
-// GN: //url:url_java__compile_java
-genrule {
-    name: "cronet_aml_url_url_java__compile_java",
-    srcs: [
-        "url/android/java/src/org/chromium/url/IDNStringUtil.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/url/url_java__compile_java.d " +
-         "--generated-dir " +
-         "gen/url/url_java/generated_java " +
-         "--jar-path " +
-         "obj/url/url_java.javac.jar " +
-         "--java-srcjars " +
-         "[\"gen/url/url_java.generated.srcjar\"] " +
-         "--target-name " +
-         "//url:url_java__compile_java " +
-         "--classpath " +
-         "@FileArg(gen/url/url_java.build_config.json:android:sdk_interface_jars) " +
-         "--header-jar " +
-         "obj/url/url_java.turbine.jar " +
-         "--classpath " +
-         "[\"obj/url/url_java.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/url/url_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "--jar-info-exclude-globs " +
-         "[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/GEN_JNI.class\"] " +
-         "@gen/url/url_java.sources",
-    out: [
-        "//out/test/obj/url/url_java.javac.jar",
-        "//out/test/obj/url/url_java.javac.jar.info",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/url/url_java.build_config.json",
-        "out/test/gen/url/url_java.generated.srcjar",
-        "out/test/gen/url/url_java.sources",
-        "out/test/obj/url/url_java.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //url:url_java__dex
-genrule {
-    name: "cronet_aml_url_url_java__dex",
-    cmd: "$(location build/android/gyp/dex.py) --depfile " +
-         "gen/url/url_java__dex.d " +
-         "--output " +
-         "obj/url/url_java.dex.jar " +
-         "--min-api " +
-         "19 " +
-         "--r8-jar-path " +
-         "../../third_party/r8/lib/r8.jar " +
-         "--custom-d8-jar-path " +
-         "../../third_party/r8/custom_d8.jar " +
-         "--incremental-dir " +
-         "obj/url/url_java__dex " +
-         "--library " +
-         "--class-inputs " +
-         "[\"obj/url/url_java.processed.jar\"] " +
-         "--desugar " +
-         "--desugar-jdk-libs-json " +
-         "../../third_party/r8/desugar_jdk_libs.json " +
-         "--show-desugar-default-interface-warnings " +
-         "--classpath " +
-         "obj/url/url_java.javac.jar " +
-         "--desugar-dependencies " +
-         "gen/url/url_java__dex.desugardeps " +
-         "--bootclasspath " +
-         "@FileArg(gen/url/url_java.build_config.json:android:sdk_jars) " +
-         "--classpath " +
-         "@FileArg(gen/url/url_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--force-enable-assertions",
-    out: [
-        "//out/test/obj/url/url_java.dex.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/dex.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/zipalign.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/obj/url/url_java.javac.jar",
-        "out/test/obj/url/url_java.processed.jar",
-        "third_party/r8/custom_d8.jar",
-        "third_party/r8/d8/lib/r8.jar",
-        "third_party/r8/desugar_jdk_libs.json",
-    ],
-}
-
-// GN: //url:url_java__errorprone
-genrule {
-    name: "cronet_aml_url_url_java__errorprone",
-    srcs: [
-        "url/android/java/src/org/chromium/url/IDNStringUtil.java",
-    ],
-    cmd: "$(location build/android/gyp/compile_java.py) --depfile " +
-         "gen/url/url_java__errorprone.d " +
-         "--generated-dir " +
-         "gen/url/url_java/generated_java " +
-         "--jar-path " +
-         "obj/url/url_java__errorprone.errorprone.stamp " +
-         "--java-srcjars " +
-         "[\"gen/url/url_java.generated.srcjar\"] " +
-         "--target-name " +
-         "//url:url_java__errorprone " +
-         "--classpath " +
-         "@FileArg(gen/url/url_java.build_config.json:android:sdk_interface_jars) " +
-         "--header-jar " +
-         "obj/url/url_java.turbine.jar " +
-         "--classpath " +
-         "[\"obj/url/url_java.turbine.jar\"] " +
-         "--classpath " +
-         "@FileArg(gen/url/url_java.build_config.json:deps_info:javac_full_interface_classpath) " +
-         "--chromium-code " +
-         "1 " +
-         "--jar-info-exclude-globs " +
-         "[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/GEN_JNI.class\"] " +
-         "--processorpath " +
-         "@FileArg(gen/tools/android/errorprone_plugin/errorprone_plugin.build_config.json:deps_info:host_classpath) " +
-         "--enable-errorprone " +
-         "@gen/url/url_java.sources",
-    out: [
-        "//out/test/obj/url/url_java__errorprone.errorprone.stamp",
-    ],
-    tool_files: [
-        "build/android/gyp/compile_java.py",
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/jar_info_utils.py",
-        "build/android/gyp/util/md5_check.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "build/print_python_deps.py",
-        "out/test/gen/url/url_java.build_config.json",
-        "out/test/gen/url/url_java.generated.srcjar",
-        "out/test/gen/url/url_java.sources",
-        "out/test/obj/url/url_java.turbine.jar",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //url:url_java__header
-genrule {
-    name: "cronet_aml_url_url_java__header",
-    srcs: [
-        "url/android/java/src/org/chromium/url/IDNStringUtil.java",
-    ],
-    cmd: "$(location build/android/gyp/turbine.py) --depfile " +
-         "gen/url/url_java__header.d " +
-         "--generated-dir " +
-         "gen/url/url_java/generated_java " +
-         "--jar-path " +
-         "obj/url/url_java.turbine.jar " +
-         "--java-srcjars " +
-         "[] " +
-         "--target-name " +
-         "//url:url_java__header " +
-         "--classpath " +
-         "@FileArg(gen/url/url_java.build_config.json:android:sdk_interface_jars) " +
-         "--classpath " +
-         "@FileArg(gen/url/url_java.build_config.json:javac:interface_classpath) " +
-         "--processorpath " +
-         "@FileArg(gen/url/url_java.build_config.json:javac:processor_classpath) " +
-         "--processors " +
-         "@FileArg(gen/url/url_java.build_config.json:javac:processor_classes) " +
-         "--turbine-jar-path " +
-         "../../third_party/turbine/turbine.jar " +
-         "--generated-jar-path " +
-         "gen/url/url_java.generated.srcjar " +
-         "--chromium-code " +
-         "1 " +
-         "--jar-info-exclude-globs " +
-         "[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/GEN_JNI.class\"] " +
-         "@gen/url/url_java.sources",
-    out: [
-        "//out/test/obj/url/url_java.turbine.jar",
-        "url/url_java.generated.srcjar",
-    ],
-    tool_files: [
-        "build/android/gyp/javac_output_processor.py",
-        "build/android/gyp/turbine.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/list_java_targets.py",
-        "build/android/pylib/__init__.py",
-        "build/android/pylib/constants/__init__.py",
-        "build/gn_helpers.py",
-        "out/test/gen/url/url_java.build_config.json",
-        "out/test/gen/url/url_java.sources",
-        "third_party/catapult/devil/devil/__init__.py",
-        "third_party/catapult/devil/devil/android/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/__init__.py",
-        "third_party/catapult/devil/devil/android/constants/chrome.py",
-        "third_party/catapult/devil/devil/android/sdk/__init__.py",
-        "third_party/catapult/devil/devil/android/sdk/keyevent.py",
-        "third_party/catapult/devil/devil/android/sdk/version_codes.py",
-        "third_party/catapult/devil/devil/constants/__init__.py",
-        "third_party/catapult/devil/devil/constants/exit_codes.py",
-        "third_party/colorama/src/colorama/__init__.py",
-        "third_party/colorama/src/colorama/ansi.py",
-        "third_party/colorama/src/colorama/ansitowin32.py",
-        "third_party/colorama/src/colorama/initialise.py",
-        "third_party/colorama/src/colorama/win32.py",
-        "third_party/colorama/src/colorama/winterm.py",
-        "third_party/turbine/turbine.jar",
-        "tools/android/modularization/convenience/lookup_dep.py",
-    ],
-}
-
-// GN: //url:url_java__process_device
-genrule {
-    name: "cronet_aml_url_url_java__process_device",
-    cmd: "$(location build/android/gyp/filter_zip.py) --input " +
-         "obj/url/url_java.javac.jar " +
-         "--output " +
-         "obj/url/url_java.processed.jar " +
-         "--exclude-globs " +
-         "[\"*/R.class\", \"*/R\\$*.class\", \"*/Manifest.class\", \"*/Manifest\\$*.class\", \"*/GEN_JNI.class\"] " +
-         "--include-globs " +
-         "[]",
-    out: [
-        "//out/test/obj/url/url_java.processed.jar",
-    ],
-    tool_files: [
-        "build/android/gyp/filter_zip.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/gn_helpers.py",
-        "out/test/obj/url/url_java.javac.jar",
-    ],
-}
-
-// GN: //url:url_java__validate
-genrule {
-    name: "cronet_aml_url_url_java__validate",
-    cmd: "$(location build/android/gyp/bytecode_processor.py) --target-name " +
-         "//url:url_java__validate " +
-         "--script " +
-         "bin/helper/bytecode_processor " +
-         "--gn-target " +
-         "//url:url_java " +
-         "--input-jar " +
-         "obj/url/url_java.javac.jar " +
-         "--stamp " +
-         "obj/url/url_java__validate.bytecode.stamp " +
-         "--direct-classpath-jars " +
-         "@FileArg(gen/url/url_java.build_config.json:javac:classpath) " +
-         "--full-classpath-jars " +
-         "@FileArg(gen/url/url_java.build_config.json:deps_info:javac_full_classpath) " +
-         "--full-classpath-gn-targets " +
-         "@FileArg(gen/url/url_java.build_config.json:deps_info:javac_full_classpath_targets) " +
-         "--sdk-classpath-jars " +
-         "@FileArg(gen/url/url_java.build_config.json:android:sdk_jars)",
-    out: [
-        "//out/test/obj/url/url_java__validate.bytecode.stamp",
-    ],
-    tool_files: [
-        "build/android/gyp/bytecode_processor.py",
-        "build/android/gyp/util/__init__.py",
-        "build/android/gyp/util/build_utils.py",
-        "build/android/gyp/util/server_utils.py",
-        "build/gn_helpers.py",
-        "out/test/bin/helper/bytecode_processor",
-        "out/test/gen/url/url_java.build_config.json",
-        "out/test/obj/url/url_java.javac.jar",
-    ],
-}
-
 // GN: //url:url_jni_headers
 genrule {
     name: "cronet_aml_url_url_jni_headers",
@@ -10756,6 +5549,7 @@
         "url/url_jni_headers/Origin_jni.h",
     ],
     tool_files: [
+        "base/android/jni_generator/android_jar.classes",
         "base/android/jni_generator/jni_generator.py",
         "build/android/gyp/util/__init__.py",
         "build/android/gyp/util/build_utils.py",
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index f157b22..67940af 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -32,6 +32,7 @@
 import os
 import re
 import sys
+import copy
 
 import gn_utils
 
@@ -88,7 +89,7 @@
 defaults_module = module_prefix + 'defaults'
 
 # Location of the project in the Android source tree.
-tree_path = 'external/perfetto'
+tree_path = 'external/chromium_org'
 
 # Path for the protobuf sources in the standalone build.
 buildtools_protobuf_src = '//buildtools/protobuf/src'
@@ -856,27 +857,54 @@
     # Specifying file under $(genDir) so that parent directory exists.
     # If this file is used by other module, we may need to add this file to the outputs.
     target.args[2] = '$(genDir)/' + target.args[2].split('/')[-1]
+  elif target.script == "//tools/grit/grit.py":
+    for i, val in enumerate(target.args):
+      if val == '-i':
+        # Delete leading ../..
+        filename = re.sub('^\.\./\.\./', '', target.args[i + 1])
+        target.args[i + 1] = '$(location %s)' % filename
+      elif val == '-o':
+        filename = re.sub('^gen/', '', target.args[i + 1])
+        if filename == "net":
+          # This is a directory not a file
+          target.args[i + 1] = '$(genDir)/net'
+        else:
+          # This is an output fil
+          target.args[i + 1] = '$(location %s)' % filename
+      elif val == '--depfile':
+        # The depfile is replaced by adding /tools/**/*.py to the tools_files
+        # This is basically just globbing all the needed sources by hardcoding.
+        module.tool_files.update([
+            "tools/grit/**/*.py",
+            "third_party/six/src/six.py" # This is not picked up by default. Must be added
+        ])
+
+        # Delete the depfile argument
+        target.args[i] = ' '
+        target.args[i + 1] = ' '
+      elif val == '--input':
+        # Delete leading ../..
+        filename = re.sub('^\.\./\.\./', '', target.args[i + 1])
+        # This is an output file so use $(location %s)
+        target.args[i + 1] = '$(location %s)' % filename
   elif target.script == "//tools/protoc_wrapper/protoc_wrapper.py":
     # Use protoc in the android
     module.tools.add("aprotoc")
-    target.outputs = [re.sub('^//out/test/', '', out) for out in target.outputs]
+    target.outputs = [os.path.basename(out) for out in target.outputs]
     for i, val in enumerate(target.args):
       if val == '--protoc':
         target.args[i + 1] = '$(location aprotoc)'
       elif val == '--proto-in-dir':
-        # Proto files in the cmd is relative path from --proto-in-dir
-        # Proto files are specified as filenames without directory except net_quic_proto_gen
-        # So getting directory from source file
-        proto_file = gn_utils.label_to_path(sorted(list(target.sources))[0])
-        target.args[i + 1] = '`dirname $(location %s)`' % proto_file
-        # Adjusting path for net_quic_proto_gen
-        if target.name == "//net/third_party/quiche:net_quic_proto_gen":
-          target.args[i + 1] += '/../../../../'
+        # --proto-in-dir is a relative directory from Android croot.
+        # TODO: deleting the leading ../../ is a very common operation -- put
+        # it in a function.
+        proto_path = re.sub('^\.\./\.\./', '', target.args[i + 1])
+        target.args[i + 1] = tree_path + '/' + proto_path
       elif val == '--cc-out-dir':
-        target.args[i + 1] = re.sub('^gen', '$(genDir)', target.args[i + 1])
+        target.args[i + 1] = '$(genDir)'
       elif val == 'dllexport_decl':
         # Needs to be dllexport_decl=value format
-        target.args[i] += '=' + target.args[i+1]
+        target.args[i] = '%s=\'%s\'' % (target.args[i], target.args[i + 1])
         target.args[i+1] = ''
       elif val == '--include':
         # This file can be got from filegroup this target depends on, but currently we don't add .h
@@ -885,7 +913,9 @@
         module.srcs.add(target.args[i+1])
         target.args[i + 1] = '$(location %s)' % target.args[i + 1]
       elif val == "--py-out-dir":
-        target.args[i + 1] = '$(genDir)/' + target.args[i + 1]
+        # pb2.py files are not used by others.
+        target.args[i] = ''
+        target.args[i + 1] = ''
 
   script = gn_utils.label_to_path(target.script)
   module.tool_files.add(script)
@@ -937,6 +967,20 @@
   elif target.script == "//tools/grit/stamp_grit_sources.py":
     # stamp_grit_sources.py is not executable
     module.cmd = "python " + module.cmd
+  elif target.script == "//tools/protoc_wrapper/protoc_wrapper.py":
+    # Split module to source module and header module.
+    # Source module has the .cc files and header module has the .h files in the out.
+    header_module = copy.deepcopy(module)
+    header_module.name += "_headers"
+    header_module.out = [file for file in header_module.out if os.path.splitext(file)[1] == '.h']
+    module.out = [file for file in module.out if os.path.splitext(file)[1] == '.cc']
+    module.genrule_headers.add(header_module.name)
+    module.genrule_srcs.add(':' + module.name)
+    blueprint.add_module(header_module)
+  elif target.script == "//base/android/jni_generator/jni_generator.py":
+    # android_jar.classes should be part of the tools as it list implicit classes
+    # for the script to generate JNI headers.
+    module.tool_files.add("base/android/jni_generator/android_jar.classes")
 
   blueprint.add_module(module)
   return module
@@ -1017,7 +1061,7 @@
   module.srcs.update(
       gn_utils.label_to_path(src)
       for src in target.sources
-      if is_supported_source_file(src))
+      if is_supported_source_file(src) and not src.startswith("//out/test"))
 
   local_include_dirs_set = set()
   if target.type in gn_utils.LINKER_UNIT_TYPES:
@@ -1131,6 +1175,11 @@
 
   return module
 
+def create_java_module(blueprint, gn):
+  bp_module_name = module_prefix + 'java'
+  module = Module('java_library', bp_module_name, '//gn:java')
+  module.srcs.update([gn_utils.label_to_path(source) for source in gn.java_sources])
+  blueprint.add_module(module)
 
 def create_blueprint_for_targets(gn, desc, targets):
   """Generate a blueprint for a list of GN targets."""
@@ -1153,6 +1202,8 @@
 
   for target in targets:
     create_modules_from_target(blueprint, gn, target)
+
+  create_java_module(blueprint, gn)
   return blueprint
 
 
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index 686003c..589b12a 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -20,6 +20,7 @@
 import errno
 import filecmp
 import json
+import logging as log
 import os
 import re
 import shutil
@@ -169,6 +170,7 @@
     self.source_sets = {}
     self.actions = {}
     self.proto_libs = {}
+    self.java_sources = set()
 
   def _get_response_file_contents(self, action_desc):
     # response_file_contents are formatted as:
@@ -185,6 +187,13 @@
 
     return ' '.join(formatted_flags)
 
+  def _is_java_target(self, target):
+    # Per https://chromium.googlesource.com/chromium/src/build/+/HEAD/android/docs/java_toolchain.md
+    # java target names must end in "_java".
+    # TODO: There are some other possible variations we might need to support.
+    return re.match('.*_java$', target.name)
+
+
   def get_target(self, gn_target_name):
     """Returns a Target object from the fully qualified GN target name.
 
@@ -243,6 +252,11 @@
     elif target.type == 'copy':
       # TODO: copy rules are not currently implemented.
       self.actions[gn_target_name] = target
+    elif target.type == 'group' and self._is_java_target(target):
+      # java_group identifies the group target generated by the android_library
+      # or java_library template. A java_group must not be added as a dependency, but sources are collected
+      log.debug('Found java target %s', target.name)
+      target.type = 'java_group'
 
     # Default for 'public' is //* - all headers in 'sources' are public.
     # TODO(primiano): if a 'public' section is specified (even if empty), then
@@ -278,6 +292,23 @@
           target.deps.add(dep_name)
       elif dep.type in LINKER_UNIT_TYPES:
         target.deps.add(dep_name)
+      elif dep.type == 'java_group':
+        # Explicitly break dependency chain when a java_group is added.
+        # Java sources are collected and eventually compiled as one large
+        # java_library.
+        pass
+
+      # Collect java sources. Java sources are kept inside the __compile_java target.
+      # This target can be used for both host and target compilation; only add
+      # the sources if they are destined for the target (i.e. they are a
+      # dependency of the __dex target)
+      # Note: this skips prebuilt java dependencies. These will have to be
+      # added manually when building the jar.
+      if re.match('.*__dex$', target.name):
+        if re.match('.*__compile_java$', dep.name):
+          log.debug('Adding java sources for %s', dep.name)
+          java_srcs = [src for src in dep.inputs if os.path.splitext(src)[1] == '.java']
+          self.java_sources.update(java_srcs)
 
     return target
 
@@ -322,10 +353,10 @@
     gen_desc = self.gn_desc_.get('%s_gen%s' % (name, toolchain))
     if gen_desc is None or gen_desc['type'] != 'action':
       return None, None
-    args = gen_desc.get('args', [])
-    if '/protoc' not in args[0]:
+    if gen_desc['script'] != '//tools/protoc_wrapper/protoc_wrapper.py':
       return None, None
     plugin = 'proto'
+    args = gen_desc.get('args', [])
     for arg in (arg for arg in args if arg.startswith('--plugin=')):
       # |arg| at this point looks like:
       #  --plugin=protoc-gen-plugin=gcc_like_host/protozero_plugin