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

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

Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 

The bug caused some classes to be missed when computing the dependencies
of the existing classes.

This change includes the new mock_android.jar compiled from the mock
sources again.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 6136af32)
parent d915dcac

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

+2 −2
Original line number Diff line number Diff line
@@ -595,8 +595,8 @@ public class AsmAnalyzer { 
            // field instruction

            @Override

            public void visitFieldInsn(int opcode, String owner, String name, String desc) {

                // name is the field's name.

                considerName(name);

                // owner is the class that declares the field.

                considerName(owner);

                // desc is the field's descriptor (see Type).

                considerDesc(desc);

            }

tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmAnalyzerTest.java

+5 −3
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ public class AsmAnalyzerTest { 
                "mock_android.dummy.InnerTest$MyStaticInnerClass",

                "mock_android.dummy.InnerTest$NotStaticInner1",

                "mock_android.dummy.InnerTest$NotStaticInner2",

                "mock_android.util.EmptyArray",

                "mock_android.view.View",

                "mock_android.view.ViewGroup",

                "mock_android.view.ViewGroup$LayoutParams",
@@ -192,15 +193,16 @@ public class AsmAnalyzerTest { 
        TreeMap<String, ClassReader> in_deps = new TreeMap<String, ClassReader>();

        TreeMap<String, ClassReader> out_deps = new TreeMap<String, ClassReader>();



        ClassReader cr = mAa.findClass("mock_android.widget.TableLayout", zipClasses, keep);

        ClassReader cr = mAa.findClass("mock_android.widget.LinearLayout", zipClasses, keep);

        DependencyVisitor visitor = mAa.getVisitor(zipClasses, keep, new_keep, in_deps, out_deps);



        // get first level dependencies

        cr.accept(visitor, 0 /* flags */);



        assertArrayEquals(new String[] {

                "mock_android.util.EmptyArray",

                "mock_android.view.ViewGroup",

                "mock_android.widget.TableLayout$LayoutParams",

                "mock_android.widget.LinearLayout$LayoutParams",

            },

            out_deps.keySet().toArray());
@@ -230,7 +232,7 @@ public class AsmAnalyzerTest { 


        assertArrayEquals(new String[] { }, out_deps.keySet().toArray());

        assertArrayEquals(new String[] {

                "mock_android.widget.TableLayout",

                "mock_android.widget.LinearLayout",

        }, keep.keySet().toArray());

    }

}

tools/layoutlib/create/tests/mock_data/mock_android/util/EmptyArray.java

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 *

 * Licensed under the Eclipse Public License, Version 1.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.eclipse.org/org/documents/epl-v10.php

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package mock_android.util;



import java.lang.JavaClass;



public class EmptyArray {



        public static final Object[] OBJECT = new Object[0];

}

tools/layoutlib/create/tests/mock_data/mock_android/widget/LinearLayout.java

+3 −1
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 


package mock_android.widget;



import mock_android.util.EmptyArray;

import mock_android.view.ViewGroup;



public class LinearLayout extends ViewGroup {



    public class LayoutParams extends mock_android.view.ViewGroup.LayoutParams {

    Object[] mObjects = EmptyArray.OBJECT;

    public class LayoutParams extends MarginLayoutParams {



    }