Project import generated by Copybara.

GitOrigin-RevId: bb059a0721c92e8154d33ce8057b3915a25b3d7d

third_party/org_tensorflow_compatibility_fixes.diff

@@ -24,13 +24,13 @@ index b7c22ae77ba..d0ba7b48b4b 100644
      }
    }
 diff --git a/tensorflow/core/platform/test.h b/tensorflow/core/platform/test.h
-index 94b4853a810..75589d04a60 100644
+index b598b6ee1e4..51c013a2d62 100644
 --- a/tensorflow/core/platform/test.h
 +++ b/tensorflow/core/platform/test.h
 @@ -40,7 +40,6 @@ limitations under the License.
- // The advantages of using gmock matchers instead of self defined matchers are
  // better error messages, more maintainable tests and more test coverage.
- #if !defined(PLATFORM_GOOGLE) && !defined(PLATFORM_GOOGLE_ANDROID)
+ #if !defined(PLATFORM_GOOGLE) && !defined(PLATFORM_GOOGLE_ANDROID) && \
+     !defined(PLATFORM_CHROMIUMOS)
 -#include <gmock/gmock-generated-matchers.h>
  #include <gmock/gmock-matchers.h>
  #include <gmock/gmock-more-matchers.h>