Snap for 8426163 from f41ef119872c6595e7711ca9346131eb8d40ac8f to mainline-tzdata2-release
Change-Id: Ifb1e3b95d047b8cddd81ee71262ac6bde4859808
diff --git a/Android.bp b/Android.bp
index f49c69b..e66a2ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,20 +1,3 @@
-package {
- default_applicable_licenses: ["external_puffin_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
- name: "external_puffin_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-BSD",
- ],
- license_text: [
- "LICENSE",
- ],
-}
-
cc_defaults {
name: "puffin_defaults",
host_supported: true,
diff --git a/BUILD.gn b/BUILD.gn
index 460aa58..43468c5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -26,7 +26,7 @@
pkg_config("target_defaults") {
pkg_deps = [
- "libchrome",
+ "libchrome-${libbase_ver}",
]
if (use.fuzzer) {
# Link against protobuf for fuzzers so we can use libprotobuf-mutator.
@@ -104,7 +104,7 @@
pkg_config("libbrillo") {
pkg_deps = [
- "libbrillo",
+ "libbrillo-${libbase_ver}",
]
}
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
- license_type: NOTICE
-}
diff --git a/puffin b/puffin
new file mode 120000
index 0000000..945c9b4
--- /dev/null
+++ b/puffin
@@ -0,0 +1 @@
+.
\ No newline at end of file
diff --git a/puffin/src b/puffin/src
deleted file mode 120000
index 5cd551c..0000000
--- a/puffin/src
+++ /dev/null
@@ -1 +0,0 @@
-../src
\ No newline at end of file
diff --git a/src/puffdiff.cc b/src/puffdiff.cc
index 15d0fa6..9e3de72 100644
--- a/src/puffdiff.cc
+++ b/src/puffdiff.cc
@@ -68,9 +68,7 @@
header.mutable_src()->set_puff_length(src_puff_size);
header.mutable_dst()->set_puff_length(dst_puff_size);
- const size_t header_size_long = header.ByteSizeLong();
- TEST_AND_RETURN_FALSE(header_size_long <= UINT32_MAX);
- const uint32_t header_size = header_size_long;
+ const uint32_t header_size = header.ByteSize();
uint64_t offset = 0;
patch->resize(kMagicLength + sizeof(header_size) + header_size +
