From 6e90766992f39cff50889c7d3c32d2c208360f1c Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Thu, 7 May 2009 12:25:24 -0700
Subject: [PATCH] Remove files from NDK samples that should not be there.

---
 ndk/apps/hello-jni/project/build.properties   | 15 -----
 ndk/apps/hello-jni/project/build.xml          | 61 -------------------
 ndk/apps/hello-jni/project/local.properties   | 10 ---
 .../hello-jni/project/res/layout/main.xml     | 13 ----
 .../hello-jni/project/tests/build.properties  | 15 -----
 ndk/apps/hello-jni/project/tests/build.xml    | 61 -------------------
 .../hello-jni/project/tests/local.properties  | 10 ---
 ndk/apps/two-libs/project/build.properties    | 15 -----
 ndk/apps/two-libs/project/build.xml           | 61 -------------------
 ndk/apps/two-libs/project/local.properties    | 10 ---
 ndk/apps/two-libs/project/res/layout/main.xml | 13 ----
 .../two-libs/project/tests/build.properties   | 15 -----
 ndk/apps/two-libs/project/tests/build.xml     | 61 -------------------
 .../two-libs/project/tests/local.properties   | 10 ---
 14 files changed, 370 deletions(-)
 delete mode 100644 ndk/apps/hello-jni/project/build.properties
 delete mode 100644 ndk/apps/hello-jni/project/build.xml
 delete mode 100644 ndk/apps/hello-jni/project/local.properties
 delete mode 100644 ndk/apps/hello-jni/project/res/layout/main.xml
 delete mode 100644 ndk/apps/hello-jni/project/tests/build.properties
 delete mode 100644 ndk/apps/hello-jni/project/tests/build.xml
 delete mode 100644 ndk/apps/hello-jni/project/tests/local.properties
 delete mode 100644 ndk/apps/two-libs/project/build.properties
 delete mode 100644 ndk/apps/two-libs/project/build.xml
 delete mode 100644 ndk/apps/two-libs/project/local.properties
 delete mode 100644 ndk/apps/two-libs/project/res/layout/main.xml
 delete mode 100644 ndk/apps/two-libs/project/tests/build.properties
 delete mode 100644 ndk/apps/two-libs/project/tests/build.xml
 delete mode 100644 ndk/apps/two-libs/project/tests/local.properties

