Remove prod-tests dir.
Also move example config and test up one level to still act as an example.
Bug: 38383668
Test: Manually built tradefed-all with no issues.
Change-Id: Ia4d666f71e76f588884aa0f8104865f10bed8f1d
Merged-In: I48262710b367c78afbc97a12facadb7c2c6d9b34
diff --git a/Android.mk b/Android.mk
index 79446a1..744e0a0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@
# Only compile source java files in this lib.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-# LOCAL_JAVA_RESOURCE_DIRS := res
+LOCAL_JAVA_RESOURCE_DIRS := res
LOCAL_JAVACFLAGS += -g -Xlint
diff --git a/prod-tests/Android.mk b/prod-tests/Android.mk
deleted file mode 100644
index c43b285..0000000
--- a/prod-tests/Android.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (C) 2017 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)
-
-# Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_RESOURCE_DIRS := res
-
-LOCAL_JAVACFLAGS += -g -Xlint -Werror
-
-LOCAL_MODULE := tf-contrib-prod-tests
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := tradefed tf-prod-tests
-
-LOCAL_JAR_MANIFEST := MANIFEST.mf
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# makefile rules to copy jars to HOST_OUT/tradefed
-# so tradefed.sh can automatically add to classpath
-DEST_JAR := $(HOST_OUT)/tradefed/$(LOCAL_MODULE).jar
-$(DEST_JAR): $(LOCAL_BUILT_MODULE)
- $(copy-file-to-new-target)
-
-# this dependency ensure the above rule will be executed if jar is built
-$(LOCAL_INSTALLED_MODULE) : $(DEST_JAR)
-
-# Build all sub-directories
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/prod-tests/MANIFEST.mf b/prod-tests/MANIFEST.mf
deleted file mode 100644
index 4bd2094..0000000
--- a/prod-tests/MANIFEST.mf
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Version: %BUILD_NUMBER%
diff --git a/prod-tests/res/config/example/example.xml b/res/config/example/example.xml
similarity index 100%
rename from prod-tests/res/config/example/example.xml
rename to res/config/example/example.xml
diff --git a/prod-tests/src/com/android/example_test/ExampleTest.java b/src/com/android/example_test/ExampleTest.java
similarity index 100%
rename from prod-tests/src/com/android/example_test/ExampleTest.java
rename to src/com/android/example_test/ExampleTest.java
