From a963bcc3d20d461f32c3990f77a5b247b4ef17d5 Mon Sep 17 00:00:00 2001 From: Sam Judd Date: Mon, 16 Jun 2014 17:26:51 -0700 Subject: [PATCH] Move volley into third party. --- .gitmodules | 6 +++--- Makefile | 4 ++-- library/volley | 1 - third_party/volley/LICENSE | 13 +++++++++++++ third_party/volley/README.third_party | 10 ++++++++++ third_party/volley/volley | 1 + 6 files changed, 29 insertions(+), 6 deletions(-) delete mode 160000 library/volley create mode 100644 third_party/volley/LICENSE create mode 100644 third_party/volley/README.third_party create mode 160000 third_party/volley/volley diff --git a/.gitmodules b/.gitmodules index 67a8083e31..04cb671c35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "samples/flickr/ActionBarSherlock"] path = samples/flickr/ActionBarSherlock url = https://github.com/JakeWharton/ActionBarSherlock.git -[submodule "library/volley"] - path = library/volley - url = https://android.googlesource.com/platform/frameworks/volley [submodule "library/src/test/resources/exif-orientation-examples"] path = library/src/test/resources/exif-orientation-examples url = https://github.com/recurser/exif-orientation-examples.git +[submodule "third_party/volley/volley"] + path = third_party/volley/volley + url = https://android.googlesource.com/platform/frameworks/volley diff --git a/Makefile b/Makefile index b3207897fb..1acb6b31d3 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,6 @@ jar: git submodule update cd third_party/gif_decoder && ant clean && ant jar cp third_party/gif_decoder/bin/gifdecoder*.jar library/libs - cd library/volley && ant clean && ant jar - cp library/volley/bin/volley.jar library/libs + cd third_party/volley/volley && ant clean && ant jar + cp third_party/volley/volley/bin/volley.jar library/libs cd library && ant clean && ant jar diff --git a/library/volley b/library/volley deleted file mode 160000 index e542f4964d..0000000000 --- a/library/volley +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e542f4964d2b6668c028edce5afe1fe2faefc64b diff --git a/third_party/volley/LICENSE b/third_party/volley/LICENSE new file mode 100644 index 0000000000..b0a7768810 --- /dev/null +++ b/third_party/volley/LICENSE @@ -0,0 +1,13 @@ +Copyright (C) 2014 The Android Open Source Project + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/third_party/volley/README.third_party b/third_party/volley/README.third_party new file mode 100644 index 0000000000..1e4691e493 --- /dev/null +++ b/third_party/volley/README.third_party @@ -0,0 +1,10 @@ +URL: https://android.googlesource.com/platform/frameworks/volley/+archive/527f964cc7df8e807deb21469a537a6f6800e0fb.tar.gz +Version: 527f964cc7df8e807deb21469a537a6f6800e0fb +License: Apache 2.0 +License File: LICENSE + +Description: +A networking library for Android. + +Local Modifications: +No local modifications. diff --git a/third_party/volley/volley b/third_party/volley/volley new file mode 160000 index 0000000000..527f964cc7 --- /dev/null +++ b/third_party/volley/volley @@ -0,0 +1 @@ +Subproject commit 527f964cc7df8e807deb21469a537a6f6800e0fb