diff options
author | Narayan Kamath <narayan@google.com> | 2015-01-21 16:58:05 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-21 16:58:06 +0000 |
commit | 1d5df1fbd8c786e0f936cb0175e4a3f288fc1890 (patch) | |
tree | 61d71f096b7a500adc7293d707b0b7298640101a | |
parent | 1b462a5d4a5cd4f28c9c7b368110128520a84594 (diff) | |
parent | 3f1d7beed354200b21e5d45e70121428c342237a (diff) | |
download | libcore-1d5df1fbd8c786e0f936cb0175e4a3f288fc1890.zip libcore-1d5df1fbd8c786e0f936cb0175e4a3f288fc1890.tar.gz libcore-1d5df1fbd8c786e0f936cb0175e4a3f288fc1890.tar.bz2 |
Merge "Get rid of rule to generate a file with a # in its name."
-rw-r--r-- | JavaLibrary.mk | 15 | ||||
-rw-r--r-- | luni/src/test/java/libcore/java/lang/OldClassTest.java | 5 |
2 files changed, 0 insertions, 20 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 9670d1b..9987055 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -129,21 +129,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk include $(BUILD_STATIC_JAVA_LIBRARY) endif -# This one's tricky. One of our tests needs to have a -# resource with a "#" in its name, but Perforce doesn't -# allow us to submit such a file. So we create it here -# on-the-fly. -TMP_RESOURCE_DIR := $(intermediates.COMMON)/tmp/ -TMP_RESOURCE_FILE := org/apache/harmony/luni/tests/java/lang/test\#.properties - -$(TMP_RESOURCE_DIR)$(TMP_RESOURCE_FILE): - @mkdir -p $(dir $@) - @echo "Hello, world!" > $@ - -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args) -C "$(TMP_RESOURCE_DIR)" "$(TMP_RESOURCE_FILE)" -$(LOCAL_INTERMEDIATE_TARGETS): $(TMP_RESOURCE_DIR)$(TMP_RESOURCE_FILE) - - # # Build for the host. # diff --git a/luni/src/test/java/libcore/java/lang/OldClassTest.java b/luni/src/test/java/libcore/java/lang/OldClassTest.java index 23a42bd..f5bc787 100644 --- a/luni/src/test/java/libcore/java/lang/OldClassTest.java +++ b/luni/src/test/java/libcore/java/lang/OldClassTest.java @@ -40,11 +40,6 @@ import tests.support.resource.Support_Resources; @SuppressWarnings("deprecation") public class OldClassTest extends junit.framework.TestCase { - - public static final String FILENAME = - OldClassTest.class.getPackage().getName().replace('.', '/') + - "/test#.properties"; - final String packageName = getClass().getPackage().getName(); final String classNameInitError1 = packageName + ".TestClass1"; final String classNameInitError2 = packageName + ".TestClass1B"; |