diff options
| author | Keith Packard <keithp@keithp.com> | 2016-04-27 01:39:01 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2016-04-27 01:39:01 -0400 |
| commit | 02f47fa98536eb0ecd58cd8f063600ced60e0a8a (patch) | |
| tree | 754c8cc4e9f8645831c5342337694f4a6a06dd98 | |
| parent | d81f94fd5339d513de9bde5a2e19f8eca526344f (diff) | |
Fix key in AndroidManifest.xml.in
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosdroid/AndroidManifest.xml.in | 2 | ||||
| -rw-r--r-- | altoslib/AltosVersion.java.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/altosdroid/AndroidManifest.xml.in b/altosdroid/AndroidManifest.xml.in index 488a6766..3409c9fe 100644 --- a/altosdroid/AndroidManifest.xml.in +++ b/altosdroid/AndroidManifest.xml.in @@ -100,7 +100,7 @@ <service android:name=".TelemetryService" /> <meta-data android:name="com.google.android.maps.v2.API_KEY" - android:value="AIzaSyDSr6u4i9TJmVGhgGk4g0wUUhTy9FGyn0s"/> + android:value="@GOOGLEKEY@"/> <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> </application> diff --git a/altoslib/AltosVersion.java.in b/altoslib/AltosVersion.java.in index 050b9480..9ac94dcd 100644 --- a/altoslib/AltosVersion.java.in +++ b/altoslib/AltosVersion.java.in @@ -20,7 +20,7 @@ package org.altusmetrum.altoslib_10; public class AltosVersion { public final static String version = "@VERSION@"; - public final static String google_maps_api_key = @GOOGLEKEY@; + public final static String google_maps_api_key = "@GOOGLEKEY@"; public static boolean has_google_maps_api_key() { return google_maps_api_key != null && google_maps_api_key.length() > 1; diff --git a/configure.ac b/configure.ac index 80590133..ee3d4225 100644 --- a/configure.ac +++ b/configure.ac @@ -174,7 +174,7 @@ AC_ARG_WITH(google-key, AS_HELP_STRING([--with-google-key=PATH], [GOOGLEKEYFILE=$withval], [GOOGLEKEYFILE=$HOME/altusmetrumllc/google-maps-api-key]) if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then - GOOGLEKEY='"'`cat "$GOOGLEKEYFILE"`'"' + GOOGLEKEY=`cat "$GOOGLEKEYFILE"` HAVE_GOOGLE_KEY="yes" else GOOGLEKEY='null' |