From: Stefan Schmidt <stefan@buglabs.net>
Date: Wed, 15 Dec 2010 17:52:09 +0000 (+0100)
Subject: jni-library.bbclass: Override JAVAH for our jni recipes.
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7e1882fe3e9f5f10f7737b5038ce1d7346107c2;p=openembedded.git

jni-library.bbclass: Override JAVAH for our jni recipes.

We need the javah from icedtea6 here.
---

diff --git a/classes/jni-library.bbclass b/classes/jni-library.bbclass
index fefbace208..f484b97dac 100644
--- a/classes/jni-library.bbclass
+++ b/classes/jni-library.bbclass
@@ -1,5 +1,5 @@
 # we need javah
-DEPENDS += "openjdk-langtools-native zip-native"
+DEPENDS += "openjdk-langtools-native zip-native icedtea6-native"
 
 JNI_LIB_DIR = "/usr/lib/jni"
 
@@ -15,6 +15,7 @@ EXTRA_OEMAKE +=" \
 	STAGING_INCDIR=${STAGING_INCDIR} \
 	CLASSPATH_INCDIR=${STAGING_INCDIR}/classpath \
 	ROOTFS_BUG=${STAGING_LIBDIR}/../../ \
+	JAVAH=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javah \
 "
 
 addtask jni_compile after do_compile before do_install