From 612a05e7e15184b21437731b9aa5db2d1d4fc54c Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Wed, 20 May 2015 11:28:50 -0700 Subject: Update platformDir search in tests. When trying to find the SDK Platform Dir for LayoutLib tests, also test if the dir from which the tests are run is module dir. Change-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32 --- .../tests/src/com/android/layoutlib/bridge/intensive/Main.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tools/layoutlib') diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java index 91be0bd..63115e4 100644 --- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java +++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java @@ -124,9 +124,14 @@ public class Main { if (platformDir != null) { return platformDir; } - // Test if workingDir is platform/frameworks/base/tools/layoutlib. That is, root should be - // workingDir/../../../../ (4 levels up) + + // Test if workingDir is platform/frameworks/base/tools/layoutlib/bridge. File currentDir = workingDir; + if (currentDir.getName().equalsIgnoreCase("bridge")) { + currentDir = currentDir.getParentFile(); + } + // Test if currentDir is platform/frameworks/base/tools/layoutlib. That is, root should be + // workingDir/../../../../ (4 levels up) for (int i = 0; i < 4; i++) { if (currentDir != null) { currentDir = currentDir.getParentFile(); -- cgit v1.1