@@ -77,7 +77,7 @@ class AndroidBuild extends JavaBuild {
77
77
static {
78
78
SUPPORT_VER = Preferences .get ("android.sdk.support" );
79
79
if (SUPPORT_VER == null ) {
80
- SUPPORT_VER = "25.3.1 " ;
80
+ SUPPORT_VER = "26.0.2 " ;
81
81
Preferences .set ("android.sdk.support" , SUPPORT_VER );
82
82
}
83
83
}
@@ -95,7 +95,7 @@ class AndroidBuild extends JavaBuild {
95
95
static {
96
96
WEAR_VER = Preferences .get ("android.sdk.wear" );
97
97
if (WEAR_VER == null ) {
98
- WEAR_VER = "2.0.5 " ;
98
+ WEAR_VER = "2.1.0 " ;
99
99
Preferences .set ("android.sdk.wear" , WEAR_VER );
100
100
}
101
101
}
@@ -104,7 +104,7 @@ class AndroidBuild extends JavaBuild {
104
104
static {
105
105
GVR_VER = Preferences .get ("android.sdk.gvr" );
106
106
if (GVR_VER == null ) {
107
- GVR_VER = "1.120 .0" ;
107
+ GVR_VER = "1.150 .0" ;
108
108
Preferences .set ("android.sdk.gvr" , GVR_VER );
109
109
}
110
110
}
@@ -875,9 +875,9 @@ private void copyImportedLibs(final File libsFolder,
875
875
for (File exportFile : library .getAndroidExports ()) {
876
876
String exportName = exportFile .getName ();
877
877
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
+
881
881
if (!exportFile .exists ()) {
882
882
System .err .println (exportFile .getName () +
883
883
" is mentioned in export.txt, but it's " +
0 commit comments