From 842fc411af605dce739d3335acc96fd2491eba91 Mon Sep 17 00:00:00 2001 From: Nathan Toone Date: Thu, 2 Jul 2015 09:53:54 -0600 Subject: [PATCH] Also check directory called "android-arm" At least on NDK version r10e, the GDB server for armeabi is now located in /prebuilt/android-arm/gdbserver. --- .../com/simpligility/maven/plugins/android/AndroidNdk.java | 1 + src/site/asciidoc/changelog.adoc | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/simpligility/maven/plugins/android/AndroidNdk.java b/src/main/java/com/simpligility/maven/plugins/android/AndroidNdk.java index 5496d9fcf..e654d6656 100644 --- a/src/main/java/com/simpligility/maven/plugins/android/AndroidNdk.java +++ b/src/main/java/com/simpligility/maven/plugins/android/AndroidNdk.java @@ -262,6 +262,7 @@ public File getGdbServer( String ndkArchitecture ) throws MojoExecutionException List gdbServerLocations = new ArrayList(); if ( ndkArchitecture.startsWith( "armeabi" ) ) { + gdbServerLocations.add( "android-arm" ); gdbServerLocations.add( "android-armeabi" ); gdbServerLocations.addAll( Arrays.asList( ARM_TOOLCHAIN ) ); } diff --git a/src/site/asciidoc/changelog.adoc b/src/site/asciidoc/changelog.adoc index 523b35116..f541eb85f 100644 --- a/src/site/asciidoc/changelog.adoc +++ b/src/site/asciidoc/changelog.adoc @@ -5,6 +5,9 @@ * Make manifest merging less verbose ** See https://github.com/simpligility/android-maven-plugin/pull/650 ** contributed by Nathan Toone https://github.com/Toonetown +* Fix for gdbserver on NDK version r10e +** See https://github.com/simpligility/android-maven-plugin/pull/648 +** contributed by Nathan Toone https://github.com/Toonetown * Fix building with debug mode and raw file directories ** See https://github.com/simpligility/android-maven-plugin/pull/649 ** contributed by Nathan Toone https://github.com/Toonetown