diff options
| author | Narayan Kamath <narayan@google.com> | 2013-11-15 18:02:54 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2013-11-15 18:10:08 +0000 |
| commit | 51525b5dbb7a1bb8a03fdecb5e5ea15810f8289a (patch) | |
| tree | 2fbc464e8e7d94dc227779b758df20bcd07db8f6 /JavaLibrary.mk | |
| parent | 5d973f8b6b001fecfda5d79f84a4818b8f204aab (diff) | |
| download | libcore-51525b5dbb7a1bb8a03fdecb5e5ea15810f8289a.zip libcore-51525b5dbb7a1bb8a03fdecb5e5ea15810f8289a.tar.gz libcore-51525b5dbb7a1bb8a03fdecb5e5ea15810f8289a.tar.bz2 | |
Harmonize sources across core-tests and core-tests-hostdex
Change-Id: I450b13e714cf68310bf53e2fe740e9ecaac44576
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 5dc939e..22ab61a 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -54,6 +54,7 @@ core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni xml) core_src_files += $(call all-main-java-files-under,libdvm) core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) +test_src_files := $(call all-test-java-files-under,dalvik dom harmony-tests json luni xml) ifeq ($(EMMA_INSTRUMENT),true) ifneq ($(EMMA_INSTRUMENT_STATIC),true) @@ -94,7 +95,7 @@ core-intermediates := ${intermediates} ifeq ($(LIBCORE_SKIP_TESTS),) # Make the core-tests library. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom harmony-tests json luni xml) +LOCAL_SRC_FILES := $(test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit okhttp @@ -181,7 +182,7 @@ ifeq ($(WITH_HOST_DALVIK),true) # Make the core-tests library. ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni xml) + LOCAL_SRC_FILES := $(test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex core-tests-support-hostdex okhttp-hostdex |