Commit a8a8f11e authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Use turbine when compiling third_party targets

Disabling is no longer necessary after latest R8 roll. It now
optimises away extra bridge methods.

Bug: 1056299
Change-Id: I85be3b0571500e47fd6f7c2c290c7e4d814086c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2169754
Commit-Queue: Sam Maier <smaier@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarSam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771603}
parent 04ec8880
...@@ -3317,9 +3317,7 @@ if (enable_java_templates) { ...@@ -3317,9 +3317,7 @@ if (enable_java_templates) {
_final_jar_path = invoker.final_jar_path _final_jar_path = invoker.final_jar_path
} }
# TODO(wnwen): Enable turbine for non-chromium code when r8 optimizes out _enable_turbine = _has_sources
# bridge methods.
_enable_turbine = _has_sources && _chromium_code
if (defined(invoker.enable_turbine)) { if (defined(invoker.enable_turbine)) {
_enable_turbine = invoker.enable_turbine _enable_turbine = invoker.enable_turbine
} }
......
...@@ -6,11 +6,5 @@ ...@@ -6,11 +6,5 @@
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
android_library("compositor_animator_java") { android_library("compositor_animator_java") {
# Turbine does not generate bridge methods in the parent class. Thus each
# child class generates its own bridge methods and adds a number of methods.
# This target would add about 30 methods if it enabled turbine. We are
# hoping to turn this back on once r8 can mitigate these extra methods.
enable_turbine = false
sources = [ "java/src/org/chromium/chrome/browser/compositor/animation/FloatProperty.java" ] sources = [ "java/src/org/chromium/chrome/browser/compositor/animation/FloatProperty.java" ]
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment