joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

cronet: disable defaults in tm-mainline-prod

Browse source 
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
This commit is contained in:
Patrick Rohr 2023-01-12 22:51:33 -08:00
commit 4aac4d2c37
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tethering/common/TetheringLib/Android.bp
View file

@ -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