Update build settings

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d1ee57adba0e3a3656f1db8d20597483953c9c14..5ff7ed080be1e05bdc8ce8e25f64b8857f1e1109 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,9 +4,6 @@
        android:versionCode="1"
        android:versionName="1.0">
 
        android:versionCode="1"
        android:versionName="1.0">
 

-       <!-- Libraries -->
-       <uses-library android:name="com.google.android.maps" />
-

        <!-- Permissions -->
        <uses-permission
                android:name="android.permission.INTERNET" />
        <!-- Permissions -->
        <uses-permission
                android:name="android.permission.INTERNET" />


@@ -31,7 +28,7 @@
                android:glEsVersion="0x00020000"
                android:required="true"/>
        <uses-sdk
                android:glEsVersion="0x00020000"
                android:required="true"/>
        <uses-sdk

-               android:minSdkVersion="18"
+               android:minSdkVersion="16"

                android:targetSdkVersion="18" />
 
        <!-- Application -->
                android:targetSdkVersion="18" />
 
        <!-- Application -->


@@ -45,11 +42,15 @@
                </activity>
                <activity android:name="Prefs" />
                <service android:name="Task" />
                </activity>
                <activity android:name="Prefs" />
                <service android:name="Task" />

+               <uses-library android:name="com.google.android.maps" />

                <meta-data
                        android:name="com.google.android.gms.version"
                        android:value="@integer/google_play_services_version" />
                <meta-data
                        android:name="com.google.android.maps.v2.API_KEY"
                        android:value="AIzaSyBTOTiH7zrXImYe4ToscaQ9CEcPyfOzwSI"/>
                <meta-data
                        android:name="com.google.android.gms.version"
                        android:value="@integer/google_play_services_version" />
                <meta-data
                        android:name="com.google.android.maps.v2.API_KEY"
                        android:value="AIzaSyBTOTiH7zrXImYe4ToscaQ9CEcPyfOzwSI"/>

+               <meta-data
+                       android:name="com.google.android.maps.v2.API_KEY"
+                       android:value="AIzaSyB1Q-J1Pv4RHncjnQvEmvdRFTv-snKyUpU"/>

        </application>
 </manifest>
        </application>
 </manifest>

diff --git a/makefile b/makefile
index 5ad3fd541a4d33cf689b6dd03fce9d8050ce60ea..3b60e5ef4a4f0c64db420f3ff5f03d8fdb3bfe6c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -40,7 +40,7 @@ run: bin/install.stamp
                -a android.intent.action.MAIN \
                -n $(PACKAGE)/.Main
 
                -a android.intent.action.MAIN \
                -n $(PACKAGE)/.Main
 

-install bin/install.stamp: bin/$(PROGRAM).apk
+install bin/install.stamp: bin/$(PROGRAM).dbg

        adb install -r $+
        touch bin/install.stamp
 
        adb install -r $+
        touch bin/install.stamp