From 258d1d4ce00c98e70b65de24fe7eb4a6dc18e6ec Mon Sep 17 00:00:00 2001
From: "leozwang@webrtc.org"
 <leozwang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Tue, 27 Mar 2012 16:40:04 +0000
Subject: [PATCH] Update build support for android Review URL:
 https://webrtc-codereview.appspot.com/459007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1946 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../test/android_test/AndroidManifest.xml     |  2 +-
 .../main/test/android_test/build.xml          | 85 +++++++++++++++++++
 .../gen/org/webrtc/androidapp/R.java          | 68 ---------------
 .../main/test/android_test/project.properties | 13 +++
 4 files changed, 99 insertions(+), 69 deletions(-)
 create mode 100644 src/video_engine/main/test/android_test/build.xml
 delete mode 100644 src/video_engine/main/test/android_test/gen/org/webrtc/androidapp/R.java
 create mode 100644 src/video_engine/main/test/android_test/project.properties

diff --git a/src/video_engine/main/test/android_test/AndroidManifest.xml b/src/video_engine/main/test/android_test/AndroidManifest.xml
index 0714aed7c3..08a9c4d9ce 100644
--- a/src/video_engine/main/test/android_test/AndroidManifest.xml
+++ b/src/video_engine/main/test/android_test/AndroidManifest.xml
@@ -16,7 +16,7 @@
             </intent-filter>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="7" />
+    <uses-sdk android:minSdkVersion="9" />
     <uses-permission android:name="android.permission.CAMERA"></uses-permission>
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
diff --git a/src/video_engine/main/test/android_test/build.xml b/src/video_engine/main/test/android_test/build.xml
new file mode 100644
index 0000000000..9afa947572
--- /dev/null
+++ b/src/video_engine/main/test/android_test/build.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ViEAndroidDemo" 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 ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         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'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         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="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- 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"
+            unless="sdk.dir"
+    />
+
+
+<!-- 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>
+-->
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/src/video_engine/main/test/android_test/gen/org/webrtc/androidapp/R.java b/src/video_engine/main/test/android_test/gen/org/webrtc/androidapp/R.java
deleted file mode 100644
index c35047b661..0000000000
--- a/src/video_engine/main/test/android_test/gen/org/webrtc/androidapp/R.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.webrtc.videoengineapp;
-
-public final class R {
-    public static final class array {
-        public static final int codecSize=0x7f040001;
-        public static final int codectype=0x7f040000;
-        public static final int voiceCodecType=0x7f040002;
-    }
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int bar=0x7f020000;
-        public static final int bg=0x7f020001;
-        public static final int logo=0x7f020002;
-        public static final int robot=0x7f020003;
-        public static final int video=0x7f020004;
-    }
-    public static final class id {
-        public static final int LinearLayout01=0x7f060010;
-        public static final int LinearLayout02=0x7f060006;
-        public static final int TextView01=0x7f060005;
-        public static final int TextView02=0x7f06000b;
-        public static final int TextView03=0x7f060004;
-        public static final int btStartBoth=0x7f060013;
-        public static final int btStartListen=0x7f060011;
-        public static final int btStartSend=0x7f060012;
-        public static final int cbLoopback=0x7f06000e;
-        public static final int cbVoice=0x7f06000d;
-        public static final int etRemoteIp=0x7f06000c;
-        public static final int ivPreview=0x7f060014;
-        public static final int ivTopBar=0x7f060002;
-        public static final int rlSurfaces=0x7f060000;
-        public static final int spCodecSize=0x7f06000a;
-        public static final int spCodecType=0x7f060007;
-        public static final int spVoiceCodecType=0x7f060008;
-        public static final int svLocal=0x7f060001;
-        public static final int tvCodecSize=0x7f060009;
-        public static final int tvLocalIp=0x7f06000f;
-        public static final int tvTitle=0x7f060003;
-    }
-    public static final class layout {
-        public static final int both=0x7f030000;
-        public static final int main=0x7f030001;
-        public static final int send=0x7f030002;
-    }
-    public static final class string {
-        public static final int app_name=0x7f050001;
-        public static final int codecSize=0x7f050007;
-        public static final int codecType=0x7f050006;
-        public static final int codectype_prompt=0x7f050004;
-        public static final int demoTitle=0x7f050005;
-        public static final int enableVoice=0x7f05000d;
-        public static final int error=0x7f050002;
-        public static final int errorCamera=0x7f050003;        
-        public static final int loopback=0x7f050009;
-        public static final int remoteIp=0x7f050008;
-        public static final int startBoth=0x7f05000c;
-        public static final int startListen=0x7f05000a;
-        public static final int startSend=0x7f05000b;
-    }
-}
diff --git a/src/video_engine/main/test/android_test/project.properties b/src/video_engine/main/test/android_test/project.properties
new file mode 100644
index 0000000000..4d7ea1e41e
--- /dev/null
+++ b/src/video_engine/main/test/android_test/project.properties
@@ -0,0 +1,13 @@
+# 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,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Indicates whether an apk should be generated for each density.
+split.density=false
+# Project target.
+target=android-9