Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 612a05e7 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

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
parent f8ea7504

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();