diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-22 00:13:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-22 00:13:19 +0000 |
| commit | 71a87d6cdcea216c7760d88dea4ebf002994595b (patch) | |
| tree | 2cc993f56654daba288dbc7437fde315127c6327 /JavaLibrary.mk | |
| parent | ab6feac62ab875a593f83864045704d894ae0bd8 (diff) | |
| parent | 1d5df1fbd8c786e0f936cb0175e4a3f288fc1890 (diff) | |
| download | libcore-71a87d6cdcea216c7760d88dea4ebf002994595b.zip libcore-71a87d6cdcea216c7760d88dea4ebf002994595b.tar.gz libcore-71a87d6cdcea216c7760d88dea4ebf002994595b.tar.bz2 | |
am 1d5df1fb: Merge "Get rid of rule to generate a file with a # in its name."
* commit '1d5df1fbd8c786e0f936cb0175e4a3f288fc1890':
Get rid of rule to generate a file with a # in its name.
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 010fb66..99b4232 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -126,21 +126,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. # |