3.74 of 5: Remove DataKey from DataValue, FileDataResource and XmlDataResource.

This is mostly mechanical, cleaning up the vestigal marks of combining the value and key. The only mildly odd change is making the OverwritableConsumer and NonOverwritableConsumer package visible, for testing purposes.

--
MOS_MIGRATED_REVID=118474980

1 files changed, 0 insertions, 7 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataAsset.java b/src/tools/android/java/com/google/devtools/build/android/DataAsset.java
index 051b41c5f9..08dcab4eb8 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataAsset.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataAsset.java
@@ -27,11 +27,4 @@ public interface DataAsset extends DataValue {
    * @throws IOException if there are issues with writing the asset.
    */
   void write(Path newAssetDirectory) throws IOException;
-
-  /**
-   * Compares one data resource to another.
-   *
-   * Not implementing Comparable as it would conflict with DataResource.
-   */
-  int compareTo(DataAsset other);
 }