diff options
| author | Xavier Ducrohet <xav@google.com> | 2013-07-29 21:10:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-29 21:10:12 +0000 |
| commit | af89b043e636532820d00120c9fb0070cedd28cc (patch) | |
| tree | 41bb53b60e9c3863bee46db5385d91ea0d939372 | |
| parent | 70381c4210dd4dd12a2fe98e91a229d05c41dd47 (diff) | |
| parent | 32923407563b7e2c943cf372e3cd9d4398d09789 (diff) | |
| download | base-tools_r22.tar.gz | |
Merge "Fix Ant issue." into tools_r22tools_r22
| -rw-r--r-- | legacy/ant-tasks/src/main/java/com/android/ant/RenderScriptTask.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/legacy/ant-tasks/src/main/java/com/android/ant/RenderScriptTask.java b/legacy/ant-tasks/src/main/java/com/android/ant/RenderScriptTask.java index fa1a19a618..488747e3db 100644 --- a/legacy/ant-tasks/src/main/java/com/android/ant/RenderScriptTask.java +++ b/legacy/ant-tasks/src/main/java/com/android/ant/RenderScriptTask.java @@ -95,10 +95,11 @@ public class RenderScriptTask extends MultiFilesTask { var.setValue(mBuildToolsRoot); if (SdkConstants.CURRENT_PLATFORM == SdkConstants.PLATFORM_DARWIN) { var.setKey("DYLD_LIBRARY_PATH"); + task.addEnv(var); } else if (SdkConstants.CURRENT_PLATFORM == SdkConstants.PLATFORM_LINUX) { var.setKey("LD_LIBRARY_PATH"); + task.addEnv(var); } - task.addEnv(var); for (String path : mIncludePath.list()) { File res = new File(path); |