LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 24918 into eclair

Browse Source 
* changes:
  Put back support for hardware.ini at the top level of an add-on.
This commit is contained in:
Android (Google) Code Review
2009-09-15 18:50:59 -04:00
parent 4b5938c34f 80c767f761
commit 28e5f75c74
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
View File

@@ -590,6 +590,7 @@ 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
@@ -597,6 +598,16 @@ 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);