Update sdklib to use the new sdk organization (build tools moved)

Also do some minor clean-up from the recent change to ProjectProperties.
FileWrapper extends java.io.File so there's no need to create a File
and then create a FileWrapper around it. Directly create a FileWrapper.

Change-Id: I3f072bf7f848d63b90fa03bec2683f6a009deb88

1 files changed, 3 insertions, 3 deletions

diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index 1bdd2fa..222cd40 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -925,11 +925,11 @@ public class Main {
 
                         // get the hardware properties for this skin
                         File skinFolder = avdManager.getSkinPath(skin, target);
-                        File skinHardwareFile = new File(skinFolder, AvdManager.HARDWARE_INI);
+                        FileWrapper skinHardwareFile = new FileWrapper(skinFolder,
+                                AvdManager.HARDWARE_INI);
                         if (skinHardwareFile.isFile()) {
                             skinHardwareConfig = ProjectProperties.parsePropertyFile(
-                                    new FileWrapper(skinHardwareFile),
-                                    mSdkLog);
+                                    skinHardwareFile, mSdkLog);
                         }
                         break;
                     }