am b66fe7bf: am d45867a4: Merge "Update platformDir search in tests." into mnc-dev (5c5e17b8) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -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();