Revert "Merge tag 'v3.0.1-javalite'"

This reverts commit f4fe6ab6726e235448020c5fd203e4fc1dad728e, reversing
changes made to 6e463f53f1f82dfe0a74e25ae729601a9678730c.

Change-Id: I451a710a7b755868c8d6a8de56a0b9bb55fedad6
(cherry picked from commit 61f57327388b1c133011da01545f0a24e09fddf0)

1 files changed, 0 insertions, 61 deletions

diff --git a/src/google/protobuf/arena_nc_test.py b/src/google/protobuf/arena_nc_test.py
deleted file mode 100644
index 56a7dd05..00000000
--- a/src/google/protobuf/arena_nc_test.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /usr/bin/env python
-#
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Negative compilation unit tests for arena API."""
-
-import unittest
-
-from google3.testing.pybase import fake_target_util
-from google3.testing.pybase import unittest
-
-
-class ArenaNcTest(unittest.TestCase):
-
-  def testCompilerErrors(self):
-    """Runs a list of tests to verify compiler error messages."""
-
-    # Defines a list of test specs, where each element is a tuple
-    # (test name, list of regexes for matching the compiler errors).
-    test_specs = [
-        ('ARENA_PRIVATE_CONSTRUCTOR',
-         [r'calling a protected constructor']),
-        ('SANITY', None)]
-
-    fake_target_util.AssertCcCompilerErrors(
-        self,                         # The current test case.
-        'google3/google/protobuf/arena_nc',  # The fake target file.
-        'arena_nc.o',                 # The sub-target to build.
-        test_specs                    # List of test specifications.
-        )
-
-if __name__ == '__main__':
-  unittest.main()