Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev

Browse Source 
automerge: 7e39385

* commit '7e393853656387757da2531d4e504d7cf32e738e':
  Update platform.dir search in tests.
This commit is contained in:
Deepanshu Gupta
2015-01-08 01:46:46 +00:00
committed by android-build-merger
parent bcba21827c 7e39385365
commit f45420d0bd
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
View File

@@ -165,11 +165,27 @@ public class Main {
if (!out.isDirectory()) {
return null;
}
File sdkDir = new File(out, "sdk" + File.separator + "sdk");
File sdkDir = new File(out, "sdk");
if (!sdkDir.isDirectory()) {
// The directory we thought that should contain the sdk is not a directory.
return null;
}
File[] sdkDirs = sdkDir.listFiles(new FileFilter() {
@Override
public boolean accept(File path) {
// We need to search for $TARGET_PRODUCT (usually, sdk_phone_armv7)
return path.isDirectory() && path.getName().startsWith("sdk");
}
});
for (File dir : sdkDirs) {
String platformDir = getPlatformDirFromHostOutSdkSdk(dir);
if (platformDir != null) {
return platformDir;
}
}
return null;
}
private static String getPlatformDirFromHostOutSdkSdk(File sdkDir) {
File[] possibleSdks = sdkDir.listFiles(new FileFilter() {
@Override
public boolean accept(File path) {