From d5c7842956e5fb21ec61bf4334ba6a263e883e50 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 9 Sep 2009 16:23:45 -0700 Subject: [PATCH] Support for hardware.ini per skin in add-ons. Change-Id: Iab230f09504a7df34faa6a27c121a79ef1ffd603 --- sdkmanager/app/src/com/android/sdkmanager/Main.java | 1 + .../src/com/android/sdklib/internal/avd/AvdManager.java | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java index 11fc508b2..491e61cba 100644 --- 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 954da1715..45bf4978f 100644 --- 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 finalHardwareValues = new HashMap(); - File targetHardwareFile = new File(target.getLocation(), AvdManager.HARDWARE_INI); - if (targetHardwareFile.isFile()) { - Map 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); -- 2.11.0