commit 37654cd3ab8b5960e8e0ec7083df0ed2f02217c1
author Neil Fuller <nfuller@google.com> Wed Sep 27 09:21:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 27 09:21:56 2017 +0000
tree 83fd06cea6007e4cfe507a2c8a09b6e87425d939
parent f2fa695ffd9a43c6dc9be00541756eb7a83f7dce
parent d6b13bfcd00a3517e2ba2a579672b4964c5a555f

Fix desugar on Mac platform builds am: 737bce336c
am: d6b13bfcd0

Change-Id: I276e7d83eb2f18a1fe3bf31570d2b9467e0f106c

src/vogar/android/AndroidSdk.java

diff --git a/src/vogar/android/AndroidSdk.java b/src/vogar/android/AndroidSdk.java
index 6072dac..fa8bccf 100644
--- a/src/vogar/android/AndroidSdk.java
+++ b/src/vogar/android/AndroidSdk.java
@@ -153,10 +153,18 @@
                 outDir += "/";
             }
 
+            String hostOutDir = System.getenv("ANDROID_HOST_OUT");
+            if (!Strings.isNullOrEmpty(hostOutDir)) {
+                log.verbose("Using ANDROID_HOST_OUT to find host libraries.");
+            } else {
+                // Handle the case where lunch hasn't been run. Guess the architecture.
+                log.warn("ANDROID_HOST_OUT not set. Assuming linux-x86");
+                hostOutDir = outDir + "/host/linux-x86";
+            }
+
             if (!useJack) {
-                File desugarJar = null;
-                String desugarPattern = outDir + "host/linux-x86/framework/desugar.jar";
-                desugarJar = new File(desugarPattern);
+                String desugarPattern = hostOutDir + "/framework/desugar.jar";
+                File desugarJar = new File(desugarPattern);
 
                 if (!desugarJar.exists()) {
                     throw new RuntimeException("Could not find " + desugarPattern);