diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-05 11:51:45 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-05 11:51:45 +0000 |
commit | f61caae787b9f79fa5431572279485e52b94a228 (patch) | |
tree | 00b1110715a885713758fda76c0c84718fa5398e | |
parent | ec6245b4ac97cd74bb8bbc04e63eac8f6d4fdc72 (diff) | |
parent | 04bec188d6c41ca77280fe147263438ded88babf (diff) | |
download | cronet-android14-mainline-art-release.tar.gz |
Snap for 11178562 from 04bec188d6c41ca77280fe147263438ded88babf to mainline-art-releaseaml_art_341411300android14-mainline-art-release
Change-Id: I0c97edcda356f3de7a5f69537728f551807ac9e7
-rw-r--r-- | Android.bp | 20 | ||||
-rw-r--r-- | android/java/src/android/net/http/CronetLoggerImpl.java | 29 | ||||
-rw-r--r-- | android/java/src/android/net/http/UploadDataProviderWrapper.java | 5 | ||||
-rwxr-xr-x | android/tools/gn2bp/gen_android_bp | 8 |
4 files changed, 40 insertions, 22 deletions
diff --git a/Android.bp b/Android.bp index 4296c2ad4..27b4c9ea8 100644 --- a/Android.bp +++ b/Android.bp @@ -893,12 +893,15 @@ cc_genrule { "--input_file " + "java/lang/Runtime.class " + "--javap " + - "$$(find $${OUT_DIR:-out}/.path -name javap) " + + "$(location :javap) " + "--package_prefix " + "android.net.connectivity", out: [ "base/android_runtime_jni_headers/Runtime_jni.h", ], + tools: [ + ":javap", + ], tool_files: [ ":current_android_jar", "base/android/jni_generator/android_jar.classes", @@ -929,10 +932,13 @@ cc_genrule { "--input_file " + "java/lang/Runtime.class " + "--javap " + - "$$(find $${OUT_DIR:-out}/.path -name javap)", + "$(location :javap)", out: [ "base/android_runtime_jni_headers/Runtime_jni.h", ], + tools: [ + ":javap", + ], tool_files: [ ":current_android_jar", "base/android/jni_generator/android_jar.classes", @@ -964,12 +970,15 @@ cc_genrule { "--input_file " + "java/lang/Runnable.class " + "--javap " + - "$$(find $${OUT_DIR:-out}/.path -name javap) " + + "$(location :javap) " + "--package_prefix " + "android.net.connectivity", out: [ "base/android_runtime_unchecked_jni_headers/Runnable_jni.h", ], + tools: [ + ":javap", + ], tool_files: [ ":current_android_jar", "base/android/jni_generator/android_jar.classes", @@ -1001,10 +1010,13 @@ cc_genrule { "--input_file " + "java/lang/Runnable.class " + "--javap " + - "$$(find $${OUT_DIR:-out}/.path -name javap)", + "$(location :javap)", out: [ "base/android_runtime_unchecked_jni_headers/Runnable_jni.h", ], + tools: [ + ":javap", + ], tool_files: [ ":current_android_jar", "base/android/jni_generator/android_jar.classes", diff --git a/android/java/src/android/net/http/CronetLoggerImpl.java b/android/java/src/android/net/http/CronetLoggerImpl.java index 26421fb63..142bcc46d 100644 --- a/android/java/src/android/net/http/CronetLoggerImpl.java +++ b/android/java/src/android/net/http/CronetLoggerImpl.java @@ -19,26 +19,17 @@ package android.net.http; import static java.nio.charset.StandardCharsets.UTF_8; import android.util.Log; - import androidx.annotation.VisibleForTesting; - import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.concurrent.atomic.AtomicInteger; import org.chromium.net.impl.CronetLogger; -import org.chromium.net.impl.CronetLogger.CronetEngineBuilderInfo; -import org.chromium.net.impl.CronetLogger.CronetSource; -import org.chromium.net.impl.CronetLogger.CronetTrafficInfo; -import org.chromium.net.impl.CronetLogger.CronetVersion; /** Logger for logging cronet's telemetry */ public class CronetLoggerImpl extends CronetLogger { private static final String TAG = CronetLoggerImpl.class.getSimpleName(); - private static final long ENGINE_CREATED_ENGINE_ID_NOT_LOGGED = Long.MAX_VALUE; - private static final long TRAFFIC_REPORTED_ENGINE_ID_NOT_LOGGED = Long.MIN_VALUE; - private static final MessageDigest MD5_MESSAGE_DIGEST; static { @@ -76,7 +67,6 @@ public class CronetLoggerImpl extends CronetLogger { return; } - writeCronetEngineCreation(cronetEngineId, builder, version, source); } @@ -108,8 +98,7 @@ public class CronetLoggerImpl extends CronetLogger { CronetStatsLog.write( CronetStatsLog.CRONET_ENGINE_CREATED, - // TODO(b/248214707): Start logging the engine ID again. - ENGINE_CREATED_ENGINE_ID_NOT_LOGGED, + cronetEngineId, version.getMajorVersion(), version.getMinorVersion(), version.getBuildVersion(), @@ -146,7 +135,8 @@ public class CronetLoggerImpl extends CronetLogger { experimentalOptions.getStaleDnsPersistToDiskOption().getValue(), experimentalOptions.getStaleDnsPersistDelayMillisOption(), experimentalOptions.getStaleDnsUseStaleOnNameNotResolvedOption().getValue(), - experimentalOptions.getDisableIpv6OnWifiOption().getValue()); + experimentalOptions.getDisableIpv6OnWifiOption().getValue(), + /* cronet_initialization_ref = */ -1); } catch (Exception e) { // catching all exceptions since we don't want to crash the client Log.d( TAG, @@ -162,8 +152,7 @@ public class CronetLoggerImpl extends CronetLogger { try { CronetStatsLog.write( CronetStatsLog.CRONET_TRAFFIC_REPORTED, - // TODO(b/248214707): Start logging the engine ID again. - TRAFFIC_REPORTED_ENGINE_ID_NOT_LOGGED, + cronetEngineId, SizeBuckets.calcRequestHeadersSizeBucket(trafficInfo.getRequestHeaderSizeInBytes()), SizeBuckets.calcRequestBodySizeBucket(trafficInfo.getRequestBodySizeInBytes()), SizeBuckets.calcResponseHeadersSizeBucket(trafficInfo.getResponseHeaderSizeInBytes()), @@ -174,7 +163,14 @@ public class CronetLoggerImpl extends CronetLogger { (int) trafficInfo.getTotalLatency().toMillis(), trafficInfo.wasConnectionMigrationAttempted(), trafficInfo.didConnectionMigrationSucceed(), - samplesRateLimitedCount); + samplesRateLimitedCount, + /* terminal_state = */ CronetStatsLog.CRONET_TRAFFIC_REPORTED__TERMINAL_STATE__STATE_UNKNOWN, + /* user_callback_exception_count = */ -1, + /* total_idle_time_millis = */ -1, + /* total_user_executor_execute_latency_millis = */ -1, + /* read_count = */ -1, + /* on_upload_read_count = */ -1, + /* is_bidi_stream = */ CronetStatsLog.CRONET_TRAFFIC_REPORTED__IS_BIDI_STREAM__UNSET); // 0 maps to UNKNOWN } catch (Exception e) { // using addAndGet because another thread might have modified samplesRateLimited's value samplesRateLimited.addAndGet(samplesRateLimitedCount); @@ -224,4 +220,3 @@ public class CronetLoggerImpl extends CronetLogger { return ByteBuffer.wrap(md).getLong(); } } - diff --git a/android/java/src/android/net/http/UploadDataProviderWrapper.java b/android/java/src/android/net/http/UploadDataProviderWrapper.java index 59e48af7c..c26b88dbc 100644 --- a/android/java/src/android/net/http/UploadDataProviderWrapper.java +++ b/android/java/src/android/net/http/UploadDataProviderWrapper.java @@ -44,4 +44,9 @@ public class UploadDataProviderWrapper extends org.chromium.net.UploadDataProvid UploadDataSinkWrapper wrappedSink = new UploadDataSinkWrapper(sink); backend.rewind(wrappedSink); } + + @Override + public void close() throws IOException { + backend.close(); + } } diff --git a/android/tools/gn2bp/gen_android_bp b/android/tools/gn2bp/gen_android_bp index 5cca745b1..376ac1c34 100755 --- a/android/tools/gn2bp/gen_android_bp +++ b/android/tools/gn2bp/gen_android_bp @@ -953,7 +953,7 @@ class JniGeneratorSanitizer(BaseActionSanitizer): def _sanitize_args(self): self._set_value_arg('--jar_file', '$(location :current_android_jar)', False) if self._has_arg('--jar_file'): - self._append_arg('--javap', '$$(find $${OUT_DIR:-out}/.path -name javap)') + self._append_arg('--javap', '$(location :javap)') self._update_value_arg('--output_dir', self._sanitize_filepath) self._update_value_arg('--includes', self._sanitize_filepath, False) self._delete_value_arg('--prev_output_dir', False) @@ -980,6 +980,12 @@ class JniGeneratorSanitizer(BaseActionSanitizer): for file in tool_files } return tool_files + def get_tools(self): + tools = super().get_tools() + if self._has_arg('--jar_file'): + tools.add(":javap") + return tools + class JniRegistrationGeneratorSanitizer(BaseActionSanitizer): def __init__(self, target, arch, is_test_target): self.is_test_target = is_test_target |