Android: Drop android.jar ; Simplify 'aapt.signed' ; Move our android resources -> make/resources

Drop android.jar
- version 8 and 9
- license: apache v2 (NOTICE.txt included)
- allows compilation using Android API on all platforms

Simplify 'aapt.signed'
- removed 'jarclasspathrefid', seems to be not needed
  (commented out)

Move our android resources make/lib/android -> make/resources/android
- make/lib is for 3rd party stuff only

18 files changed, 415 insertions, 22 deletions

diff --git a/make/build-test.xml b/make/build-test.xml
index e54f17e..7836d99 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -136,7 +136,7 @@
             jarbasename="gluegen-test"
             nativebuilddir="${build_t.lib}"
             nativebasename="test"
-            androidmanifest.path="lib/android/AndroidManifest-Test.xml"
+            androidmanifest.path="resources/android/AndroidManifest-Test.xml"
             version.code="${gluegen_int_version}"
             version.name="${gluegen.version.plus}" />
     </target>
diff --git a/make/build.xml b/make/build.xml
index 1fa52c4..8e3cc92 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -108,10 +108,6 @@
     <mkdir dir="${src.generated.c}/Windows" />
     <mkdir dir="${classes}" />
 
-    <condition property="android.jar" value="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar">
-        <isset property="isAndroid"/>
-    </condition>
-
     <!-- Create the classpath for ANTLR.  
          This requires the user-defined "antlr.jar" property. -->
     <path id="antlr.classpath">
@@ -708,7 +704,7 @@
         jarbasename="gluegen-rt"
         nativebuilddir="${gluegen.lib.dir}"
         nativebasename="gluegen-rt"
-        androidmanifest.path="lib/android/AndroidManifest-Runtime.xml"
+        androidmanifest.path="resources/android/AndroidManifest-Runtime.xml"
         jarmanifest.path="${build}/Manifest-rt.temp"
         version.code="${gluegen_int_version}"
         version.name="${gluegen.version.plus}" />
@@ -718,7 +714,7 @@
         jarbasename="gluegen"
         nativebuilddir="${gluegen.lib.dir}"
         nativebasename="gluegen-rt"
-        androidmanifest.path="lib/android/AndroidManifest-CompileTime.xml"
+        androidmanifest.path="resources/android/AndroidManifest-CompileTime.xml"
         jarmanifest.path="${build}/Manifest.temp"
         version.code="${gluegen_int_version}"
         version.name="${gluegen.version.plus}" />
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 95f58f5..5ccc119 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -43,7 +43,11 @@
     <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
     <property name="ant.jar"       value="${ant.home}/lib/ant.jar" />
     <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
+
+    <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init -->
+    <property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" />
     <property name="ant-junit-all.apk" value="${gluegen.root}/make/lib/ant-junit-all.apk" />
+
     <condition property="win32.c.compiler" value="mingw64">
       <and>
         <os family="windows" />
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml
index 25eff11..15bf0dd 100644
--- a/make/jogamp-androidtasks.xml
+++ b/make/jogamp-androidtasks.xml
@@ -13,7 +13,7 @@
             jarbasename="gluegen-rt" // jar base file name
             nativebuilddir="${gluegen.lib.dir}" // native library build location
             nativebasename="gluegen-rt"         // native library base file name "*${nativebasename}*.${native.library.suffix}"
-            androidmanifest.path="lib/android/AndroidManifest.xml"
+            androidmanifest.path="resources/android/AndroidManifest.xml"
             jarmanifest.path="${build}/Manifest-rt.temp" // optional
             version.code="${gluegen_int_version}"
             version.name="${gluegen.version.plus}" 
@@ -37,7 +37,7 @@
       <attribute name="nativebasename" />
       <attribute name="androidmanifest.path" />
       <attribute name="jarmanifest.path" default="/non.existing.manifest.file"/>
-      <attribute name="jarclasspathrefid" default="android.classpath"/>
+      <!-- attribute name="jarclasspathrefid" default="/non.existing.jarclasspathrefid"/-->
       <attribute name="version.code" />
       <attribute name="version.name" />
       <attribute name="keystore.file" default="/non.existing.user.keystore.file" />
@@ -66,12 +66,6 @@
         <property name="m.aapt.java.target" value="1.5" />
         <property name="m.aapt.java.source" value="1.5" />
 
-        <path id="android.classpath">
-            <pathelement location="${antlr.jar}" />
-            <pathelement location="@{jarbuilddir}/@{jarbasename}.jar" />
-            <pathelement location="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar" />
-        </path>
-
         <condition property="m.aapt.keystore.file" value="@{keystore.file}" else="${m.aapt.build.apk}/debug.keystore">
             <available file="@{keystore.file}"/>
         </condition>
@@ -99,11 +93,11 @@
             <arg line="--debug-mode"/>
             <arg line="-f"/>
             <arg line="-S"/>
-            <arg line="lib/android/res"/>
+            <arg line="resources/android/res"/>
             <arg line="-M"/>
             <arg line="${m.aapt.build.apk}/image/AndroidManifest.xml"/>
             <arg line="-I"/>
-            <arg line="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar"/>
+            <arg line="${android.jar}"/>
             <arg line="-J"/>
             <arg line="${m.aapt.build.apk}/image/lib/src"/>
         </exec>
@@ -115,7 +109,11 @@
             destdir="${m.aapt.build.apk}/image/lib/classes"
             verbose="true">
             <src path="${m.aapt.build.apk}/image/lib/src" />
-            <classpath refid="@{jarclasspathrefid}" />
+            <classpath>
+                 <!-- path refid="@{jarclasspathrefid}"/-->
+                 <pathelement location="@{jarbuilddir}/@{jarbasename}.jar" />
+                 <pathelement path="${android.jar}"/>
+            </classpath>
         </javac>
 
         <echo>aapt.signed @{jarbasename}: dex'ing</echo>
