Support for hardware.ini per skin in add-ons.

Change-Id: Iab230f09504a7df34faa6a27c121a79ef1ffd603

diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index 11fc508..491e61c 100644 (file)
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -607,6 +607,7 @@ class Main {
             if (skin != null && skin.length() == 0) {
                 skin = null;
             }
+
             if (skin != null) {
                 boolean valid = false;
                 // Is it a know skin name for this target?

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
index 954da17..45bf497 100644 (file)
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
@@ -590,7 +590,6 @@ public final class AvdManager {
             // priority order is:
             // - values provided by the user
             // - values provided by the skin
-            // - values provided by the target (add-on only).
             // In order to follow this priority, we'll add the lowest priority values first and then
             // override by higher priority values.
             // In the case of a platform with override values from the user, the skin value might
@@ -598,16 +597,6 @@ public final class AvdManager {
 
             HashMap<String, String> finalHardwareValues = new HashMap<String, String>();
 
-            File targetHardwareFile = new File(target.getLocation(), AvdManager.HARDWARE_INI);
-            if (targetHardwareFile.isFile()) {
-                Map<String, String> targetHardwareConfig = SdkManager.parsePropertyFile(
-                        targetHardwareFile, log);
-                if (targetHardwareConfig != null) {
-                    finalHardwareValues.putAll(targetHardwareConfig);
-                    values.putAll(targetHardwareConfig);
-                }
-            }
-
             // get the hardware properties for this skin
             File skinFolder = getSkinPath(skinName, target);
             File skinHardwareFile = new File(skinFolder, AvdManager.HARDWARE_INI);