diff options
7 files changed, 41 insertions, 24 deletions
diff --git a/anttasks/src/com/android/ant/AaptExecTask.java b/anttasks/src/com/android/ant/AaptExecTask.java index fc0de71..504640b 100644 --- a/anttasks/src/com/android/ant/AaptExecTask.java +++ b/anttasks/src/com/android/ant/AaptExecTask.java @@ -92,6 +92,7 @@ public final class AaptExecTask extends BaseTask { private final ArrayList<NoCompress> mNoCompressList = new ArrayList<NoCompress>(); private String mProjectLibrariesResName; private String mProjectLibrariesPackageName; + private boolean mNonConstantId; /** * Sets the value of the "executable" attribute. @@ -133,6 +134,10 @@ public final class AaptExecTask extends BaseTask { mUseCrunchCache = nocrunch; } + public void setNonConstantId(boolean nonConstantId) { + mNonConstantId = nonConstantId; + } + public void setVersioncode(String versionCode) { if (versionCode.length() > 0) { try { @@ -415,6 +420,10 @@ public final class AaptExecTask extends BaseTask { task.createArg().setValue("--no-crunch"); } + if (mNonConstantId) { + task.createArg().setValue("--non-constant-id"); + } + // force flag if (mForce) { task.createArg().setValue("-f"); diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/heap/NativeHeapPanel.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/heap/NativeHeapPanel.java index 5bbd487..7bea050 100644 --- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/heap/NativeHeapPanel.java +++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/heap/NativeHeapPanel.java @@ -169,8 +169,7 @@ public class NativeHeapPanel extends BaseHeapPanel { // the list on future updates allocations = shallowCloneList(allocations); - mNativeHeapSnapshots.add(new NativeHeapSnapshot(allocations)); - mDiffSnapshots.add(null); // filled in lazily on demand + addNativeHeapSnapshot(new NativeHeapSnapshot(allocations)); updateDisplay(); // Attempt to resolve symbols in a separate thread. @@ -181,6 +180,14 @@ public class NativeHeapPanel extends BaseHeapPanel { t.start(); } + private void addNativeHeapSnapshot(NativeHeapSnapshot snapshot) { + mNativeHeapSnapshots.add(snapshot); + + // The diff snapshots are filled in lazily on demand. + // But the list needs to be the same size as mNativeHeapSnapshots, so we add a null. + mDiffSnapshots.add(null); + } + private List<NativeAllocationInfo> shallowCloneList(List<NativeAllocationInfo> allocations) { List<NativeAllocationInfo> clonedList = new ArrayList<NativeAllocationInfo>(allocations.size()); @@ -212,8 +219,7 @@ public class NativeHeapPanel extends BaseHeapPanel { c.getClientData().getPid()); if (importedSnapshots != null) { for (NativeHeapSnapshot n : importedSnapshots) { - mNativeHeapSnapshots.add(n); - mDiffSnapshots.add(null); + addNativeHeapSnapshot(n); } } @@ -221,8 +227,7 @@ public class NativeHeapPanel extends BaseHeapPanel { allocations = shallowCloneList(allocations); if (allocations.size() > 0) { - mNativeHeapSnapshots.add(new NativeHeapSnapshot(allocations)); - mDiffSnapshots.add(null); // filled in lazily on demand + addNativeHeapSnapshot(new NativeHeapSnapshot(allocations)); } } else { mSnapshotHeapButton.setEnabled(false); @@ -459,8 +464,7 @@ public class NativeHeapPanel extends BaseHeapPanel { NativeHeapSnapshot snapshot = importer.getImportedSnapshot(); addToImportedSnapshots(snapshot); // save imported snapshot for future use - mNativeHeapSnapshots.add(snapshot); // add to currently displayed snapshots as well - mDiffSnapshots.add(null); + addNativeHeapSnapshot(snapshot); // add to currently displayed snapshots as well updateDisplay(); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.classpath index 1fa3e68..acad1c2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/.classpath @@ -2,6 +2,5 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.properties index 456216e..50668f3 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.properties @@ -1,6 +1,4 @@ -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ - .,\ plugin.xml,\ NOTICE +jars.compile.order = diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java index 8900366..02ca3b0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java @@ -27,10 +27,6 @@ import com.android.ddmlib.Log.LogLevel; import com.android.ddmuilib.DdmUiPreferences; import com.android.ddmuilib.StackTracePanel; import com.android.ddmuilib.DevicePanel.IUiSelectionListener; -import com.android.ddmuilib.logcat.ILogCatMessageEventListener; -import com.android.ddmuilib.logcat.LogCatMessage; -import com.android.ddmuilib.logcat.LogCatReceiver; -import com.android.ddmuilib.logcat.LogCatReceiverFactory; import com.android.ide.eclipse.ddms.i18n.Messages; import com.android.ide.eclipse.ddms.preferences.PreferenceInitializer; @@ -62,7 +58,6 @@ import org.osgi.framework.BundleContext; import java.io.File; import java.util.ArrayList; import java.util.Calendar; -import java.util.List; /** * The activator class controls the plug-in life cycle @@ -503,8 +498,14 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL @Override public void run() { // create and start the bridge - AndroidDebugBridge.createBridge(sAdbLocation, - false /* forceNewBridge */); + try { + AndroidDebugBridge.createBridge(sAdbLocation, + false /* forceNewBridge */); + } catch (Throwable t) { + Status status = new Status(IStatus.ERROR, PLUGIN_ID, + "Failed to create AndroidDebugBridge", t); + getDefault().getLog().log(status); + } } }.start(); } diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java index b345baf..994d4b9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java @@ -1010,7 +1010,8 @@ public final class DebuggerMessage { return builder; } - protected com.android.ide.eclipse.gldebugger.DebuggerMessage.Message internalGetResult() { + @Override + protected com.android.ide.eclipse.gldebugger.DebuggerMessage.Message internalGetResult() { return result; } @@ -1023,11 +1024,13 @@ public final class DebuggerMessage { return this; } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(result); } - public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message getDefaultInstanceForType() { + @Override + public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message getDefaultInstanceForType() { return com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.getDefaultInstance(); } @@ -1060,7 +1063,8 @@ public final class DebuggerMessage { return returnMe; } - public Builder mergeFrom(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message other) { + @Override + public Builder mergeFrom(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message other) { if (other == com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.getDefaultInstance()) return this; if (other.hasContextId()) { setContextId(other.getContextId()); @@ -1134,7 +1138,8 @@ public final class DebuggerMessage { return this; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { diff --git a/files/ant/build.xml b/files/ant/build.xml index 134a0a3..9315a5e 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -563,6 +563,7 @@ manifest="AndroidManifest.xml" androidjar="${android.jar}" rfolder="${gen.absolute.dir}" + nonConstantId="${android.library}" projectLibrariesResName="project.libraries.res" projectLibrariesPackageName="project.libraries.package"> <res path="${resource.absolute.dir}" /> |