auto import from //depot/cupcake/@135843

33 files changed, 0 insertions, 878 deletions

diff --git a/tools/droiddoc/test/generics/Android.mk b/tools/droiddoc/test/generics/Android.mk
deleted file mode 100644
index 0c808fd..0000000
--- a/tools/droiddoc/test/generics/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2008 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-subdir-java-files)
-
-LOCAL_MODULE:=test_generics
-LOCAL_DROIDDOC_OPTIONS:=\
-        -stubs __test_generics__
-
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=tools/droiddoc/templates-google
-LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-google
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-include $(BUILD_DROIDDOC)
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/AbsListView.java b/tools/droiddoc/test/generics/src/com/android/generics/AbsListView.java
deleted file mode 100644
index 6bef812..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/AbsListView.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public class AbsListView implements AdapterView<ListAdapter> {
-}
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/Adapter.java b/tools/droiddoc/test/generics/src/com/android/generics/Adapter.java
deleted file mode 100644
index c041dd1..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/Adapter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public class Adapter {
-}
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/AdapterView.java b/tools/droiddoc/test/generics/src/com/android/generics/AdapterView.java
deleted file mode 100644
index de4f8f1..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/AdapterView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public interface AdapterView<T extends Adapter> {
-}
-
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/Bar.java b/tools/droiddoc/test/generics/src/com/android/generics/Bar.java
deleted file mode 100644
index bd9fcbc..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/Bar.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public interface Bar<K> {
-    public K bar(K arg);
-}
-
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/Foo.java b/tools/droiddoc/test/generics/src/com/android/generics/Foo.java
deleted file mode 100644
index d5d07eb..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/Foo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public class Foo<V> {
-    public Foo(V v) {
-    }
-
-    public V foo(V arg) {
-        return null;
-    }
-}
-
-
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/FooBar.java b/tools/droiddoc/test/generics/src/com/android/generics/FooBar.java
deleted file mode 100644
index 7ea3567..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/FooBar.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public class FooBar<K,V,L> extends Foo<V> implements Bar<K> {
-    public class C
-    {
-    }
-
-    public class CI extends C implements Iface
-    {
-    }
-
-    public FooBar(K k) {
-        super(null);
-        throw new RuntimeException("!");
-    }
-
-    public K bar(K arg) {
-        return null;
-    }
-    
-    public FooBar<K,? extends Foo,L> a(K arg) {
-        return null;
-    }
-
-    public FooBar<V,K,L> b(Bar<? extends K> arg) {
-        return null;
-    }
-
-    public <L extends C & Iface> void f(L arg) {
-    }
-
-    public V v;
-}
-
-
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/Iface.java b/tools/droiddoc/test/generics/src/com/android/generics/Iface.java
deleted file mode 100644
index 03aa2dd..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/Iface.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public interface Iface {
-}
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/ListAdapter.java b/tools/droiddoc/test/generics/src/com/android/generics/ListAdapter.java
deleted file mode 100644
index 5f88a56..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/ListAdapter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public class ListAdapter extends Adapter {
-}
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/TestComparable.java b/tools/droiddoc/test/generics/src/com/android/generics/TestComparable.java
deleted file mode 100644
index 9d394ae..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/TestComparable.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public interface TestComparable<T> {
-}
diff --git a/tools/droiddoc/test/generics/src/com/android/generics/TestEnum.java b/tools/droiddoc/test/generics/src/com/android/generics/TestEnum.java
deleted file mode 100644
index efb1d18..0000000
--- a/tools/droiddoc/test/generics/src/com/android/generics/TestEnum.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.generics;
-
-public class TestEnum<E extends TestEnum<E>> implements TestComparable<E> {
-}
-
diff --git a/tools/droiddoc/test/stubs/Android.mk b/tools/droiddoc/test/stubs/Android.mk
deleted file mode 100644
index fc971e1..0000000
--- a/tools/droiddoc/test/stubs/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2008 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_MODULE:=test_stubs
-LOCAL_DROIDDOC_OPTIONS:=\
-        -stubs $(OUT_DIR)/__test_stubs__
-
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=tools/droiddoc/templates-google
-LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-google
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-include $(BUILD_DROIDDOC)
-
diff --git a/tools/droiddoc/test/stubs/expected/com/android/stubs/Annot.java b/tools/droiddoc/test/stubs/expected/com/android/stubs/Annot.java
deleted file mode 100644
index b6144b6..0000000
--- a/tools/droiddoc/test/stubs/expected/com/android/stubs/Annot.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.android.stubs;
-@java.lang.annotation.Documented()
-@java.lang.annotation.Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
-@java.lang.annotation.Target(value={java.lang.annotation.ElementType.TYPE})
-public @interface Annot
-{
-java.lang.String value() default "yo\u1234";
-}
diff --git a/tools/droiddoc/test/stubs/expected/com/android/stubs/InterfaceEnum.java b/tools/droiddoc/test/stubs/expected/com/android/stubs/InterfaceEnum.java
deleted file mode 100644
index b0c87e7..0000000
--- a/tools/droiddoc/test/stubs/expected/com/android/stubs/InterfaceEnum.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.android.stubs;
-public enum InterfaceEnum
-  implements com.android.stubs.Parent.Interface
-{
-VAL();
-public  void method() { throw new RuntimeException("Stub!"); }
-public static final java.lang.Object OBJECT;
-static { OBJECT = null; }
-}
diff --git a/tools/droiddoc/test/stubs/expected/com/android/stubs/Parent.java b/tools/droiddoc/test/stubs/expected/com/android/stubs/Parent.java
deleted file mode 100644
index 132d566..0000000
--- a/tools/droiddoc/test/stubs/expected/com/android/stubs/Parent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.android.stubs;
-@com.android.stubs.Annot(value="asdf")
-public class Parent
-{
-public static interface Interface
-{
-public  void method();
-}
-public  Parent() { throw new RuntimeException("Stub!"); }
-public  java.lang.String methodString() { throw new RuntimeException("Stub!"); }
-public  int method(boolean b, char c, int i, long l, float f, double d) { throw new RuntimeException("Stub!"); }
-protected  void protectedMethod() { throw new RuntimeException("Stub!"); }
-public static final byte public_static_final_byte = 42;
-public static final short public_static_final_short = 43;
-public static final int public_static_final_int = 44;
-public static final long public_static_final_long = 45L;
-public static final char public_static_final_char = 4660;
-public static final float public_static_final_float = 42.1f;
-public static final double public_static_final_double = 42.2;
-public static int public_static_int;
-public static final java.lang.String public_static_final_String = "ps\u1234fS";
-public static java.lang.String public_static_String;
-public static com.android.stubs.Parent public_static_Parent;
-public static final com.android.stubs.Parent public_static_final_Parent;
-public static final com.android.stubs.Parent public_static_final_Parent_null;
-static { public_static_final_Parent = null; public_static_final_Parent_null = null; }
-}
diff --git a/tools/droiddoc/test/stubs/expected/com/android/stubs/SomeEnum.java b/tools/droiddoc/test/stubs/expected/com/android/stubs/SomeEnum.java
deleted file mode 100644
index ecfd9d4..0000000
--- a/tools/droiddoc/test/stubs/expected/com/android/stubs/SomeEnum.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.android.stubs;
-public enum SomeEnum
-{
-A(),
-B(),
-C();
-}
diff --git a/tools/droiddoc/test/stubs/expected/com/android/stubs/Types.java b/tools/droiddoc/test/stubs/expected/com/android/stubs/Types.java
deleted file mode 100644
index 3f5a791..0000000
--- a/tools/droiddoc/test/stubs/expected/com/android/stubs/Types.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.android.stubs;
-public class Types
-{
-public static interface Interface
-{
-public static final boolean public_static_final_boolean = false;
-public static final char public_static_final_char = 0;
-public static final short public_static_final_short = 0;
-public static final int public_static_final_int = 0;
-public static final long public_static_final_long = 0L;
-public static final float public_static_final_float = 0.0f;
-public static final double public_static_final_double = 0.0;
-public static final java.lang.Object public_static_final_Object = null;
-}
-protected  Types() { throw new RuntimeException("Stub!"); }
-public final boolean public_final_boolean;
-public final char public_final_char;
-public final short public_final_short;
-public final int public_final_int;
-public final long public_final_long;
-public final float public_final_float;
-public final double public_final_double;
-public final java.lang.Object public_final_Object;
-public static final boolean public_static_final_boolean;
-public static final char public_static_final_char;
-public static final short public_static_final_short;
-public static final int public_static_final_int;
-public static final long public_static_final_long;
-public static final float public_static_final_float;
-public static final double public_static_final_double;
-public static final java.lang.Object public_static_final_Object;
-static { public_static_final_boolean = false; public_static_final_char = 0; public_static_final_short = 0; public_static_final_int = 0; public_static_final_long = 0; public_static_final_float = 0; public_static_final_double = 0; public_static_final_Object = null; }
-}
diff --git a/tools/droiddoc/test/stubs/expected/com/android/stubs/a/A.java b/tools/droiddoc/test/stubs/expected/com/android/stubs/a/A.java
deleted file mode 100644
index f3cb888..0000000
--- a/tools/droiddoc/test/stubs/expected/com/android/stubs/a/A.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.android.stubs.a;
-public abstract class A
-  extends com.android.stubs.Parent
-  implements com.android.stubs.Parent.Interface, com.android.stubs.a.SomeInterface
-{
-public class Inner
-{
-public  Inner() { throw new RuntimeException("Stub!"); }
-}
-protected  A(int a) { throw new RuntimeException("Stub!"); }
-public  com.android.stubs.a.A varargs(com.android.stubs.Parent[]... args) { throw new RuntimeException("Stub!"); }
-public  void method() { throw new RuntimeException("Stub!"); }
-public abstract  java.lang.String[] stringArrayMethod() throws java.io.IOException;
-}
diff --git a/tools/droiddoc/test/stubs/expected/com/android/stubs/a/SomeInterface.java b/tools/droiddoc/test/stubs/expected/com/android/stubs/a/SomeInterface.java
deleted file mode 100644
index c24981b..0000000
--- a/tools/droiddoc/test/stubs/expected/com/android/stubs/a/SomeInterface.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.android.stubs.a;
-public interface SomeInterface
-{
-}
diff --git a/tools/droiddoc/test/stubs/expected/com/android/stubs/b/B.java b/tools/droiddoc/test/stubs/expected/com/android/stubs/b/B.java
deleted file mode 100644
index 5db2fce..0000000
--- a/tools/droiddoc/test/stubs/expected/com/android/stubs/b/B.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.android.stubs.b;
-public class B
-{
-public  B() { throw new RuntimeException("Stub!"); }
-}
diff --git a/tools/droiddoc/test/stubs/func.sh b/tools/droiddoc/test/stubs/func.sh
deleted file mode 100644
index 1ad4bd5..0000000
--- a/tools/droiddoc/test/stubs/func.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2008 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.
-
-export A_STUBS=out/stubs/a/stubs
-export B_STUBS=out/stubs/b/stubs
-export EXPECTED_STUBS=out/stubs/expected/stubs
-export EXPECTED=$DIR/expected
-
-function build_stubs()
-{
-    ID=$1
-    SRC_DIR=$2
-    STUBS_DIR=$3
-
-    OBJ_DIR=out/stubs/$ID
-
-    rm -rf $OBJ_DIR &> /dev/null
-    mkdir -p $OBJ_DIR
-
-    find $SRC_DIR -name '*.java' > $OBJ_DIR/javadoc-src-list
-    ( \
-        LD_LIBRARY_PATH=out/host/darwin-x86/lib \
-        javadoc \
-            \@$OBJ_DIR/javadoc-src-list \
-            -J-Xmx512m \
-            -J-Djava.library.path=out/host/darwin-x86/lib \
-             \
-            -quiet \
-            -doclet DroidDoc \
-            -docletpath out/host/darwin-x86/framework/clearsilver.jar:out/host/darwin-x86/framework/droiddoc.jar \
-            -templatedir tools/droiddoc/templates \
-            -classpath out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar:out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar:out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar \
-            -sourcepath $SRC_DIR:out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar:out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar:out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar \
-            -d $OBJ_DIR/docs \
-            -hdf page.build MAIN-eng.joeo.20080710.121320 -hdf page.now "10 Jul 2008 12:13" \
-            -stubs $STUBS_DIR \
-            -stubpackages com.android.stubs:com.android.stubs.a:com.android.stubs.b:com.android.stubs.hidden \
-        && rm -rf $OBJ_DIR/docs/assets \
-        && mkdir -p $OBJ_DIR/docs/assets \
-        && cp -fr tools/droiddoc/templates/assets/* $OBJ_DIR/docs/assets/ \
-    )# || (rm -rf $OBJ_DIR; exit 45)
-}
-
-function compile_stubs()
-{
-    ID=$1
-    STUBS_DIR=$2
-
-    OBJ_DIR=out/stubs/$ID
-    CLASS_DIR=$OBJ_DIR/class
-    mkdir -p $CLASS_DIR
-
-    find $STUBS_DIR -name "*.java" > $OBJ_DIR/java-src-list
-    javac @$OBJ_DIR/java-src-list -d $CLASS_DIR
-}
diff --git a/tools/droiddoc/test/stubs/run.sh b/tools/droiddoc/test/stubs/run.sh
deleted file mode 100755
index f237a7d..0000000
--- a/tools/droiddoc/test/stubs/run.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2008 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.
-
-DIR=tools/droiddoc/test/stubs
-
-pushd $TOP
-
-. $TOP/$DIR/func.sh
-
-mkdir -p out/stubs_compiled
-find $DIR/src -name "*.java" | xargs javac -d out/stubs_compiled
-
-build_stubs a $DIR/src $A_STUBS
-build_stubs b $A_STUBS $B_STUBS
-
-compile_stubs a $A_STUBS
-
-echo EXPECTED
-diff -r $DIR/expected $A_STUBS
-echo TWICE STUBBED
-diff -r $A_STUBS $B_STUBS
-
-popd &> /dev/null
-
-
-
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/Annot.java b/tools/droiddoc/test/stubs/src/com/android/stubs/Annot.java
deleted file mode 100644
index fe9226f..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/Annot.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs;
-
-import java.lang.annotation.*;
-
-/**
- * poop
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Annot {
-    String value() default "yo\u1234";
-}
-
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/InterfaceEnum.java b/tools/droiddoc/test/stubs/src/com/android/stubs/InterfaceEnum.java
deleted file mode 100644
index 1e64f57..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/InterfaceEnum.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs;
-
-public enum InterfaceEnum implements Parent.Interface {
-    VAL;
-    public static final Object OBJECT = new Object();
-    public void method() { }
-}
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/Parent.java b/tools/droiddoc/test/stubs/src/com/android/stubs/Parent.java
deleted file mode 100644
index 577db38..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/Parent.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs;
-
-@Annot("asdf")
-public class Parent {
-    public static final byte public_static_final_byte = 42;
-    public static final short public_static_final_short = 43;
-    public static final int public_static_final_int = 44;
-    public static final long public_static_final_long = 45;
-    public static final char public_static_final_char = '\u1234';
-    public static final float public_static_final_float = 42.1f;
-    public static final double public_static_final_double = 42.2;
-    public static int public_static_int = 1;
-    public static final String public_static_final_String = "ps\u1234fS";
-    public static String public_static_String = "psS";
-    public static Parent public_static_Parent = new Parent();
-    public static final Parent public_static_final_Parent = new Parent();
-    public static final Parent public_static_final_Parent_null = null;
-
-    public interface Interface {
-        void method();
-    }
-
-    public Parent() {
-    }
-
-    public String methodString() {
-        return "yo";
-    }
-
-    public int method(boolean b, char c, int i, long l, float f, double d) {
-        return 1;
-    }
-
-    protected void protectedMethod() {
-    }
-
-    void packagePrivateMethod() {
-    }
-
-    /** @hide */
-    public void hiddenMethod() {
-    }
-}
-
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/SomeEnum.java b/tools/droiddoc/test/stubs/src/com/android/stubs/SomeEnum.java
deleted file mode 100644
index 51c5000..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/SomeEnum.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs;
-
-public enum SomeEnum {
-    A, B, C
-}
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/Types.java b/tools/droiddoc/test/stubs/src/com/android/stubs/Types.java
deleted file mode 100644
index 5e24a10..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/Types.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs;
-
-public class Types {
-    public final boolean public_final_boolean;
-    public final char public_final_char;
-    public final short public_final_short;
-    public final int public_final_int;
-    public final long public_final_long;
-    public final float public_final_float;
-    public final double public_final_double;
-    public final Object public_final_Object;
-
-    public static final boolean public_static_final_boolean;
-    public static final char public_static_final_char;
-    public static final short public_static_final_short;
-    public static final int public_static_final_int;
-    public static final long public_static_final_long;
-    public static final float public_static_final_float;
-    public static final double public_static_final_double;
-    public static final Object public_static_final_Object;
-
-    /** @hide */
-    public Types() {
-        public_final_boolean = false;
-        public_final_char = 0;
-        public_final_short = 0;
-        public_final_int = 0;
-        public_final_long = 0;
-        public_final_float = 0;
-        public_final_double = 0;
-        public_final_Object = null;
-    }
-
-    static {
-        public_static_final_boolean = false;
-        public_static_final_char = 0;
-        public_static_final_short = 0;
-        public_static_final_int = 0;
-        public_static_final_long = 0;
-        public_static_final_float = 0;
-        public_static_final_double = 0;
-        public_static_final_Object = null;
-    }
-
-    public interface Interface {
-        public static final boolean public_static_final_boolean = false;
-        public static final char public_static_final_char = 0;
-        public static final short public_static_final_short = 0;
-        public static final int public_static_final_int = 0;
-        public static final long public_static_final_long = 0;
-        public static final float public_static_final_float = 0;
-        public static final double public_static_final_double = 0;
-        public static final Object public_static_final_Object = null;
-    }
-}
-
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/a/A.java b/tools/droiddoc/test/stubs/src/com/android/stubs/a/A.java
deleted file mode 100644
index cebeaf1..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/a/A.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs.a;
-
-import com.android.stubs.Parent;
-
-public abstract class A extends Parent implements Parent.Interface, SomeInterface {
-    protected A(int a) {
-        super();
-    }
-
-    public A varargs(Parent... args) {
-        return null;
-    }
-
-    public void method() {
-    }
-    public abstract String[] stringArrayMethod() throws java.io.IOException;
-
-    public class Inner {
-        int method() {
-            return 1;
-        }
-        int field;
-    }
-}
-
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/a/SomeInterface.java b/tools/droiddoc/test/stubs/src/com/android/stubs/a/SomeInterface.java
deleted file mode 100644
index 6f5c3e0..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/a/SomeInterface.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs.a;
-
-public interface SomeInterface {
-}
-
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/b/B.java b/tools/droiddoc/test/stubs/src/com/android/stubs/b/B.java
deleted file mode 100644
index 7febe33..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/b/B.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs.b;
-
-import com.android.stubs.Parent;
-import com.android.stubs.a.A;
-
-public class B {
-    Parent method(Parent p) {
-        return null;
-    }
-}
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/Hidden.java b/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/Hidden.java
deleted file mode 100644
index 39ece6e..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/Hidden.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs.c;
-
-/** @hide */
-public class Hidden {
-
-}
-
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/HiddenOuter.java b/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/HiddenOuter.java
deleted file mode 100644
index 0380f43..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/HiddenOuter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs.c;
-
-/** @hide */
-public class HiddenOuter {
-
-    public class NotHiddenInner {
-    }
-}
-
diff --git a/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/PackagePrivate.java b/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/PackagePrivate.java
deleted file mode 100644
index 165735c..0000000
--- a/tools/droiddoc/test/stubs/src/com/android/stubs/hidden/PackagePrivate.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.stubs.c;
-
-class PackagePrivate {
-
-}
-