diff options
author | Sven Gothel <[email protected]> | 2011-08-02 12:05:45 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-08-02 12:05:45 +0200 |
commit | e959f955901492f7d61abaa05da10c993052652b (patch) | |
tree | 1df10becd7e24fbed6d90bea08aaf11cd783a843 /make/lib/android | |
parent | e813dbe55f2a56457f28d1efd82762ce412b1f86 (diff) |
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
Diffstat (limited to 'make/lib/android')
-rw-r--r-- | make/lib/android/AndroidManifest-CompileTime.xml | 26 | ||||
-rw-r--r-- | make/lib/android/AndroidManifest-Runtime.xml | 26 | ||||
-rw-r--r-- | make/lib/android/AndroidManifest-Test.xml | 26 | ||||
-rw-r--r-- | make/lib/android/res/drawable-hdpi/icon.png | bin | 2516 -> 0 bytes | |||
-rw-r--r-- | make/lib/android/res/drawable-ldpi/icon.png | bin | 1172 -> 0 bytes | |||
-rw-r--r-- | make/lib/android/res/drawable-mdpi/icon.png | bin | 1570 -> 0 bytes | |||
-rw-r--r-- | make/lib/android/res/layout/main.xml | 12 | ||||
-rw-r--r-- | make/lib/android/res/values/strings.xml | 8 |
8 files changed, 0 insertions, 98 deletions
diff --git a/make/lib/android/AndroidManifest-CompileTime.xml b/make/lib/android/AndroidManifest-CompileTime.xml deleted file mode 100644 index f9a5600..0000000 --- a/make/lib/android/AndroidManifest-CompileTime.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - sharedUserId="com.jogamp.Community" - package="com.jogamp.gluegen"> - - <uses-sdk android:minSdkVersion="8" /> - - <application android:icon="@drawable/icon" - android:label="@string/app_name" - android:description="@string/app_descr" - android:persistent="false" - > - <activity android:name="jogamp.common.os.android.GluegenVersionActivity" - android:finishOnTaskLaunch="true" - android:launchMode="singleTop" - android:label="@string/activity_v_name" - android:description="@string/activity_v_descr" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - -</manifest> diff --git a/make/lib/android/AndroidManifest-Runtime.xml b/make/lib/android/AndroidManifest-Runtime.xml deleted file mode 100644 index 7ad8304..0000000 --- a/make/lib/android/AndroidManifest-Runtime.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - sharedUserId="com.jogamp.Community" - package="com.jogamp.common"> - - <uses-sdk android:minSdkVersion="8" /> - - <application android:icon="@drawable/icon" - android:label="@string/app_name" - android:description="@string/app_descr" - android:persistent="false" - > - <activity android:name="jogamp.common.os.android.GluegenVersionActivity" - android:finishOnTaskLaunch="true" - android:launchMode="singleTop" - android:label="@string/activity_v_name" - android:description="@string/activity_v_descr" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - -</manifest> diff --git a/make/lib/android/AndroidManifest-Test.xml b/make/lib/android/AndroidManifest-Test.xml deleted file mode 100644 index c7c8f03..0000000 --- a/make/lib/android/AndroidManifest-Test.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - sharedUserId="com.jogamp.Community" - package="com.jogamp.gluegen.test"> - - <uses-sdk android:minSdkVersion="8" /> - - <application android:icon="@drawable/icon" - android:label="@string/app_name" - android:description="@string/app_descr" - android:persistent="false" - > - <activity android:name="jogamp.common.os.android.GluegenVersionActivity" - android:finishOnTaskLaunch="true" - android:launchMode="singleTop" - android:label="@string/activity_v_name" - android:description="@string/activity_v_descr" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - -</manifest> diff --git a/make/lib/android/res/drawable-hdpi/icon.png b/make/lib/android/res/drawable-hdpi/icon.png Binary files differdeleted file mode 100644 index 2148232..0000000 --- a/make/lib/android/res/drawable-hdpi/icon.png +++ /dev/null diff --git a/make/lib/android/res/drawable-ldpi/icon.png b/make/lib/android/res/drawable-ldpi/icon.png Binary files differdeleted file mode 100644 index c16211f..0000000 --- a/make/lib/android/res/drawable-ldpi/icon.png +++ /dev/null diff --git a/make/lib/android/res/drawable-mdpi/icon.png b/make/lib/android/res/drawable-mdpi/icon.png Binary files differdeleted file mode 100644 index 1c26e3f..0000000 --- a/make/lib/android/res/drawable-mdpi/icon.png +++ /dev/null diff --git a/make/lib/android/res/layout/main.xml b/make/lib/android/res/layout/main.xml deleted file mode 100644 index 3a5f117..0000000 --- a/make/lib/android/res/layout/main.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - > -<TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/hello" - /> -</LinearLayout> diff --git a/make/lib/android/res/values/strings.xml b/make/lib/android/res/values/strings.xml deleted file mode 100644 index f6a6fe4..0000000 --- a/make/lib/android/res/values/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="hello">GlueGen Activity is Greeting You.</string> - <string name="app_name">JogAmp\'s GlueGen Library</string> - <string name="app_descr">Contains Dalvik and native code, supporting native bindings.</string> - <string name="activity_v_name">GlueGen\'s Version</string> - <string name="activity_v_descr">Shows the version of the GlueGen Library.</string> -</resources> |