@@ -81,8 +81,6 @@ class SDKUrlHolder {
81
81
public String platformVersion , buildToolsVersion ;
82
82
public String platformToolsUrl , buildToolsUrl , platformUrl , toolsUrl , emulatorUrl ;
83
83
public String platformToolsFilename , buildToolsFilename , platformFilename , toolsFilename , emulatorFilename ;
84
- // public String supportRepoUrl, googleRepoUrl;
85
- // public String supportRepoFilename, googleRepoFilename;
86
84
public String usbDriverUrl ;
87
85
public String usbDriverFilename ;
88
86
public String haxmFilename , haxmUrl ;
@@ -112,9 +110,7 @@ protected Object doInBackground() throws Exception {
112
110
File extrasFolder = new File (sdkFolder , "extras" );
113
111
if (!extrasFolder .exists ()) extrasFolder .mkdir ();
114
112
File googleRepoFolder = new File (extrasFolder , "google" );
115
- if (!googleRepoFolder .exists ()) googleRepoFolder .mkdir ();
116
- // File androidRepoFolder = new File(extrasFolder, "android");
117
- // if (!androidRepoFolder.exists()) androidRepoFolder.mkdir();
113
+ if (!googleRepoFolder .exists ()) googleRepoFolder .mkdir ();
118
114
File haxmFolder = new File (extrasFolder , "intel/HAXM" );
119
115
if (!haxmFolder .exists ()) haxmFolder .mkdirs ();
120
116
@@ -151,14 +147,6 @@ protected Object doInBackground() throws Exception {
151
147
// emulator, unpacks directly to sdk folder
152
148
File downloadedEmulator = new File (tempFolder , downloadUrls .emulatorFilename );
153
149
downloadAndUnpack (downloadUrls .emulatorUrl , downloadedEmulator , sdkFolder , true );
154
-
155
- // google repository
156
- // File downloadedGoogleRepo = new File(tempFolder, downloadUrls.googleRepoFilename);
157
- // downloadAndUnpack(downloadUrls.googleRepoUrl, downloadedGoogleRepo, googleRepoFolder, false);
158
-
159
- // android repository
160
- // File downloadedSupportRepo = new File(tempFolder, downloadUrls.supportRepoFilename);
161
- // downloadAndUnpack(downloadUrls.supportRepoUrl, downloadedSupportRepo, androidRepoFolder, false);
162
150
163
151
// usb driver
164
152
if (Platform .isWindows ()) {
@@ -345,11 +333,11 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
345
333
346
334
// -----------------------------------------------------------------------
347
335
// tools
348
- expr = xpath .compile ("//remotePackage[@path=\" tools\" ]" ); //Matches two items according to xml file
336
+ expr = xpath .compile ("//remotePackage[@path=\" tools\" ]" ); // Matches two items according to xml file
349
337
remotePackages = (NodeList ) expr .evaluate (doc , XPathConstants .NODESET );
350
338
found = false ;
351
339
if (remotePackages != null ) {
352
- NodeList childNodes = remotePackages .item (1 ).getChildNodes (); //Second item is the latest tools for now
340
+ NodeList childNodes = remotePackages .item (1 ).getChildNodes (); // Second item is the latest tools for now
353
341
NodeList archives = ((Element ) childNodes ).getElementsByTagName ("archive" );
354
342
355
343
for (int i = 0 ; i < archives .getLength (); ++i ) {
@@ -375,7 +363,7 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
375
363
376
364
// -----------------------------------------------------------------------
377
365
// emulator
378
- expr = xpath .compile ("//remotePackage[@path=\" emulator\" ]" ); //Matches two items according to xml file
366
+ expr = xpath .compile ("//remotePackage[@path=\" emulator\" ]" ); // Matches two items according to xml file
379
367
remotePackages = (NodeList ) expr .evaluate (doc , XPathConstants .NODESET );
380
368
found = false ;
381
369
if (remotePackages != null ) {
@@ -510,16 +498,6 @@ private void parseAndSet(SDKUrlHolder urlHolder, NodeList remotePackages, String
510
498
urlHolder .platformToolsUrl = REPOSITORY_URL + urlHolder .platformToolsFilename ;
511
499
urlHolder .totalSize += Integer .parseInt (size .item (0 ).getTextContent ());
512
500
break ;
513
- // case ANDROID_REPO:
514
- // urlHolder.supportRepoFilename = url.item(0).getTextContent();
515
- // urlHolder.supportRepoUrl = REPOSITORY_URL + urlHolder.supportRepoFilename;
516
- // urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
517
- // break;
518
- // case GOOGLE_REPO:
519
- // urlHolder.googleRepoFilename = url.item(0).getTextContent();
520
- // urlHolder.googleRepoUrl = REPOSITORY_URL + urlHolder.googleRepoFilename;
521
- // urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
522
- // break;
523
501
case USB_DRIVER :
524
502
urlHolder .usbDriverFilename = url .item (0 ).getTextContent ();
525
503
urlHolder .usbDriverUrl = REPOSITORY_URL + urlHolder .usbDriverFilename ;
0 commit comments