Merge "Layoutlib_create flag -p: don't change all accesses to public." (9bcf26ea) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -117,8 +117,10 @@ public class DelegateClassAdapter extends ClassAdapter {

		int accessDelegate = access;
		// change access to public for the original one
		if (Main.sOptions.generatePublicAccess) {
		access &= ~(Opcodes.ACC_PROTECTED \| Opcodes.ACC_PRIVATE);
		access \|= Opcodes.ACC_PUBLIC;
		}

		MethodVisitor mwOriginal = super.visitMethod(access, name + ORIGINAL_SUFFIX,
		desc, signature, exceptions);

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import java.util.Set;
		* which does:
		* <pre>
		* $ make layoutlib_create <bunch of framework jars>
		* $ out/host/linux-x86/framework/bin/layoutlib_create \
		* $ java -jar out/host/linux-x86/framework/layoutlib_create.jar \
		* out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar \
		* out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar \
		* out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar
		@@ -45,6 +45,12 @@ import java.util.Set;
		*/
		public class Main {

		public static class Options {
		public boolean generatePublicAccess = true;
		}

		public static final Options sOptions = new Options();

		public static void main(String[] args) {

		Log log = new Log();
		@@ -53,7 +59,7 @@ public class Main {
		String[] osDestJar = { null };

		if (!processArgs(log, args, osJarPath, osDestJar)) {
		log.error("Usage: layoutlib_create [-v] output.jar input.jar ...");
		log.error("Usage: layoutlib_create [-v] [-p] output.jar input.jar ...");
		System.exit(1);
		}

		@@ -135,6 +141,8 @@ public class Main {
		String s = args[i];
		if (s.equals("-v")) {
		log.setVerbose(true);
		} else if (s.equals("-p")) {
		sOptions.generatePublicAccess = false;
		} else if (!s.startsWith("-")) {
		if (osDestJar[0] == null) {
		osDestJar[0] = s;

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

+16 −9

Original line number	Diff line number	Diff line
		@@ -72,8 +72,10 @@ class TransformClassAdapter extends ClassAdapter {
		name = mClassName;

		// remove protected or private and set as public
		if (Main.sOptions.generatePublicAccess) {
		access = access & ~(Opcodes.ACC_PRIVATE \| Opcodes.ACC_PROTECTED);
		access \|= Opcodes.ACC_PUBLIC;
		}
		// remove final
		access = access & ~Opcodes.ACC_FINAL;
		// note: leave abstract classes as such
		@@ -87,8 +89,10 @@ class TransformClassAdapter extends ClassAdapter {
		@Override
		public void visitInnerClass(String name, String outerName, String innerName, int access) {
		// remove protected or private and set as public
		if (Main.sOptions.generatePublicAccess) {
		access = access & ~(Opcodes.ACC_PRIVATE \| Opcodes.ACC_PROTECTED);
		access \|= Opcodes.ACC_PUBLIC;
		}
		// remove final
		access = access & ~Opcodes.ACC_FINAL;
		// note: leave abstract classes as such
		@@ -117,8 +121,10 @@ class TransformClassAdapter extends ClassAdapter {
		String methodSignature = mClassName.replace('/', '.') + "#" + name;

		// change access to public
		if (Main.sOptions.generatePublicAccess) {
		access &= ~(Opcodes.ACC_PROTECTED \| Opcodes.ACC_PRIVATE);
		access \|= Opcodes.ACC_PUBLIC;
		}

		// remove final
		access = access & ~Opcodes.ACC_FINAL;
		@@ -155,9 +161,10 @@ class TransformClassAdapter extends ClassAdapter {
		public FieldVisitor visitField(int access, String name, String desc, String signature,
		Object value) {
		// change access to public
		if (Main.sOptions.generatePublicAccess) {
		access &= ~(Opcodes.ACC_PROTECTED \| Opcodes.ACC_PRIVATE);
		access \|= Opcodes.ACC_PUBLIC;

		}
		return super.visitField(access, name, desc, signature, value);
		}