MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

pass path instead of VFs to AndroidIdl

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-01-20 16:44:18 +04:00
parent ed5fab5a6a
commit e1874a1d43
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/compiler/AndroidIdlCompiler.java
+4 -1
View File
@@ -227,8 +227,11 @@ public class AndroidIdlCompiler implements SourceGeneratingCompiler {
try {
VirtualFile[] sourceRoots = AndroidPackagingCompiler.getSourceRootsForModuleAndDependencies(idlItem.myModule);
final String[] sourceRootPaths = AndroidCompileUtil.toOsPaths(sourceRoots);
final Map<CompilerMessageCategory, List<String>> messages = AndroidIdl
.execute(idlItem.myAndroidTarget, idlItem.myFile.getPath(), idlItem.myGeneratedFile.getPath(), sourceRoots);
.execute(idlItem.myAndroidTarget, idlItem.myFile.getPath(), idlItem.myGeneratedFile.getPath(), sourceRootPaths);
ApplicationManager.getApplication().runReadAction(new Runnable() {
public void run() {
if (context.getProject().isDisposed()) return;
plugins/android/src/org/jetbrains/android/compiler/tools/AndroidIdl.java
+6 -5
View File
@@ -17,13 +17,14 @@ package org.jetbrains.android.compiler.tools;
import com.android.sdklib.IAndroidTarget;
import com.intellij.openapi.compiler.CompilerMessageCategory;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import org.jetbrains.android.util.ExecutionUtil;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* IDL compiler.
@@ -38,13 +39,13 @@ public final class AndroidIdl {
public static Map<CompilerMessageCategory, List<String>> execute(@NotNull IAndroidTarget target,
@NotNull String file,
@NotNull String outFile,
@NotNull VirtualFile[] sourceRoots) throws IOException {
@NotNull String[] sourceRootPaths) throws IOException {
List<String> commands = new ArrayList<String>();
String frameworkAidlPath = target.getPath(IAndroidTarget.ANDROID_AIDL);
commands.add(target.getPath(IAndroidTarget.AIDL));
commands.add("-p" + frameworkAidlPath);
for (VirtualFile root : sourceRoots) {
commands.add("-I" + root.getPath());
for (String path : sourceRootPaths) {
commands.add("-I" + path);
}
commands.add(file);
commands.add(outFile);