merge in jb-release history after reset to jb-dev
diff --git a/build/tools/build-ndk-sysroot.sh b/build/tools/build-ndk-sysroot.sh
index 08f890c..bdfce14 100755
--- a/build/tools/build-ndk-sysroot.sh
+++ b/build/tools/build-ndk-sysroot.sh
@@ -268,7 +268,7 @@
common_header $TOP/external/zlib zconf.h
# Jni header
-common_header $TOP/dalvik/libnativehelper/include/nativehelper jni.h
+common_header $TOP/libnativehelper/include/nativehelper jni.h
# libthread_db headers, not sure if this is needed for the NDK
common_headers $BIONIC_ROOT/libthread_db/include
diff --git a/build/tools/dev-platform-import.sh b/build/tools/dev-platform-import.sh
index 1ceac2f..ea5c8cc 100755
--- a/build/tools/dev-platform-import.sh
+++ b/build/tools/dev-platform-import.sh
@@ -371,7 +371,7 @@
copy_system_shared_library libstdc++
copy_system_static_library libstdc++
- copy_system_headers $ANDROID_ROOT/dalvik/libnativehelper/include/nativehelper jni.h
+ copy_system_headers $ANDROID_ROOT/libnativehelper/include/nativehelper jni.h
fi
# API level 4
diff --git a/build/tools/dev-system-import.sh b/build/tools/dev-system-import.sh
index 2473a7e..689867f 100755
--- a/build/tools/dev-system-import.sh
+++ b/build/tools/dev-system-import.sh
@@ -561,7 +561,7 @@
copy_system_static_library libthread_db
copy_system_headers $ANDROID_ROOT/bionic/libthread_db/include thread_db.h sys/procfs.h
- copy_system_headers $ANDROID_ROOT/dalvik/libnativehelper/include/nativehelper jni.h
+ copy_system_headers $ANDROID_ROOT/libnativehelper/include/nativehelper jni.h
fi
# API level 4
