diff options
author | Sven Gothel <[email protected]> | 2011-08-05 17:43:07 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-08-05 17:43:07 +0200 |
commit | 6281499e53555fd8ab26345ffce4c4d09bf57a09 (patch) | |
tree | 5500acea903989225a5e0f43a1b535d38421d61f /src | |
parent | 2fa326f0f64afff58e3d0a706a637bd54126c343 (diff) |
aapt build check fix ; DynamicLibraryBundle.isGlueLibComplete() == true if last entry is loaded
aapt build check fix
- exe aapt if source are newer than apk
DynamicLibraryBundle.isGlueLibComplete() == true if last entry is loaded
- fix long standing bug, where GlueLib was not complete if preload dependencies were missing.
this even lead to JOGL specific handling of this case .. duh.
- added debug info
Diffstat (limited to 'src')
-rwxr-xr-x | src/java/com/jogamp/common/os/DynamicLibraryBundle.java | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java index 906afcf..7e961cc 100755 --- a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java +++ b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java @@ -93,9 +93,9 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { System.err.println("DynamicLibraryBundle.init Summary: "+info.getClass().getName()); System.err.println(" toolGetProcAddressFuncNameList: "+toolGetProcAddressFuncNameList); System.err.println(" Tool Lib Names : "+toolLibNames); - System.err.println(" Tool Lib Loaded: "+getToolLibLoadedNumber()+"/"+getToolLibNumber()+", complete "+isToolLibComplete()); + System.err.println(" Tool Lib Loaded: "+getToolLibLoadedNumber()+"/"+getToolLibNumber()+" "+Arrays.toString(toolLibLoaded)+", complete "+isToolLibComplete()); System.err.println(" Glue Lib Names : "+glueLibNames); - System.err.println(" Glue Lib Loaded: "+getGlueLibLoadedNumber()+"/"+getGlueLibNumber()+", complete "+isGlueLibComplete()); + System.err.println(" Glue Lib Loaded: "+getGlueLibLoadedNumber()+"/"+getGlueLibNumber()+" "+Arrays.toString(glueLibLoaded)+", complete "+isGlueLibComplete()); System.err.println(" All Complete: "+isLibComplete()); } } @@ -112,6 +112,12 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return toolLibLoadedNumber; } + /** + * @return true if all tool libraries are loaded, + * otherwise false. + * + * @see DynamicLibraryBundleInfo#getToolLibNames() + */ public final boolean isToolLibComplete() { return getToolLibNumber() == getToolLibLoadedNumber(); } @@ -135,8 +141,15 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return glueLibLoadedNumber; } + /** + * @return true if the last entry has been loaded, + * while ignoring the preload dependencies. + * Otherwise false. + * + * @see DynamicLibraryBundleInfo#getGlueLibNames() + */ public final boolean isGlueLibComplete() { - return getGlueLibNumber() == getGlueLibLoadedNumber(); + return isGlueLibLoaded(getGlueLibNumber() - 1); } public final boolean isGlueLibLoaded(int i) { |