Remove external/jsr305, external/guava, and external/caliper.

diff --git a/libcore/JavaLibrary.mk b/libcore/JavaLibrary.mk
index b12b47d..64fdb7e 100644 (file)
--- a/libcore/JavaLibrary.mk
+++ b/libcore/JavaLibrary.mk
@@ -75,7 +75,7 @@ LOCAL_SRC_FILES := $(test_src_files)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core caliper
+LOCAL_JAVA_LIBRARIES := core
 LOCAL_DX_FLAGS := --core-library
 
 LOCAL_MODULE_TAGS := tests
@@ -181,4 +181,4 @@ ifeq ($(WITH_HOST_DALVIK),true)
 
     include $(BUILD_HOST_JAVA_LIBRARY)
 
-endif
\ No newline at end of file
+endif

diff --git a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/util/NullBenchmarkSuite.java b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/util/NullBenchmarkSuite.java
deleted file mode 100644 (file)
index 52f383c..0000000
--- a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/util/NullBenchmarkSuite.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2009 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 org.apache.harmony.luni.tests.java.util;
-
-import com.google.caliper.Benchmark;
-import com.google.caliper.SimpleBenchmark;
-
-/**
- * This class exists only to force a dependency from our libraries on Caliper,
- * our micro benchmarking framework. 
- */
-public class NullBenchmarkSuite extends SimpleBenchmark {
-
-    public void timeNullBenchmark(int trials) throws Exception {
-            for (int i = 0; i < trials; i++) {
-                // code under test goes here!
-            }
-    }
-}