From 24092dc5e6680602d8a4b66bd9046f345bf58b3a Mon Sep 17 00:00:00 2001 From: Amy Fong Date: Thu, 16 Apr 2015 13:52:36 -0400 Subject: java.bbclass: java missing classes during compile oe_makeclasspath is used to define the classpath argument passed to javac for a number of packages. The current behaviour takes a number args specifying jar files to look for and if the files exist, it adds it to a specified variable. On some builds, oe_makeclasspath cannot find the jar file. oe_makeclasspath used an invalid test to see the package is native. (testing if the build arch and package arch are the same, if so, native) We test to see if PN matches *-native or *-nativesdk instead. Signed-off-by: Amy Fong Signed-off-by: Jackie Huang --- classes/java.bbclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'classes/java.bbclass') diff --git a/classes/java.bbclass b/classes/java.bbclass index 464d8a8..ab51787 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -98,11 +98,14 @@ oe_makeclasspath() { case "$1" in -s) # take jar files from native staging if this is a -native recipe - if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then + case "$PN" in + *-native|*-nativesdk) dir=${STAGING_DATADIR_JAVA_NATIVE} - else + ;; + *) dir=${STAGING_DATADIR_JAVA} - fi + ;; + esac ;; -*) bbfatal "oe_makeclasspath: unknown option: $1" -- cgit v1.2.3-54-g00ecf