Add Ant property when in release mode.

Also fix some NPE in usage of ISdkLog.warning

Change-Id: Id2803f7692b82d0d2f5dea49f17f916509a7b205

diff --git a/files/ant/ant_rules_r3.xml b/files/ant/ant_rules_r3.xml
index 7848862..2ac5742 100644 (file)
--- a/files/ant/ant_rules_r3.xml
+++ b/files/ant/ant_rules_r3.xml
@@ -436,11 +436,15 @@
         <echo>and run zipalign from the Android SDK tools.</echo>
     </target>
 
+    <target name="-set-release-mode">
+        <property name="build.mode.release" value="true"/>
+    </target>
+
     <!-- This runs -package-release and -release-nosign first and then runs
          only if release-sign is true (set in -release-check,
          called by -release-no-sign)-->
     <target name="release"
-                depends="-package-release, -release-prompt-for-password, -release-nosign"
+                depends="-set-release-mode, -package-release, -release-prompt-for-password, -release-nosign"
                 if="has.keystore"
                 description="Builds the application. The generated apk file must be signed before
                             it is published.">

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
index 4249365..ca77703 100644 (file)
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
@@ -282,7 +282,7 @@ public final class SdkManager {
                 // version string
                 String apiName = map.get(PROP_VERSION_RELEASE);
                 if (apiName == null) {
-                    log.warning(null,
+                    log.warning(
                             "Ignoring platform '%1$s': %2$s is missing from '%3$s'",
                             platform.getName(), PROP_VERSION_RELEASE,
                             SdkConstants.FN_BUILD_PROP);
@@ -293,7 +293,7 @@ public final class SdkManager {
                 int apiNumber;
                 String stringValue = map.get(PROP_VERSION_SDK);
                 if (stringValue == null) {
-                    log.warning(null,
+                    log.warning(
                             "Ignoring platform '%1$s': %2$s is missing from '%3$s'",
                             platform.getName(), PROP_VERSION_SDK,
                             SdkConstants.FN_BUILD_PROP);
@@ -304,7 +304,7 @@ public final class SdkManager {
                     } catch (NumberFormatException e) {
                         // looks like apiNumber does not parse to a number.
                         // Ignore this platform.
-                        log.warning(null,
+                        log.warning(
                                 "Ignoring platform '%1$s': %2$s is not a valid number in %3$s.",
                                 platform.getName(), PROP_VERSION_SDK,
                                 SdkConstants.FN_BUILD_PROP);
@@ -360,7 +360,7 @@ public final class SdkManager {
                 return target;
             }
         } else {
-            log.warning(null, "Ignoring platform '%1$s': %2$s is missing.", platform.getName(),
+            log.warning("Ignoring platform '%1$s': %2$s is missing.", platform.getName(),
                     SdkConstants.FN_BUILD_PROP);
         }
 
@@ -448,7 +448,7 @@ public final class SdkManager {
 
                     if (baseTarget == null) {
                         // Ignore this add-on.
-                        log.warning(null,
+                        log.warning(
                                 "Ignoring add-on '%1$s': Unable to find base platform with API level '%2$s'",
                                 addon.getName(), api);
                         return null;
@@ -470,7 +470,7 @@ public final class SdkManager {
                     } catch (NumberFormatException e) {
                         // looks like apiNumber does not parse to a number.
                         // Ignore this add-on.
-                        log.warning(null,
+                        log.warning(
                                 "Ignoring add-on '%1$s': %2$s is not a valid number in %3$s.",
                                 addon.getName(), ADDON_REVISION, SdkConstants.FN_BUILD_PROP);
                         return null;
@@ -501,12 +501,12 @@ public final class SdkManager {
                                         libMap.put(libName, new String[] {
                                                 m.group(1), m.group(2) });
                                     } else {
-                                        log.warning(null,
+                                        log.warning(
                                                 "Ignoring library '%1$s', property value has wrong format\n\t%2$s",
                                                 libName, libData);
                                     }
                                 } else {
-                                    log.warning(null,
+                                    log.warning(
                                             "Ignoring library '%1$s', missing property value",
                                             libName, libData);
                                 }
@@ -542,7 +542,7 @@ public final class SdkManager {
                 return target;
             }
         } else {
-            log.warning(null, "Ignoring add-on '%1$s': %2$s is missing.", addon.getName(),
+            log.warning("Ignoring add-on '%1$s': %2$s is missing.", addon.getName(),
                     SdkConstants.FN_MANIFEST_INI);
         }
 
@@ -578,7 +578,7 @@ public final class SdkManager {
      * @param valueName The missing manifest value, for display.
      */
     private static void displayAddonManifestWarning(ISdkLog log, String addonName, String valueName) {
-        log.warning(null, "Ignoring add-on '%1$s': '%2$s' is missing from %3$s.",
+        log.warning("Ignoring add-on '%1$s': '%2$s' is missing from %3$s.",
                 addonName, valueName, SdkConstants.FN_MANIFEST_INI);
     }
 
@@ -595,8 +595,7 @@ public final class SdkManager {
         for (String relativePath : sPlatformContentList) {
             File f = new File(platform, relativePath);
             if (!f.exists()) {
-                log.warning(null,
-                        "Ignoring platform '%1$s': %2$s is missing.",
+                log.warning("Ignoring platform '%1$s': %2$s is missing.",
                         platform.getName(), relativePath);
                 return false;
             }