From 0b3eb0f4e727f35b4e959f857d2bde8dcfd8ca40 Mon Sep 17 00:00:00 2001 From: edwintay Date: Mon, 6 Aug 2018 22:34:31 -0700 Subject: [PATCH] Adds WASM as a supported Media type to Google Java utilities. Adds WASM support to the StaticFileAction in devserver (so that it is served with the correct Content Type). RELNOTES=Adds WASM as a supported Media type to Google Java utilities. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=207663220 --- android/guava/src/com/google/common/net/MediaType.java | 7 +++++++ guava/src/com/google/common/net/MediaType.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/android/guava/src/com/google/common/net/MediaType.java b/android/guava/src/com/google/common/net/MediaType.java index c9e5778f08ae..16a4634b973c 100644 --- a/android/guava/src/com/google/common/net/MediaType.java +++ b/android/guava/src/com/google/common/net/MediaType.java @@ -457,6 +457,13 @@ private static MediaType addKnownType(MediaType mediaType) { createConstant(APPLICATION_TYPE, "vnd.ms-powerpoint"); public static final MediaType MICROSOFT_WORD = createConstant(APPLICATION_TYPE, "msword"); + /** + * Media type for WASM applications. For more information see the Web Assembly overview. + * + * @since NEXT + */ + public static final MediaType WASM_APPLICATION = createConstant(APPLICATION_TYPE, "wasm"); /** * Media type for NaCl applications. For more information see the diff --git a/guava/src/com/google/common/net/MediaType.java b/guava/src/com/google/common/net/MediaType.java index 7e8a02d8d851..fd3ae3a0e3a9 100644 --- a/guava/src/com/google/common/net/MediaType.java +++ b/guava/src/com/google/common/net/MediaType.java @@ -457,6 +457,13 @@ private static MediaType addKnownType(MediaType mediaType) { createConstant(APPLICATION_TYPE, "vnd.ms-powerpoint"); public static final MediaType MICROSOFT_WORD = createConstant(APPLICATION_TYPE, "msword"); + /** + * Media type for WASM applications. For more information see the Web Assembly overview. + * + * @since NEXT + */ + public static final MediaType WASM_APPLICATION = createConstant(APPLICATION_TYPE, "wasm"); /** * Media type for NaCl applications. For more information see the