Snap for 8426163 from 4ecd9450778988240cdfa9b2721750a433cec969 to mainline-tzdata2-release
Change-Id: Ia602ae70ad40ab572a47521fab36b3acf9c451fc
diff --git a/Android.bp b/Android.bp
index 0289573..11a2ab6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,52 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
-// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
-// DEPENDING ON IT IN YOUR PROJECT. ***
-package {
- default_applicable_licenses: ["external_python_cpython2_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
- name: "external_python_cpython2_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-0BSD",
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-CC0-1.0",
- "SPDX-license-identifier-GPL",
- "SPDX-license-identifier-GPL-2.0",
- "SPDX-license-identifier-GPL-3.0",
- "SPDX-license-identifier-LGPL-2.1",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-MPL",
- "SPDX-license-identifier-PSF-2.0",
- "SPDX-license-identifier-Zlib",
- "legacy_by_exception_only", // by exception only
- "legacy_notice",
- "legacy_unencumbered",
- ],
- license_text: [
- "LICENSE",
- ],
-}
-
subdirs = [
"Lib",
]
@@ -78,7 +32,6 @@
"-Wno-register",
"-Wno-shift-count-overflow",
"-Wno-sign-compare",
- "-Wno-strict-prototypes",
"-Wno-tautological-compare",
"-Wno-tautological-constant-out-of-range-compare",
"-Wno-unused-parameter",
diff --git a/Lib/Android.bp b/Lib/Android.bp
index edb77eb..48e5caa 100644
--- a/Lib/Android.bp
+++ b/Lib/Android.bp
@@ -12,26 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
-// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
-// DEPENDING ON IT IN YOUR PROJECT. ***
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "external_python_cpython2_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- // SPDX-license-identifier-BSD
- // SPDX-license-identifier-GPL
- // SPDX-license-identifier-MIT
- // SPDX-license-identifier-PSF-2.0
- // SPDX-license-identifier-Zlib
- // legacy_by_exception_only (by exception only)
- // legacy_notice
- // legacy_unencumbered
- default_applicable_licenses: ["external_python_cpython2_license"],
-}
-
python_library {
name: "py2-stdlib",
is_internal: true,
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 0839648..0000000
--- a/METADATA
+++ /dev/null
@@ -1,19 +0,0 @@
-name: "cpython"
-description: "The Python programming language"
-third_party {
- url {
- type: HOMEPAGE
- value: "https://www.python.org/"
- }
- url {
- type: GIT
- value: "https://github.com/python/cpython"
- }
- version: "18e21883a4ec2a36a02054eb2ff47e3ba9bd1d33"
- license_type: NOTICE
- last_upgrade_date {
- year: 2018
- month: 10
- day: 13
- }
-}
diff --git a/Modules/getpath.c b/Modules/getpath.c
index 181354d..27f3381 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -7,7 +7,6 @@
#include <string.h>
#ifdef __APPLE__
-#include <AvailabilityMacros.h>
#include <mach-o/dyld.h>
#endif
