16 files changed, 0 insertions, 293 deletions
diff --git a/device_validator/.gitignore b/device_validator/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/device_validator/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
-\ No newline at end of file
diff --git a/device_validator/Android.mk b/device_validator/Android.mk
deleted file mode 100644
index 9e32461..0000000
--- a/device_validator/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2012 The Android Open Source Project
-
-DEVICE_VALIDATOR_LOCAL_DIR := $(call my-dir)
-include $(DEVICE_VALIDATOR_LOCAL_DIR)/dvlib/Android.mk
-include $(DEVICE_VALIDATOR_LOCAL_DIR)/app/Android.mk
diff --git a/device_validator/MODULE_LICENSE_APACHE2 b/device_validator/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/device_validator/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/device_validator/app/.classpath b/device_validator/app/.classpath
deleted file mode 100644
index a1d7856..0000000
--- a/device_validator/app/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/dvlib"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/device_validator/app/.project b/device_validator/app/.project
deleted file mode 100644
index fda9e3d..0000000
--- a/device_validator/app/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>device_validator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/device_validator/app/.settings/org.eclipse.jdt.ui.prefs b/device_validator/app/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c0fbc32..0000000
--- a/device_validator/app/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri May 25 10:41:24 PDT 2012
-eclipse.preferences.version=1
-formatter_settings_version=11
diff --git a/device_validator/app/Android.mk b/device_validator/app/Android.mk
deleted file mode 100644
index 93e6226..0000000
--- a/device_validator/app/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAR_MANIFEST := etc/manifest.txt
-
-LOCAL_JAVA_LIBRARIES := \
-	dvlib
-
-LOCAL_MODULE := device_validator
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# Build all sub-directories
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/device_validator/app/etc/Android.mk b/device_validator/app/etc/Android.mk
deleted file mode 100644
index 69a948c..0000000
--- a/device_validator/app/etc/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2012 The Android Open Source Project
-#
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_EXECUTABLES := device_validator
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_PREBUILT)
-
diff --git a/device_validator/app/etc/README b/device_validator/app/etc/README
deleted file mode 100644
index 7cf0a0b..0000000
--- a/device_validator/app/etc/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Device Validator
-================
-  The device validator is a simple tool for validating XML that contains
-  information about a list of Android devices. Simply run the tool from the
-  command-line with the names of the XML files to validate as the arguments.
-  If an XML file fails to validate, the errors will be printed to standard
-  out and the program will terminate with a non-zero exit status.
-
-  See device_example.xml for an example valid XML file, and devices.xsd
-  for the schema the XML must conform to.
-
-Usage (Linux/OSX/BSD)
----------------------
-  ./device_validator [files...]
-
-Usage (Windows)
----------------
-  (from the untar'd directory)
-  java -cp . -jar device_validator.jar [files...]
diff --git a/device_validator/app/etc/device_validator b/device_validator/app/etc/device_validator
deleted file mode 100755
index 08a1023..0000000
--- a/device_validator/app/etc/device_validator
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-# Copyright 2012, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set up prog to be the path of this script, including following symlinks,
-# and set up progdir to be the fully-qualified pathname of its directory.
-prog="$0"
-while [ -h "${prog}" ]; do
-    newProg=`/bin/ls -ld "${prog}"`
-    newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
-    if expr "x${newProg}" : 'x/' >/dev/null; then
-        prog="${newProg}"
-    else
-        progdir=`dirname "${prog}"`
-        prog="${progdir}/${newProg}"
-    fi
-done
-oldwd=`pwd`
-progdir=`dirname "${prog}"`
-cd "${progdir}"
-progdir=`pwd`
-prog="${progdir}"/`basename "${prog}"`
-cd "${oldwd}"
-
-jarfile=device_validator.jar
-frameworkdir="$progdir"
-libdir="$progdir"
-if [ ! -r "$frameworkdir/$jarfile" ]
-then
-    frameworkdir=`dirname "$progdir"`/tools/lib
-    libdir=`dirname "$progdir"`/tools/lib
-fi
-if [ ! -r "$frameworkdir/$jarfile" ]
-then
-    frameworkdir=`dirname "$progdir"`/framework
-    libdir=`dirname "$progdir"`/lib
-fi
-if [ ! -r "$frameworkdir/$jarfile" ]
-then
-    echo `basename "$prog"`": can't find $jarfile"
-    exit 1
-fi
-
-
-# Check args.
-if [ debug = "$1" ]; then
-    # add this in for debugging
-    java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y
-    shift 1
-else
-    java_debug=
-fi
-
-javaCmd="java"
-
-# Mac OS X needs an additional arg, or you get an "illegal thread" complaint.
-if [ `uname` = "Darwin" ]; then
-    os_opts="-XstartOnFirstThread"
-else
-    os_opts=
-fi
-
-jarpath="$frameworkdir/$jarfile"
-
-exec "$javaCmd" \
-    -Xmx256M $os_opts $java_debug \
-    -classpath "$jarpath" \
-    com.android.validator.DeviceValidator "$@"
diff --git a/device_validator/app/etc/manifest.txt b/device_validator/app/etc/manifest.txt
deleted file mode 100644
index 55b9038..0000000
--- a/device_validator/app/etc/manifest.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Main-Class: com.android.validator.DeviceValidator
-Class-Path: dvlib.jar
-
diff --git a/device_validator/app/src/com/android/validator/DeviceValidator.java b/device_validator/app/src/com/android/validator/DeviceValidator.java
deleted file mode 100644
index 8ca6afe..0000000
--- a/device_validator/app/src/com/android/validator/DeviceValidator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.eclipse.org/org/documents/epl-v10.php
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.validator;
-
-import com.android.dvlib.DeviceSchema;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public class DeviceValidator {
-
-    public static void main(String[] args) {
-        if (args.length == 0){
-            printHelp();
-            System.exit(1);
-        }
-        int ret = 0;
-        for (String a : args) {
-            File f = (new File(a)).getAbsoluteFile();
-            try {
-                if (!DeviceSchema.validate(new FileInputStream(f), System.err, f.getParentFile())) {
-                    System.err.println("Error validating " + f.getAbsolutePath());
-                    System.out.println();
-                    ret = 1;
-                } else {
-                    System.out.println(f.getAbsolutePath() + " validated successfully.");
-                }
-            } catch (FileNotFoundException e) {
-                System.err.println("File not found: " + a);
-                ret = 1;
-            }
-        }
-        System.exit(ret);
-    }
-
-    private static void printHelp() {
-        System.err.printf("Usage: device_validator [files to validate]...\n");
-    }
-
-}
diff --git a/device_validator/dvlib/.classpath b/device_validator/dvlib/.classpath
deleted file mode 100644
index 9cae787..0000000
--- a/device_validator/dvlib/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/device_validator/dvlib/.gitignore b/device_validator/dvlib/.gitignore
deleted file mode 100644
index 3558c56..0000000
--- a/device_validator/dvlib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/
-build/
diff --git a/device_validator/dvlib/.project b/device_validator/dvlib/.project
deleted file mode 100644
index 13abbdf..0000000
--- a/device_validator/dvlib/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>dvlib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/device_validator/dvlib/Android.mk b/device_validator/dvlib/Android.mk
deleted file mode 100644
index 658c69b..0000000
--- a/device_validator/dvlib/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# The dvlib code has moved to tools/base/dvlib.
-# The rule below uses the prebuilt dvlib.jar.
-#
-# If you want to run the tests, cd to tools/base/dvlib
-# and run ./gradlew :dvlib:test
-
-LOCAL_JAVA_RESOURCE_DIRS := src/main/resources
-
-LOCAL_MODULE := dvlib
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PREBUILT_JAVA_LIBRARIES := \
-	../../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
-
-include $(BUILD_HOST_PREBUILT)
-
-