Merge "Make project build in open source" into studio-master-dev
diff --git a/.idea/.name b/.idea/.name
index 543de46e..4f352d3 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Android Studio (studio-3.4-dev)
\ No newline at end of file
+Android Studio 3.4.0
diff --git a/.idea/ant.xml b/.idea/ant.xml
index 795c16d..a7fdd20 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -6,10 +6,6 @@
<property name="work.idea.home" value="$APPLICATION_HOME_DIR$" />
</properties>
</buildFile>
- <buildFile url="file://$PROJECT_DIR$/../adt/idea/android/build.xml">
- <executeOn event="beforeCompilation" target="preBuild" />
- </buildFile>
- <buildFile url="file://$PROJECT_DIR$/../vendor/google3/blaze/build.xml" />
</component>
<component name="GantSettings">
<option name="SDK_HOME" value="$PROJECT_DIR$/build/lib/gant" />
diff --git a/.idea/libraries/aia_manifest_proto_1_0_jarjar.xml b/.idea/libraries/aia_manifest_proto_1_0_jarjar.xml
index dd03ad9..05811ba 100644
--- a/.idea/libraries/aia_manifest_proto_1_0_jarjar.xml
+++ b/.idea/libraries/aia_manifest_proto_1_0_jarjar.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="aia-manifest-proto-1.0-jarjar">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/../../bazel-genfiles/tools/base/sdk-common/aia-manifest-jar-generator/aia-manifest-proto-1.0-jarjar.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../adt/idea/android/lib/aia-manifest-proto-1.0-jarjar.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/studio_analytics_proto.xml b/.idea/libraries/studio_analytics_proto.xml
index 7763414..d0bbc63 100644
--- a/.idea/libraries/studio_analytics_proto.xml
+++ b/.idea/libraries/studio_analytics_proto.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="studio-analytics-proto">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/../../bazel-bin/tools/analytics-library/protos/src/main/proto/libstudio.proto.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../adt/idea/android/lib/libstudio.proto.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/studio_profiler_grpc_1_0_jarjar.xml b/.idea/libraries/studio_profiler_grpc_1_0_jarjar.xml
index f02a5e4..6f88d43 100644
--- a/.idea/libraries/studio_profiler_grpc_1_0_jarjar.xml
+++ b/.idea/libraries/studio_profiler_grpc_1_0_jarjar.xml
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="studio-profiler-grpc-1.0-jarjar">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/../../bazel-genfiles/tools/base/profiler/studio-profiler-grpc-1.0-jarjar.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../adt/idea/android/lib/studio-profiler-grpc-1.0-jarjar.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 5030e7f..349ba25 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -427,7 +427,6 @@
<module fileurl="file://$PROJECT_DIR$/../vendor/google/firebase/firebase.iml" filepath="$PROJECT_DIR$/../vendor/google/firebase/firebase.iml" />
<module fileurl="file://$PROJECT_DIR$/../studio/google/cloud/testing/firebase-testing/firebase-testing.iml" filepath="$PROJECT_DIR$/../studio/google/cloud/testing/firebase-testing/firebase-testing.iml" />
<module fileurl="file://$PROJECT_DIR$/../vendor/google/games/games.iml" filepath="$PROJECT_DIR$/../vendor/google/games/games.iml" />
- <module fileurl="file://$PROJECT_DIR$/../studio/google/appindexing/google-appindexing.iml" filepath="$PROJECT_DIR$/../studio/google/appindexing/google-appindexing.iml" />
<module fileurl="file://$PROJECT_DIR$/../studio/google/cloud/tools/android-studio-plugin/google-cloud-tools-as.iml" filepath="$PROJECT_DIR$/../studio/google/cloud/tools/android-studio-plugin/google-cloud-tools-as.iml" />
<module fileurl="file://$PROJECT_DIR$/../studio/google/cloud/tools/core-plugin/google-cloud-tools-core-as.iml" filepath="$PROJECT_DIR$/../studio/google/cloud/tools/core-plugin/google-cloud-tools-core-as.iml" />
<module fileurl="file://$PROJECT_DIR$/../studio/google/cloud/tools/google-login-plugin/google-login-as.iml" filepath="$PROJECT_DIR$/../studio/google/cloud/tools/google-login-plugin/google-login-as.iml" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 47c3efc..331c4b8 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -60,7 +60,6 @@
<mapping directory="$PROJECT_DIR$/../analytics-library" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../base" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../data-binding" vcs="Git" />
- <mapping directory="$PROJECT_DIR$/../studio/google/appindexing" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../studio/google/cloud/testing" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../studio/google/cloud/tools" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../studio/google/samples" vcs="Git" />
diff --git a/build.xml b/build.xml
index 3beb31b..1e1d014 100644
--- a/build.xml
+++ b/build.xml
@@ -44,9 +44,6 @@
<propertyref prefix="idea.gui.test."/>
<propertyref prefix="pass."/> <!-- handled by TestingTasksImpl.runTests -->
</propertyset>
- <ant antfile="${project.home}/../adt/idea/android/build.xml" target="preBuild">
- <property name="config" value="release"/>
- </ant>
</target>
<macrodef name="call_gant">
diff --git a/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy b/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy
index ec8c02b..a8a0043 100644
--- a/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy
@@ -50,21 +50,10 @@
"$home/../studio/google/cloud/tools/core-plugin/lib/licenses",
"$home/../studio/google/cloud/tools/google-login-plugin/lib/licenses",
"$home/../studio/google/services/lib/licenses",
- "$home/../vendor/google/firebase/lib/licenses",
)
productLayout.productApiModules = JAVA_API_MODULES
productLayout.productImplementationModules = JAVA_IMPLEMENTATION_MODULES +
- [
- // Android Studio: CIDR/CLion: Must be included here to be packaged into core, not as separate plugins
- "intellij.cidr.common",
- "intellij.cidr.debugger",
- "intellij.c",
- "intellij.c.dfa",
- "intellij.cidr.util",
- "intellij.c.doxygen",
- "intellij.cmake.psi",
- ] +
["intellij.platform.duplicates.analysis", "intellij.platform.structuralSearch", "intellij.java.structuralSearch", "intellij.java.typeMigration", "intellij.platform.main"] -
["intellij.platform.jps.model.impl", "intellij.platform.jps.model.serialization"]
productLayout.additionalPlatformJars.putAll("resources.jar", "intellij.idea.community.resources", "intellij.android.adt.branding")
@@ -81,13 +70,7 @@
productLayout.bundledPluginModules = BUNDLED_PLUGIN_MODULES +
[
- // Android Studio bundles these:
- "android-apk",
- "android-ndk",
- "firebase",
"firebase-testing",
- "games",
- "google-appindexing",
"google-login-as",
"google-cloud-tools-as",
"google-cloud-tools-core-as",
@@ -95,7 +78,6 @@
"google-services",
"intellij.android.smali",
"test-recorder",
- "url-assistant",
]
productLayout.mainModules = ["intellij.idea.community.main"]
productLayout.allNonTrivialPlugins = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS + [
@@ -274,22 +256,10 @@
// Profiler prebuilt binaries:
buildContext.ant.copy(todir: "$androidPluginLib") {
- fileset(file: "$root/bazel-genfiles/tools/base/profiler/studio-profiler-grpc-1.0-jarjar.jar")
+ fileset(file: "$root/tools/adt/idea/android/lib/studio-profiler-grpc-1.0-jarjar.jar")
}
buildContext.ant.copy(todir: "$androidPluginLib/../resources") {
- fileset(file: "$root/bazel-genfiles/tools/base/profiler/transform/profilers-transform.jar")
- }
- buildContext.ant.copy(todir: "$androidPluginLib/../resources") {
- fileset(file: "$root/bazel-genfiles/tools/base/profiler/app/perfa.jar")
- }
- buildContext.ant.copy(todir: "$androidPluginLib/../resources") {
- fileset(file: "$root/bazel-genfiles/tools/base/profiler/app/perfa_okhttp.dex")
- }
- buildContext.ant.copy(todir: "$androidPluginLib/../resources/perfd") {
- fileset(dir: "$root/bazel-bin/tools/base/profiler/native/perfd/android")
- }
- buildContext.ant.copy(todir: "$androidPluginLib/../resources/perfa") {
- fileset(dir: "$root/bazel-bin/tools/base/profiler/native/perfa/android")
+ fileset(dir: "$root/prebuilts/tools/common/android/resources")
}
buildContext.ant.copy(todir: "$androidPluginLib/../resources/simpleperf") {
fileset(dir: "$root/prebuilts/tools/common/simpleperf") {
@@ -297,11 +267,6 @@
}
}
- // Instant run
- buildContext.ant.copy(todir: "$androidPluginLib/../resources/installer") {
- fileset(dir: "$root/bazel-genfiles/tools/base/deploy/installer/android")
- }
-
// Native debugger.
buildContext.ant.copy(todir: "$targetDirectory/bin/lldb") {
fileset(dir: "$root/prebuilts/tools/common/lldb")
@@ -337,13 +302,6 @@
buildContext.ant.unzip(src: "$root/bazel-bin/tools/adt/idea/uitest-framework/uitest_deps.zip", dest: "$targetDirectory/gradle/m2repository")
}
- buildContext.ant.copy(todir: "$targetDirectory/gradle/m2repository") {
- fileset(dir: System.getenv().STUDIO_CUSTOM_REPO ?: "$root/prebuilts/tools/common/offline-m2") {
- exclude(name: "BUILD")
- }
- fileset(dir: "$root/out/studio/repo")
- }
-
buildContext.ant.unzip(
src: "$root/bazel-bin/tools/base/third_party/kotlin/kotlin-m2repository.zip",
dest: "$targetDirectory/gradle/m2repository")
diff --git a/build_studio.sh b/build_studio.sh
index 9d78858..cae8272 100755
--- a/build_studio.sh
+++ b/build_studio.sh
@@ -108,15 +108,3 @@
echo $BNUM > ../adt/idea/native/installer/win/version
(cd ../adt/idea/native/installer/win && zip -r - ".") > "$DIST"/android-studio-bundle-data.zip
fi
-
-# execute a bunch of sanity checks on the final artifacts
-../base/bazel/bazel test \
- //tools/idea:test_studio \
- --test_output=streamed \
- --test_arg=--out="$OUT" \
- --test_arg=--dist="$DIST" \
- --test_arg=--build=$BNUM \
- --test_arg=--aswb=$ASWB \
- --test_strategy=standalone \
- --spawn_strategy=standalone \
- --nocache_test_results
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 19e1368..3e11ed9 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -98,7 +98,6 @@
<orderEntry type="module" module-name="test-recorder" />
<orderEntry type="module" module-name="google-samples" />
<orderEntry type="module" module-name="google-services" />
- <orderEntry type="module" module-name="google-appindexing" />
<orderEntry type="module" module-name="url-assistant" />
<orderEntry type="module" module-name="intellij.tasks.jira" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.decompiler" scope="RUNTIME" />
