diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-03-26 16:52:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-26 16:52:18 -0700 |
| commit | 3aef63786a732dc066e229d2a8add1e031dcd376 (patch) | |
| tree | 46992797688907afb99056ecc5df6c77cbd930b6 /eclipse | |
| parent | 424db69cdfc405b531554522b1393000d0a04d79 (diff) | |
| parent | 8e9c594b13c25cd2d0232267f7d771bcdea2a0f9 (diff) | |
| download | sdk-3aef63786a732dc066e229d2a8add1e031dcd376.zip sdk-3aef63786a732dc066e229d2a8add1e031dcd376.tar.gz sdk-3aef63786a732dc066e229d2a8add1e031dcd376.tar.bz2 | |
Merge "ADT: Fix a potential NPE and detect change in gdbserver."
Diffstat (limited to 'eclipse')
2 files changed, 3 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java index b26b00d..979f6b1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java @@ -91,7 +91,7 @@ public class ApkBuilder extends BaseBuilder { private static final String DX_PREFIX = "Dx"; //$NON-NLS-1$ - private final static String GDBSERVER_NAME = "gdbserver"; //$NON-NLS-1$ + final static String GDBSERVER_NAME = "gdbserver"; //$NON-NLS-1$ /** * Dex conversion flag. This is set to true if one of the changed/added/removed diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkDeltaVisitor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkDeltaVisitor.java index cdc803e..f48bd43 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkDeltaVisitor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkDeltaVisitor.java @@ -236,7 +236,8 @@ public class ApkDeltaVisitor extends BaseDeltaVisitor } else if (mLibFolder != null && mLibFolder.isPrefixOf(path)) { // inside the native library folder. Test if the changed resource is a .so file. if (type == IResource.FILE && - path.getFileExtension().equalsIgnoreCase(AndroidConstants.EXT_NATIVE_LIB)) { + (AndroidConstants.EXT_NATIVE_LIB.equalsIgnoreCase(path.getFileExtension()) + || ApkBuilder.GDBSERVER_NAME.equals(resource.getName()))) { mMakeFinalPackage = true; return false; // return false for file. } |