From 7d87c565a7a9e3fe9b11eead657638c0fc7eae4f Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Tue, 23 Oct 2012 16:34:02 -0700
Subject: Set the permission of the emma file before downloading it.

Also fix the build file of the a couple of test projects.

Change-Id: I5e75f9c4ac397350d7b54e660782d38a2e3de5ad
---
 testapps/buildConfigTest/app/build.xml  | 11 ++++++++++-
 testapps/buildConfigTest/lib1/build.xml | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'testapps')

diff --git a/testapps/buildConfigTest/app/build.xml b/testapps/buildConfigTest/app/build.xml
index 09cd9079b..93dfe0f6a 100644
--- a/testapps/buildConfigTest/app/build.xml
+++ b/testapps/buildConfigTest/app/build.xml
@@ -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,7 +50,7 @@
 
     <!-- quick check on sdk.dir -->
     <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            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"
     />
 
diff --git a/testapps/buildConfigTest/lib1/build.xml b/testapps/buildConfigTest/lib1/build.xml
index 2a15ae634..a111b4d78 100644
--- a/testapps/buildConfigTest/lib1/build.xml
+++ b/testapps/buildConfigTest/lib1/build.xml
@@ -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,7 +50,7 @@
 
     <!-- quick check on sdk.dir -->
     <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            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"
     />
 
-- 
cgit v1.2.3