diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-28 18:06:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-28 18:06:34 +0000 |
| commit | 25c35f3c4ffd77e9f1843aa671773c97beb8c48b (patch) | |
| tree | 7ea3f77b199d267c64482701116915ebf019b259 | |
| parent | acd07efc13c29886d33d6cafb435830b76d12d63 (diff) | |
| parent | 441e3cf8013b8cb185db20018f694a7c3aa69115 (diff) | |
| download | idea-25c35f3c4ffd77e9f1843aa671773c97beb8c48b.tar.gz | |
Snap for 8878041 from 441e3cf8013b8cb185db20018f694a7c3aa69115 to studio-ee-release
Change-Id: I4b46a0d2e7c814ae0bc3635a842375b8dd631e07
| -rw-r--r-- | build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy | 1 | ||||
| -rw-r--r-- | java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy b/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy index 7c32a53e87b4..248d2d3141c8 100644 --- a/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy @@ -53,7 +53,6 @@ class AndroidStudioProperties extends BaseIdeaProperties { "intellij.android.plugin", "intellij.android.smali", "intellij.ant", - "intellij.devkit", "intellij.eclipse", "intellij.featuresTrainer", "intellij.gradle.dependencyUpdater", diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java index c8474f323cd6..29358538f536 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java @@ -99,7 +99,7 @@ public final class PackageUtil { } @NotNull - static Collection<AbstractTreeNode<?>> createPackageViewChildrenOnFiles(@NotNull List<? extends VirtualFile> sourceRoots, + public static Collection<AbstractTreeNode<?>> createPackageViewChildrenOnFiles(@NotNull List<? extends VirtualFile> sourceRoots, @NotNull Project project, @NotNull ViewSettings settings, @Nullable Module module, |