diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-20 23:19:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 23:19:07 +0000 |
| commit | 59638fc769fd7d58c8349bd643ff55d09e26ebeb (patch) | |
| tree | ded5dd47ed6bdd22d71dd1ee3fd087ffa93401c8 | |
| parent | a75fb2a636ceafac9ddfb580af614e5ef0edf977 (diff) | |
| parent | 8e159d3a1a520572eebf355278c3798a784ea1b2 (diff) | |
| download | android_libnativehelper-59638fc769fd7d58c8349bd643ff55d09e26ebeb.tar.gz android_libnativehelper-59638fc769fd7d58c8349bd643ff55d09e26ebeb.tar.bz2 android_libnativehelper-59638fc769fd7d58c8349bd643ff55d09e26ebeb.zip | |
am 8e159d3a: am b14825c7: Merge "Fix libnativehelper strerror_r build break."
* commit '8e159d3a1a520572eebf355278c3798a784ea1b2':
Fix libnativehelper strerror_r build break.
| -rw-r--r-- | JNIHelp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/JNIHelp.cpp b/JNIHelp.cpp index fcad2f4..9de3dfc 100644 --- a/JNIHelp.cpp +++ b/JNIHelp.cpp @@ -14,6 +14,11 @@ * limitations under the License. */ +#if defined(__ANDROID__) +/* libnativehelper is built by NDK 19 in one variant, which doesn't yet have the GNU strerror_r. */ +#undef _GNU_SOURCE +#endif + #define LOG_TAG "JNIHelp" #include "JniConstants.h" |