diff --git a/ndk/apps/hello-jni/project/build.properties b/ndk/apps/hello-jni/project/build.properties
deleted file mode 100644
index a6504854e..000000000
--- a/ndk/apps/hello-jni/project/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.
-
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-#application-package=com.example.myproject
-
-# The name of the source folder.
-#source-folder=src
-
-# The name of the output folder.
-#out-folder=bin
-
diff --git a/ndk/apps/hello-jni/project/build.xml b/ndk/apps/hello-jni/project/build.xml
deleted file mode 100644
index 8beda0e5e..000000000
--- a/ndk/apps/hello-jni/project/build.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="HelloJni" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contain the path to the SDK. It should *NOT* be checked in in 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:
-
-         application-package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
-         source-folder
-             the name of the source folder. Default is 'src'.
-         out-folder
-             the name of the output folder. 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 in in 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 in in 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-location}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs"/>
-
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the rules files.
-         To customize the rules, copy/paste them below the task, and disable import by setting
-         the import attribute to false:
-            <setup import="false" />
-         
-         This will ensure that the properties are setup correctly but that your customized
-         targets are used.
-    -->
-    <setup />
-</project>
diff --git a/ndk/apps/hello-jni/project/local.properties b/ndk/apps/hello-jni/project/local.properties
deleted file mode 100644
index 4bdd176a2..000000000
--- a/ndk/apps/hello-jni/project/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk-location=/opt/digit/android/main/cupcake/android/out/host/linux-x86/sdk/android-sdk_eng.digit_linux-x86
diff --git a/ndk/apps/hello-jni/project/res/layout/main.xml b/ndk/apps/hello-jni/project/res/layout/main.xml
deleted file mode 100644
index abcc47f17..000000000
--- a/ndk/apps/hello-jni/project/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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, HelloJni"
-    />
-</LinearLayout>
-
diff --git a/ndk/apps/hello-jni/project/tests/build.properties b/ndk/apps/hello-jni/project/tests/build.properties
deleted file mode 100644
index a6504854e..000000000
--- a/ndk/apps/hello-jni/project/tests/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.
-
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-#application-package=com.example.myproject
-
-# The name of the source folder.
-#source-folder=src
-
-# The name of the output folder.
-#out-folder=bin
-
diff --git a/ndk/apps/hello-jni/project/tests/build.xml b/ndk/apps/hello-jni/project/tests/build.xml
deleted file mode 100644
index 8beda0e5e..000000000
--- a/ndk/apps/hello-jni/project/tests/build.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="HelloJni" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contain the path to the SDK. It should *NOT* be checked in in 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:
-
-         application-package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
-         source-folder
-             the name of the source folder. Default is 'src'.
-         out-folder
-             the name of the output folder. 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 in in 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 in in 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-location}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs"/>
-
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the rules files.
-         To customize the rules, copy/paste them below the task, and disable import by setting
-         the import attribute to false:
-            <setup import="false" />
-         
-         This will ensure that the properties are setup correctly but that your customized
-         targets are used.
-    -->
-    <setup />
-</project>
diff --git a/ndk/apps/hello-jni/project/tests/local.properties b/ndk/apps/hello-jni/project/tests/local.properties
deleted file mode 100644
index 4bdd176a2..000000000
--- a/ndk/apps/hello-jni/project/tests/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk-location=/opt/digit/android/main/cupcake/android/out/host/linux-x86/sdk/android-sdk_eng.digit_linux-x86
diff --git a/ndk/apps/two-libs/project/build.properties b/ndk/apps/two-libs/project/build.properties
deleted file mode 100644
index a6504854e..000000000
--- a/ndk/apps/two-libs/project/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.
-
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-#application-package=com.example.myproject
-
-# The name of the source folder.
-#source-folder=src
-
-# The name of the output folder.
-#out-folder=bin
-
diff --git a/ndk/apps/two-libs/project/build.xml b/ndk/apps/two-libs/project/build.xml
deleted file mode 100644
index 5783bd77b..000000000
--- a/ndk/apps/two-libs/project/build.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="TwoLib" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contain the path to the SDK. It should *NOT* be checked in in 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:
-
-         application-package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
-         source-folder
-             the name of the source folder. Default is 'src'.
-         out-folder
-             the name of the output folder. 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 in in 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 in in 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-location}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs"/>
-
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the rules files.
-         To customize the rules, copy/paste them below the task, and disable import by setting
-         the import attribute to false:
-            <setup import="false" />
-         
-         This will ensure that the properties are setup correctly but that your customized
-         targets are used.
-    -->
-    <setup />
-</project>
diff --git a/ndk/apps/two-libs/project/local.properties b/ndk/apps/two-libs/project/local.properties
deleted file mode 100644
index 4bdd176a2..000000000
--- a/ndk/apps/two-libs/project/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk-location=/opt/digit/android/main/cupcake/android/out/host/linux-x86/sdk/android-sdk_eng.digit_linux-x86
diff --git a/ndk/apps/two-libs/project/res/layout/main.xml b/ndk/apps/two-libs/project/res/layout/main.xml
deleted file mode 100644
index 14ae52eec..000000000
--- a/ndk/apps/two-libs/project/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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, TwoLib"
-    />
-</LinearLayout>
-
diff --git a/ndk/apps/two-libs/project/tests/build.properties b/ndk/apps/two-libs/project/tests/build.properties
deleted file mode 100644
index a6504854e..000000000
--- a/ndk/apps/two-libs/project/tests/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.
-
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-#application-package=com.example.myproject
-
-# The name of the source folder.
-#source-folder=src
-
-# The name of the output folder.
-#out-folder=bin
-
diff --git a/ndk/apps/two-libs/project/tests/build.xml b/ndk/apps/two-libs/project/tests/build.xml
deleted file mode 100644
index 5783bd77b..000000000
--- a/ndk/apps/two-libs/project/tests/build.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="TwoLib" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contain the path to the SDK. It should *NOT* be checked in in 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:
-
-         application-package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
-         source-folder
-             the name of the source folder. Default is 'src'.
-         out-folder
-             the name of the output folder. 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 in in 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 in in 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-location}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs"/>
-
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the rules files.
-         To customize the rules, copy/paste them below the task, and disable import by setting
-         the import attribute to false:
-            <setup import="false" />
-         
-         This will ensure that the properties are setup correctly but that your customized
-         targets are used.
-    -->
-    <setup />
-</project>
diff --git a/ndk/apps/two-libs/project/tests/local.properties b/ndk/apps/two-libs/project/tests/local.properties
deleted file mode 100644
index 4bdd176a2..000000000
--- a/ndk/apps/two-libs/project/tests/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk-location=/opt/digit/android/main/cupcake/android/out/host/linux-x86/sdk/android-sdk_eng.digit_linux-x86