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

Commit d2a41184 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Fix LayoutLib Create tests. 

Change-Id: Ica3efe417d54da7dc74b21d28215199d37600744
parent 86eb8b4e

tools/layoutlib/create/src/com/android/tools/layoutlib/create/AbstractClassAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public abstract class AbstractClassAdapter extends ClassVisitor { 
        if (type.getSort() == Type.OBJECT) {

            String in = type.getInternalName();

            String newIn = renameInternalType(in);

            if (newIn != in) {

            if (!newIn.equals(in)) {

                return Type.getType("L" + newIn + ";");

            }

        } else if (type.getSort() == Type.ARRAY) {

tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java

+1 −3
Original line number Diff line number Diff line
@@ -316,10 +316,8 @@ public class DependencyFinder { 


            // Add it to the dependency set for the currently visited class, as needed.

            assert mCurrentDepSet != null;

            if (mCurrentDepSet != null) {

            mCurrentDepSet.add(className);

        }

        }



        /**

         * Considers this array of names using considerName().

tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class Main { 
        String[] osDestJar = { null };



        if (!processArgs(log, args, osJarPath, osDestJar)) {

            log.error("Usage: layoutlib_create [-v] [-p] output.jar input.jar ...");

            log.error("Usage: layoutlib_create [-v] output.jar input.jar ...");

            log.error("Usage: layoutlib_create [-v] [--list-deps|--missing-deps] input.jar ...");

            System.exit(1);

        }

tools/layoutlib/create/src/com/android/tools/layoutlib/create/OverrideMethod.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public final class OverrideMethod { 
     * Sets the default listener for all methods not specifically handled.

     * Null means to do nothing.

     */

    @SuppressWarnings("UnusedDeclaration") // Used by Bridge by reflection for debug purposes.

    public static void setDefaultListener(MethodListener listener) {

        sDefaultListener = listener;

    }

tools/layoutlib/create/src/com/android/tools/layoutlib/create/RenameClassAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class RenameClassAdapter extends AbstractClassAdapter { 
            return mNewName;

        }



        if (mOldBase != mOldName && type.equals(mOldBase)) {

        if (!mOldBase.equals(mOldName) && type.equals(mOldBase)) {

            return mNewBase;

        }