Promote AWTEDTExecutor to public package com.jogamp.common.util.awt ; Exclude java.part.awt in android gluegen-rt.

3 files changed, 5 insertions, 3 deletions

diff --git a/make/build.xml b/make/build.xml
index b9d4985..886b2db 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -146,7 +146,8 @@
     <!-- optional android classes - if android -->
     <property name="java.part.android" value="jogamp/common/os/android/**"/>
 
-    <property name="jogamp.awt.classes" value="jogamp/common/awt/**"/>
+    <!-- property name="java.part.awt" value="com/jogamp/common/util/awt/** jogamp/common/awt/**"/-->
+    <property name="java.part.awt" value="com/jogamp/common/util/awt/**"/>
     <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/>
     <property name="jogamp.common.classes" value="com/jogamp/common/** jogamp/common/**"/>
 
@@ -889,6 +890,7 @@
         <include name="com/jogamp/common/**" />
         <include name="jogamp/common/**" />
         <include name="${java.part.android}" />
+        <exclude name="${java.part.awt}" />
         <exclude name="${jogamp-android-launcher.classes}" />
       </fileset>
       <fileset dir="resources/assets">
diff --git a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java
index f0f1765..349106a 100755
--- a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java
+++ b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java
@@ -34,10 +34,10 @@ import java.util.HashSet;
 import java.util.List;
 
 import jogamp.common.Debug;
-import jogamp.common.awt.AWTEDTExecutor;
 
 import com.jogamp.common.jvm.JNILibLoaderBase;
 import com.jogamp.common.util.RunnableExecutor;
+import com.jogamp.common.util.awt.AWTEDTExecutor;
 
 /**
  * Provides bundling of:<br>
diff --git a/src/java/jogamp/common/awt/AWTEDTExecutor.java b/src/java/com/jogamp/common/util/awt/AWTEDTExecutor.java
index 8d77f5c..a43b738 100644
--- a/src/java/jogamp/common/awt/AWTEDTExecutor.java
+++ b/src/java/com/jogamp/common/util/awt/AWTEDTExecutor.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package jogamp.common.awt;
+package com.jogamp.common.util.awt;
 
 import java.awt.EventQueue;
 import java.lang.reflect.InvocationTargetException;