From 3d3c3c3a3e4e05f7ae7a0dff440fe500f90b785c Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Tue, 31 Aug 2010 10:21:29 -0700
Subject: ADT: Make release and debug builds really different.

Release export should not be debug builds that are
stripped of their signature and (optionnaly) resigned.
Instead they should actually build the apk in "release"
mode.

Refactor PostCompilerHelper to be easier to use for
export feature (moved all error handling into the
actual IncrementalBuilder since we don't want the
helper to put error/warning marker during release
export).

Update the API of ApkBuilder and PostCompilerHelper
to deal better with signing key:
- option to package with a "sign with debug" flag.
- new option to package/sign with given keys.

Debug build (through incremental builder) use the new
aapt option --debug-mode that automatically insert
debuggable=true in the manifest. This allows for the
same source code to generate debug and release builds.

Currently, only the "export unsigned release apk"
action use the new "release" build. Need to update
the export wizard. Also need to add support for this
in Ant.

New folder in sdk.git/testapps for test projects
to be used in upcoming automated build tests.
Simple "basicProject" to start with.

Change-Id: I3041312bc817153603656de2aa355f8fcaf00b5b
---
 testapps/.gitignore                                |   3 +
 testapps/README.txt                                |   6 ++
 testapps/basicProject/.classpath                   |   7 ++
 testapps/basicProject/.project                     |  33 ++++++++
 testapps/basicProject/AndroidManifest.xml          |  16 ++++
 testapps/basicProject/build.properties             |  17 +++++
 testapps/basicProject/build.xml                    |  84 +++++++++++++++++++++
 testapps/basicProject/default.properties           |  11 +++
 testapps/basicProject/res/drawable-hdpi/icon.png   | Bin 0 -> 4147 bytes
 testapps/basicProject/res/drawable-ldpi/icon.png   | Bin 0 -> 1723 bytes
 testapps/basicProject/res/drawable-mdpi/icon.png   | Bin 0 -> 2574 bytes
 testapps/basicProject/res/layout/main.xml          |  13 ++++
 testapps/basicProject/res/values/strings.xml       |   4 +
 .../src/com/android/tests/basicproject/Main.java   |  15 ++++
 14 files changed, 209 insertions(+)
 create mode 100644 testapps/.gitignore
 create mode 100644 testapps/README.txt
 create mode 100644 testapps/basicProject/.classpath
 create mode 100644 testapps/basicProject/.project
 create mode 100644 testapps/basicProject/AndroidManifest.xml
 create mode 100644 testapps/basicProject/build.properties
 create mode 100644 testapps/basicProject/build.xml
 create mode 100644 testapps/basicProject/default.properties
 create mode 100644 testapps/basicProject/res/drawable-hdpi/icon.png
 create mode 100644 testapps/basicProject/res/drawable-ldpi/icon.png
 create mode 100644 testapps/basicProject/res/drawable-mdpi/icon.png
 create mode 100644 testapps/basicProject/res/layout/main.xml
 create mode 100644 testapps/basicProject/res/values/strings.xml
 create mode 100644 testapps/basicProject/src/com/android/tests/basicproject/Main.java

(limited to 'testapps')

