Skip to content
Snippets Groups Projects
Commit a2aa12db authored by Patrick Rohr's avatar Patrick Rohr
Browse files

cronet: enable defaults

This change has already been merged in aosp-master with a Merged-In line
of a change that was merged into tm-mainline-prod (to work around the
broken automerger).

Test: TH
Ignore-AOSP-First: This has already been merged in aosp/2374723.
Change-Id: I5c00deb03c9c2718e139fb7639092419bf82a597
parent df28a8b3
No related branches found
No related tags found
No related merge requests found
......@@ -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 = "CronetJavaDefaultsDisabled"
cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsDisabled"
cronet_java_defaults = "CronetJavaDefaultsEnabled"
cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsEnabled"
// This is a placeholder comment to avoid merge conflicts
// as cronet_defaults may have different values
// depending on the branch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment