Skip to content

Commit ac9d258

Browse files
committed
do not copy the GVR jars
1 parent 206c2e6 commit ac9d258

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

mode/src/processing/mode/android/AndroidBuild.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class AndroidBuild extends JavaBuild {
7777
static {
7878
SUPPORT_VER = Preferences.get("android.sdk.support");
7979
if (SUPPORT_VER == null) {
80-
SUPPORT_VER = "25.3.1";
80+
SUPPORT_VER = "26.0.2";
8181
Preferences.set("android.sdk.support", SUPPORT_VER);
8282
}
8383
}
@@ -95,7 +95,7 @@ class AndroidBuild extends JavaBuild {
9595
static {
9696
WEAR_VER = Preferences.get("android.sdk.wear");
9797
if (WEAR_VER == null) {
98-
WEAR_VER = "2.0.5";
98+
WEAR_VER = "2.1.0";
9999
Preferences.set("android.sdk.wear", WEAR_VER);
100100
}
101101
}
@@ -104,7 +104,7 @@ class AndroidBuild extends JavaBuild {
104104
static {
105105
GVR_VER = Preferences.get("android.sdk.gvr");
106106
if (GVR_VER == null) {
107-
GVR_VER = "1.120.0";
107+
GVR_VER = "1.150.0";
108108
Preferences.set("android.sdk.gvr", GVR_VER);
109109
}
110110
}
@@ -875,9 +875,9 @@ private void copyImportedLibs(final File libsFolder,
875875
for (File exportFile : library.getAndroidExports()) {
876876
String exportName = exportFile.getName();
877877

878-
// Skip the GVR jars, because the full aar packages will be copied next
879-
if (exportName.toLowerCase().startsWith("gvr-")) continue;
880-
878+
// Skip the GVR jars, because the gradle will resolve the dependencies
879+
if (appComponent == VR && exportName.toLowerCase().startsWith("sdk-")) continue;
880+
881881
if (!exportFile.exists()) {
882882
System.err.println(exportFile.getName() +
883883
" is mentioned in export.txt, but it's " +

0 commit comments

Comments
 (0)