diff options
| -rw-r--r-- | subsonic-android/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | subsonic-android/build.xml | 43 |
2 files changed, 29 insertions, 22 deletions
diff --git a/subsonic-android/AndroidManifest.xml b/subsonic-android/AndroidManifest.xml index 914f02fb..a6c33662 100644 --- a/subsonic-android/AndroidManifest.xml +++ b/subsonic-android/AndroidManifest.xml @@ -2,8 +2,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.sourceforge.subsonic.androidapp"
android:installLocation="auto"
- android:versionCode="46"
- android:versionName="3.3">
+ android:versionCode="1"
+ android:versionName="3.3.1">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
@@ -13,14 +13,14 @@ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
- <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="10"/>
+ <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="14"/>
<supports-screens android:anyDensity="true" android:xlargeScreens="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
<application android:label="@string/common.appname" android:icon="@drawable/launch" android:theme="@style/Wheat">
<activity android:name="net.sourceforge.subsonic.androidapp.activity.MainActivity"
- android:label="Subsonic"
+ android:label="Subphonic"
android:configChanges="orientation|keyboardHidden"
android:launchMode="standard">
<intent-filter>
diff --git a/subsonic-android/build.xml b/subsonic-android/build.xml index 02e7d6ab..6d0d026f 100644 --- a/subsonic-android/build.xml +++ b/subsonic-android/build.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?>
-<project name="subsonic" default="help">
+<project name="subsonic-android" default="help">
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
- <loadproperties srcFile="local.properties" />
+ <property file="local.properties" />
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
@@ -28,6 +28,15 @@ -->
<property file="ant.properties" />
+ <!-- if sdk.dir was not set from one of the property file, then
+ get it from the ANDROID_HOME env var.
+ This must be done before we load project.properties since
+ the proguard config can use sdk.dir -->
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+ <isset property="env.ANDROID_HOME" />
+ </condition>
+
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
@@ -41,25 +50,23 @@ <!-- quick check on sdk.dir -->
<fail
- message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
unless="sdk.dir"
/>
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
- in between standard targets -->
-<!--
- <target name="-pre-build">
- </target>
- <target name="-pre-compile">
- </target>
-
- /* This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir} */
- <target name="-post-compile">
- </target>
--->
+ <!--
+ Import per project custom build rules if present at the root of the project.
+ This is the place to put custom intermediary targets such as:
+ -pre-build
+ -pre-compile
+ -post-compile (This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir})
+ -post-package
+ -post-build
+ -pre-clean
+ -->
+ <import file="custom_rules.xml" optional="true" />
<!-- Import the actual build file.
|