From 0de87bab4a5d9674134e088e583ae513431208c3 Mon Sep 17 00:00:00 2001
From: Mikkel Nygaard Ravn <mravn@google.com>
Date: Thu, 24 Aug 2017 12:48:41 +0200
Subject: [PATCH] Test bugfix: specify JAVA_HOME env (#11773)

---
 dev/devicelab/bin/tasks/gradle_plugin_test.dart | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev/devicelab/bin/tasks/gradle_plugin_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_test.dart
index 73a96c23a1..cfd9b5547d 100644
--- a/dev/devicelab/bin/tasks/gradle_plugin_test.dart
+++ b/dev/devicelab/bin/tasks/gradle_plugin_test.dart
@@ -85,16 +85,20 @@ bool _hasMultipleOccurrences(String text, Pattern pattern) {
 }
 
 class FlutterProject {
-  FlutterProject(this.parent, this.name);
+  FlutterProject(this.parent, this.name, this.javaPath);
 
-  Directory parent;
-  String name;
+  final Directory parent;
+  final String name;
+  final String javaPath;
 
   static Future<FlutterProject> create(Directory directory, String name) async {
     await inDirectory(directory, () async {
       await flutter('create', options: <String>[name]);
     });
-    return new FlutterProject(directory, name);
+    final String flutterDoctor = await evalFlutter('doctor');
+    final RegExp javaPathExtractor = new RegExp(r'Android Studio at (.*)');
+    final String javaPath = javaPathExtractor.firstMatch(flutterDoctor).group(1) + '/jre';
+    return new FlutterProject(directory, name, javaPath);
   }
 
   String get rootPath => path.join(parent.path, name);
@@ -157,6 +161,7 @@ android {
       './gradlew',
       <String>['app:$task'],
       workingDirectory: androidPath,
+      environment: <String, String>{ 'JAVA_HOME': javaPath }
     );
   }