Add support for dynamically linked llvm-rs-cc

Change-Id: I801d59317e782a12ad82d00dec52d688061b470b

2 files changed, 13 insertions, 4 deletions

diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java
index 6e32247..9442f4d 100644
--- a/builder/src/main/java/com/android/builder/AndroidBuilder.java
+++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java
@@ -614,7 +614,7 @@ public class AndroidBuilder {
             command.add(symbolOutputDir);
         }
 
-        mCmdLineRunner.runCmdLine(command);
+        mCmdLineRunner.runCmdLine(command, null);
 
         // now if the project has libraries, R needs to be created for each libraries,
         // but only if the current project is not a library.
@@ -856,7 +856,16 @@ public class AndroidBuilder {
             command.add(sourceFile.getAbsolutePath());
         }
 
-        mCmdLineRunner.runCmdLine(command);
+        Map<String, String> env = null;
+        if (SdkConstants.CURRENT_PLATFORM == SdkConstants.PLATFORM_DARWIN) {
+            env = Maps.newHashMap();
+            env.put("DYLD_LIBRARY_PATH", mBuildTools.getLocation().getAbsolutePath());
+        } else if (SdkConstants.CURRENT_PLATFORM == SdkConstants.PLATFORM_LINUX) {
+            env = Maps.newHashMap();
+            env.put("LD_LIBRARY_PATH", mBuildTools.getLocation().getAbsolutePath());
+        }
+
+        mCmdLineRunner.runCmdLine(command, env);
     }
 
     /**
@@ -986,7 +995,7 @@ public class AndroidBuilder {
             command.add(proguardFile.getAbsolutePath());
         }
 
-        mCmdLineRunner.runCmdLine(command);
+        mCmdLineRunner.runCmdLine(command, null);
     }
 
     /**
diff --git a/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java b/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java
index 0539752..a50029e 100644
--- a/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java
@@ -79,7 +79,7 @@ public class AidlProcessor implements SourceSearcher.SourceFileProcessor {
 
         command.add(sourceFile.getAbsolutePath());
 
-        mRunner.runCmdLine(command);
+        mRunner.runCmdLine(command, null);
 
         // send the dependency file to the processor.
         if (mDependencyFileProcessor.processFile(depFile)) {