Merge "Fix visitFieldInsn in layoutlib_create." (779b0eea) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -632,8 +632,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);
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -527,7 +527,8 @@ public class DependencyFinder {
		// field instruction
		@Override
		public void visitFieldInsn(int opcode, String owner, String name, String desc) {
		// name is the field's name.
		// owner is the class that declares the field.
		considerName(owner);
		// desc is the field's descriptor (see Type).
		considerDesc(desc);
		}

+5 −3

Original line number	Diff line number	Diff line
		@@ -83,6 +83,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",
		@@ -217,15 +218,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());

		@@ -255,7 +257,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());
		}
		}

−4.56 KiB (9.96 KiB)

File changed.

No diff preview for this file type.

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];
		}