Remove references to non-existant directories
Fixes warnings during makefile parsing:
FindEmulator: find: `cts/apps/CtsVerifier/src/android': No such file or directory
FindEmulator: find: `cts/hostsidetests/os/test-apps/HostLinkVerificationApp/src': No such file or directory
FindEmulator: find: `cts/libs/commonutil/src': No such file or directory
FindEmulator: cd: cts/tests/libcore/ojluni/resources: No such file or directory
FindEmulator: find: `cts/tests/tests/icu/tools': No such file or directory
Test: m -j cts
Change-Id: I8ea57a714cdae6a89490a1d6e4be93cc7ae3d316
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index 6d3693f..d3042cd 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -72,7 +72,6 @@
LOCAL_SRC_FILES := \
$(call java-files-in, src/com/android/cts/verifier) \
$(call java-files-in, src/com/android/cts/verifier/backup) \
- $(call all-java-files-under, src/android) \
$(call all-Iaidl-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 \
diff --git a/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.mk b/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.mk
index 76aa570..7ab0433 100644
--- a/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.mk
+++ b/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.mk
@@ -21,8 +21,6 @@
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
LOCAL_PACKAGE_NAME := CtsHostLinkVerificationApp
# Tag this module as a cts test artifact
diff --git a/libs/deviceutil/Android.mk b/libs/deviceutil/Android.mk
index b5d9b1b..f871cc1 100644
--- a/libs/deviceutil/Android.mk
+++ b/libs/deviceutil/Android.mk
@@ -17,8 +17,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- $(call all-java-files-under, src) \
- $(call all-java-files-under, ../commonutil/src)
+ $(call all-java-files-under, src)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
diff --git a/tests/libcore/ojluni/Android.mk b/tests/libcore/ojluni/Android.mk
index c2ba33b..36ba4f2 100644
--- a/tests/libcore/ojluni/Android.mk
+++ b/tests/libcore/ojluni/Android.mk
@@ -39,8 +39,6 @@
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
-LOCAL_JAVA_RESOURCE_DIRS := resources
-
LOCAL_JAVA_RESOURCE_FILES := \
libcore/expectations/brokentests.txt \
libcore/expectations/icebox.txt \
diff --git a/tests/tests/icu/Android.mk b/tests/tests/icu/Android.mk
index 4867268..096cf25 100644
--- a/tests/tests/icu/Android.mk
+++ b/tests/tests/icu/Android.mk
@@ -41,23 +41,3 @@
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_SUPPORT_PACKAGE)
-
-# build cts-icu-tools tool
-# ============================================================
-include $(CLEAR_VARS)
-
-# Don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, tools)
-LOCAL_JAVA_RESOURCE_DIRS := resources
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- descGen \
- jsr305lib
-
-LOCAL_JAVA_LIBRARIES := tradefed
-
-LOCAL_MODULE := cts-icu-tools
-
-include $(BUILD_HOST_JAVA_LIBRARY)