fix cyclic dependency by removing ptshostutil
- ptshostutil merged to cts-tradefed
- source is not moved yet. src can be moved later.
Change-Id: I5c7361a4eb3fe637646232c4d7f9adc6b94586df
diff --git a/suite/pts/hostTests/browser/Android.mk b/suite/pts/hostTests/browser/Android.mk
index be1aecb..0241676 100644
--- a/suite/pts/hostTests/browser/Android.mk
+++ b/suite/pts/hostTests/browser/Android.mk
@@ -22,7 +22,7 @@
LOCAL_MODULE := PtsHostBrowser
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt ddmlib-prebuilt junit ptscommonutilhost ptshostutil
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt ddmlib-prebuilt junit ptscommonutilhost
LOCAL_CTS_TEST_PACKAGE := com.android.pts.browser
diff --git a/suite/pts/hostTests/ptshostutil/Android.mk b/suite/pts/hostTests/ptshostutil/Android.mk
deleted file mode 100644
index 14e786a..0000000
--- a/suite/pts/hostTests/ptshostutil/Android.mk
+++ /dev/null
@@ -1,29 +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_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt ddmlib-prebuilt junit
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ptshostutil
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
diff --git a/tools/tradefed-host/Android.mk b/tools/tradefed-host/Android.mk
index 3a11b20..e8965ab 100644
--- a/tools/tradefed-host/Android.mk
+++ b/tools/tradefed-host/Android.mk
@@ -17,13 +17,16 @@
include $(CLEAR_VARS)
# Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := \
+ $(call all-java-files-under, src) \
+ $(call all-java-files-under, ../../suite/pts/hostTests/ptshostutil/src)
+
LOCAL_JAVA_RESOURCE_DIRS := res
LOCAL_MODULE := cts-tradefed
LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt tradefed-prebuilt hosttestlib
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceinfolib ptscommonutilhost ptshostutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceinfolib ptscommonutilhost
include $(BUILD_HOST_JAVA_LIBRARY)
