Skip to content

Commit a44cbbf

Browse files
authored
Delete BSDiff sources (flutter#9086)
BSDiff is no longer used as of flutter/engine#8663. This removes the unused Java import and sources.
1 parent 0f1ff3b commit a44cbbf

File tree

7 files changed

+2
-166
lines changed

7 files changed

+2
-166
lines changed

ci/licenses.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fi
4646

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

5151
if [ "$actualLicenseCount" -ne "$expectedLicenseCount" ]
5252
then
@@ -57,8 +57,6 @@ then
5757
echo "double-check that all newly added files have a BSD-style license"
5858
echo "header with the following copyright:"
5959
echo " Copyright 2013 The Flutter Authors. All rights reserved."
60-
echo "Files in 'third_party/bsdiff' may have the following copyright instead:"
61-
echo " Copyright 2003-2005 Colin Percival. All rights reserved."
6260
echo "Files in 'third_party/txt' may have an Apache license header instead."
6361
echo "If you're absolutely sure that the change in license count is"
6462
echo "intentional, update 'flutter/ci/licenses.sh' with the new count."

ci/licenses_golden/licenses_flutter

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,6 @@ UNUSED LICENSES:
44
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
55
USED LICENSES:
66

7-
====================================================================================================
8-
LIBRARY: bsdiff
9-
ORIGIN: ../../../flutter/third_party/bsdiff/LICENSE
10-
TYPE: LicenseType.bsd
11-
FILE: ../../../flutter/third_party/bsdiff/io/flutter/util/BSDiff.java
12-
----------------------------------------------------------------------------------------------------
13-
Copyright 2003-2005 Colin Percival. All rights reserved.
14-
15-
Redistribution and use in source and binary forms, with or without
16-
modification, are permitted provided that the following conditions
17-
are met:
18-
19-
1. Redistributions of source code must retain the above copyright
20-
notice, this list of conditions and the following disclaimer.
21-
2. Redistributions in binary form must reproduce the above copyright
22-
notice, this list of conditions and the following disclaimer in the
23-
documentation and/or other materials provided with the distribution.
24-
25-
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
26-
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
27-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
28-
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
29-
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
30-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31-
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
33-
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
34-
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35-
POSSIBILITY OF SUCH DAMAGE.
36-
====================================================================================================
37-
387
====================================================================================================
398
LIBRARY: engine
409
LIBRARY: txt
@@ -1296,4 +1265,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12961265
See the License for the specific language governing permissions and
12971266
limitations under the License.
12981267
====================================================================================================
1299-
Total license count: 3
1268+
Total license count: 2

shell/platform/android/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ action("flutter_shell_java") {
209209

210210
sources += get_target_outputs(":gen_android_build_config_java")
211211

212-
sources += [ "$flutter_root/third_party/bsdiff/io/flutter/util/BSDiff.java" ]
213-
214212
android_support_jars = [
215213
"//third_party/android_support/android_support_v13.jar",
216214
"//third_party/android_support/android_support_compat.jar",

shell/platform/android/io/flutter/view/ResourceExtractor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import android.util.Log;
1818

1919
import io.flutter.BuildConfig;
20-
import io.flutter.util.BSDiff;
2120
import io.flutter.util.PathUtils;
2221

2322
import org.json.JSONObject;

third_party/bsdiff/LICENSE

Lines changed: 0 additions & 23 deletions
This file was deleted.

third_party/bsdiff/README.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

third_party/bsdiff/io/flutter/util/BSDiff.java

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)