@@ -142,13 +140,13 @@
             <arg line="-f"/>
 
             <arg line="-S" />
-            <arg value="lib/android/res"/>
+            <arg value="resources/android/res"/>
 
             <arg line="-A" />
             <arg value="${m.aapt.build.apk}/image/lib/assets"/>
 
             <arg line="-I" />
-            <arg value="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar"/>
+            <arg line="${android.jar}"/>
 
             <arg line="--version-code" />
             <arg value="@{version.code}"/>
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml
index 5655209..e53ffe6 100755
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -15,6 +15,12 @@
         </not>
     </condition>
 
+    <condition property="android.version" value="${env.ANDROID_VERSION}" else="9">
+        <not>
+         <equals arg1="${env.ANDROID_VERSION}" arg2="$${env.ANDROID_VERSION}" casesensitive="true" />
+        </not>
+    </condition>
+
   </target>
 
 </project>
diff --git a/make/lib/android-sdk/8/NOTICE.txt b/make/lib/android-sdk/8/NOTICE.txt
new file mode 100644
index 0000000..1fdb31d
--- /dev/null
+++ b/make/lib/android-sdk/8/NOTICE.txt
@@ -0,0 +1,195 @@
+Notice for all the files in this folder.
+------------------------------------------------------------
+
+
+
+   Copyright (c) 2005-2008, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+
diff --git a/make/lib/android-sdk/8/android.jar b/make/lib/android-sdk/8/android.jar
new file mode 100644
index 0000000..24ae563
--- /dev/null
+++ b/make/lib/android-sdk/8/android.jar
diff --git a/make/lib/android-sdk/9/NOTICE.txt b/make/lib/android-sdk/9/NOTICE.txt
new file mode 100644
index 0000000..1fdb31d
--- /dev/null
+++ b/make/lib/android-sdk/9/NOTICE.txt
@@ -0,0 +1,195 @@
+Notice for all the files in this folder.
+------------------------------------------------------------
+
+
+
+   Copyright (c) 2005-2008, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+
diff --git a/make/lib/android-sdk/9/android.jar b/make/lib/android-sdk/9/android.jar
new file mode 100644
index 0000000..7729ac2
--- /dev/null
+++ b/make/lib/android-sdk/9/android.jar
diff --git a/make/lib/android/AndroidManifest-CompileTime.xml b/make/resources/android/AndroidManifest-CompileTime.xml
index f9a5600..f9a5600 100644
--- a/make/lib/android/AndroidManifest-CompileTime.xml
+++ b/make/resources/android/AndroidManifest-CompileTime.xml
diff --git a/make/lib/android/AndroidManifest-Runtime.xml b/make/resources/android/AndroidManifest-Runtime.xml
index 7ad8304..7ad8304 100644
--- a/make/lib/android/AndroidManifest-Runtime.xml
+++ b/make/resources/android/AndroidManifest-Runtime.xml
diff --git a/make/lib/android/AndroidManifest-Test.xml b/make/resources/android/AndroidManifest-Test.xml
index c7c8f03..c7c8f03 100644
--- a/make/lib/android/AndroidManifest-Test.xml
+++ b/make/resources/android/AndroidManifest-Test.xml
diff --git a/make/lib/android/res/drawable-hdpi/icon.png b/make/resources/android/res/drawable-hdpi/icon.png
index 2148232..2148232 100644
--- a/make/lib/android/res/drawable-hdpi/icon.png
+++ b/make/resources/android/res/drawable-hdpi/icon.png
diff --git a/make/lib/android/res/drawable-ldpi/icon.png b/make/resources/android/res/drawable-ldpi/icon.png
index c16211f..c16211f 100644
--- a/make/lib/android/res/drawable-ldpi/icon.png
+++ b/make/resources/android/res/drawable-ldpi/icon.png
diff --git a/make/lib/android/res/drawable-mdpi/icon.png b/make/resources/android/res/drawable-mdpi/icon.png
index 1c26e3f..1c26e3f 100644
--- a/make/lib/android/res/drawable-mdpi/icon.png
+++ b/make/resources/android/res/drawable-mdpi/icon.png
diff --git a/make/lib/android/res/layout/main.xml b/make/resources/android/res/layout/main.xml
index 3a5f117..3a5f117 100644
--- a/make/lib/android/res/layout/main.xml
+++ b/make/resources/android/res/layout/main.xml
diff --git a/make/lib/android/res/values/strings.xml b/make/resources/android/res/values/strings.xml
index f6a6fe4..f6a6fe4 100644
--- a/make/lib/android/res/values/strings.xml
+++ b/make/resources/android/res/values/strings.xml
diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh
index a9d84af..6cbd5cf 100755
--- a/make/scripts/make.gluegen.all.android-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh
@@ -9,7 +9,7 @@ export TARGET_IP=beagle01
 export TARGET_ROOT=/projects
 export TARGET_ANT_HOME=/usr/share/ant
 
-export ANDROID_SDK_VERSION=9
+export ANDROID_VERSION=9
 
 echo ANDROID_SDK_HOME $ANDROID_SDK_HOME
 echo NDK_ROOT $NDK_ROOT
@@ -51,7 +51,6 @@ export ANDROID_SDK_HOME
 
 export PATH="$NDK_TOOLCHAIN/bin:$ANDROID_SDK_HOME/platform-tools:$PATH"
 
-ANDROID_VERSION=9
 export GCC_VERSION=4.4.3
 HOST_ARCH=linux-x86
 export TARGET_ARCH=arm-linux-androideabi