diff --git a/testapps/.gitignore b/testapps/.gitignore
new file mode 100644
index 000000000..0c75cfd48
--- /dev/null
+++ b/testapps/.gitignore
@@ -0,0 +1,3 @@
+*/bin
+*/local.properties
+*/gen
diff --git a/testapps/README.txt b/testapps/README.txt
new file mode 100644
index 000000000..e76bc4de2
--- /dev/null
+++ b/testapps/README.txt
@@ -0,0 +1,6 @@
+This repository contains test applications used by the SDK automated tests.
+
+These are not meant to be packaged with the SDK.
+
+Each project represents a different test case. For more information, read
+the readme file located in the project directory.
\ No newline at end of file
diff --git a/testapps/basicProject/.classpath b/testapps/basicProject/.classpath
new file mode 100644
index 000000000..609aa00eb
--- /dev/null
+++ b/testapps/basicProject/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/testapps/basicProject/.project b/testapps/basicProject/.project
new file mode 100644
index 000000000..2bf35ceee
--- /dev/null
+++ b/testapps/basicProject/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>BasicProject</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/testapps/basicProject/AndroidManifest.xml b/testapps/basicProject/AndroidManifest.xml
new file mode 100644
index 000000000..978c71ead
--- /dev/null
+++ b/testapps/basicProject/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.tests.basicproject"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name="Main"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    <uses-sdk android:minSdkVersion="AOSP" />
+</manifest> 
diff --git a/testapps/basicProject/build.properties b/testapps/basicProject/build.properties
new file mode 100644
index 000000000..edc7f2305
--- /dev/null
+++ b/testapps/basicProject/build.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+# 
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
diff --git a/testapps/basicProject/build.xml b/testapps/basicProject/build.xml
new file mode 100644
index 000000000..9ac802ced
--- /dev/null
+++ b/testapps/basicProject/build.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="BasicProject" 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. -->
+    <property file="local.properties" />
+
+    <!-- The build.properties file can be created by you and is never touched
+         by the 'android' tool. This is the place to change some of the
+         default property values used by the Ant rules.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="build.properties" />
+
+    <!-- The default.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <property file="default.properties" />
+
+    <!-- Custom Android task to deal with the project target, and import the
+         proper rules.
+         This requires ant 1.6.0 or above. -->
+    <path id="android.antlibs">
+        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+    </path>
+
+    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
+        classpathref="android.antlibs" />
+
+<!-- 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>
+-->
+
+
+    <!-- Execute the Android Setup task that will setup some properties
+         specific to the target, and import the build rules files.
+
+         The rules file is imported from
+            <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <setup> task.
+             - customize it to your needs.
+         - Customize the whole script.
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, *after* the <setup> task
+             - disable the import of the rules by changing the setup task
+               below to <setup import="false" />. 
+             - customize to your needs.
+    -->
+    <setup />
+
+</project>
diff --git a/testapps/basicProject/default.properties b/testapps/basicProject/default.properties
new file mode 100644
index 000000000..640d5d42d
--- /dev/null
+++ b/testapps/basicProject/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-AOSP
diff --git a/testapps/basicProject/res/drawable-hdpi/icon.png b/testapps/basicProject/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..8074c4c57
Binary files /dev/null and b/testapps/basicProject/res/drawable-hdpi/icon.png differ
diff --git a/testapps/basicProject/res/drawable-ldpi/icon.png b/testapps/basicProject/res/drawable-ldpi/icon.png
new file mode 100644
index 000000000..1095584ec
Binary files /dev/null and b/testapps/basicProject/res/drawable-ldpi/icon.png differ
diff --git a/testapps/basicProject/res/drawable-mdpi/icon.png b/testapps/basicProject/res/drawable-mdpi/icon.png
new file mode 100644
index 000000000..a07c69fa5
Binary files /dev/null and b/testapps/basicProject/res/drawable-mdpi/icon.png differ
diff --git a/testapps/basicProject/res/layout/main.xml b/testapps/basicProject/res/layout/main.xml
new file mode 100644
index 000000000..829994ccf
--- /dev/null
+++ b/testapps/basicProject/res/layout/main.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="Hello World, Main"
+    />
+</LinearLayout>
+
diff --git a/testapps/basicProject/res/values/strings.xml b/testapps/basicProject/res/values/strings.xml
new file mode 100644
index 000000000..549e4ea50
--- /dev/null
+++ b/testapps/basicProject/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Main</string>
+</resources>
diff --git a/testapps/basicProject/src/com/android/tests/basicproject/Main.java b/testapps/basicProject/src/com/android/tests/basicproject/Main.java
new file mode 100644
index 000000000..124055646
--- /dev/null
+++ b/testapps/basicProject/src/com/android/tests/basicproject/Main.java
@@ -0,0 +1,15 @@
+package com.android.tests.basicproject;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class Main extends Activity
+{
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}
-- 
cgit v1.2.3