From 11fb7aeddd6ff7229bcf0834017f8091f97d7edb Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Sun, 4 Nov 2018 17:34:26 -0800
Subject: Revert "Merge changes from topic "protobuf3.5.2""

This reverts commit 584979bf55601bd23e533d704a75cd0e95af66b9, reversing
changes made to 219bbcdcd5b1dbf19758ff2e75d971b98215896d:
      Remove libprotobuf-java-lite
      Update stubs
      Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
      Update javamicro to compile against v3.5.2
      Update Android.bp to match BUILD
      Rerun configure
      Merge tag 'v3.5.2' into master
      Revert "Remove 2 usage of isspace as they are not stl port compatible"
      Revert "Use GOOGLE_CHECK Macro for validation"
      Revert "Emit macros with proper parentheses."
      Revert "Generate syntactically correct java for imports from classes with no packages."
      Revert "Fix some unused parameter warnings"
      Revert "protobuf: work around a static analyzer bug"
      Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."

Change-Id: Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337
---
 composer.json | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 composer.json

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
deleted file mode 100644
index 2c64ad220..000000000
--- a/composer.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "google/protobuf",
-  "type": "library",
-  "description": "proto library for PHP",
-  "keywords": ["proto"],
-  "homepage": "https://developers.google.com/protocol-buffers/",
-  "license": "BSD-3-Clause",
-  "require": {
-    "php": ">=5.5.0"
-  },
-  "require-dev": {
-    "phpunit/phpunit": ">=4.8.0"
-  },
-  "suggest": {
-    "ext-bcmath": "Need to support JSON deserialization"
-  },
-  "autoload": {
-    "psr-4": {
-      "Google\\Protobuf\\": "php/src/Google/Protobuf",
-      "GPBMetadata\\Google\\Protobuf\\": "php/src/GPBMetadata/Google/Protobuf"
-    }
-  }
-}
-- 
cgit v1.2.3