From 4aac4d2c37c406d5402d945dfd5fc6e5a1cfd8ea Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Thu, 12 Jan 2023 22:51:33 -0800 Subject: [PATCH] cronet: disable defaults in tm-mainline-prod This should have never been enabled in tm-mainline-prod, but was brought in while fixing the automerger from aosp-master. Test: TH Merged-In: I5c00deb03c9c2718e139fb7639092419bf82a597 Change-Id: I395ef58b0f1af842cf3755a0a184d08a76b66538 --- Tethering/common/TetheringLib/Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index 3f4da10775..6a990eeee2 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp @@ -23,8 +23,8 @@ package { // specify a java_defaults target that either enables or disables Cronet. This // is used to disable Cronet on tm-mainline-prod. // Note: they must either both be enabled or disabled. -cronet_java_defaults = "CronetJavaDefaultsEnabled" -cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsEnabled" +cronet_java_defaults = "CronetJavaDefaultsDisabled" +cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsDisabled" // This is a placeholder comment to avoid merge conflicts // as cronet_defaults may have different values // depending on the branch