Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fi

echo "Checking license count in licenses_flutter..."
actualLicenseCount=`tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9'`
expectedLicenseCount=3 # When changing this number: Update the error message below as well describing all expected license types.
expectedLicenseCount=2 # When changing this number: Update the error message below as well describing all expected license types.

if [ "$actualLicenseCount" -ne "$expectedLicenseCount" ]
then
Expand All @@ -57,8 +57,6 @@ then
echo "double-check that all newly added files have a BSD-style license"
echo "header with the following copyright:"
echo " Copyright 2013 The Flutter Authors. All rights reserved."
echo "Files in 'third_party/bsdiff' may have the following copyright instead:"
echo " Copyright 2003-2005 Colin Percival. All rights reserved."
echo "Files in 'third_party/txt' may have an Apache license header instead."
echo "If you're absolutely sure that the change in license count is"
echo "intentional, update 'flutter/ci/licenses.sh' with the new count."
Expand Down
33 changes: 1 addition & 32 deletions ci/licenses_golden/licenses_flutter
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,6 @@ UNUSED LICENSES:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
USED LICENSES:

====================================================================================================
LIBRARY: bsdiff
ORIGIN: ../../../flutter/third_party/bsdiff/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../flutter/third_party/bsdiff/io/flutter/util/BSDiff.java
----------------------------------------------------------------------------------------------------
Copyright 2003-2005 Colin Percival. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. 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.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
====================================================================================================

====================================================================================================
LIBRARY: engine
LIBRARY: txt
Expand Down Expand Up @@ -1296,4 +1265,4 @@ 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.
====================================================================================================
Total license count: 3
Total license count: 2
2 changes: 0 additions & 2 deletions shell/platform/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ action("flutter_shell_java") {

sources += get_target_outputs(":gen_android_build_config_java")

sources += [ "$flutter_root/third_party/bsdiff/io/flutter/util/BSDiff.java" ]

android_support_jars = [
"//third_party/android_support/android_support_v13.jar",
"//third_party/android_support/android_support_compat.jar",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import android.util.Log;

import io.flutter.BuildConfig;
import io.flutter.util.BSDiff;
import io.flutter.util.PathUtils;

import org.json.JSONObject;
Expand Down
23 changes: 0 additions & 23 deletions third_party/bsdiff/LICENSE

This file was deleted.

12 changes: 0 additions & 12 deletions third_party/bsdiff/README.md

This file was deleted.

93 changes: 0 additions & 93 deletions third_party/bsdiff/io/flutter/util/BSDiff.java

This file was deleted.