Snap for 7474514 from f17a9ee1aa3b271f90b5b5812b286a0f632582df to mainline-media-swcodec-release

Change-Id: Id6519fdda2e0ac7f0710d9e360c13ebb7d5d0224

Android.bp

diff --git a/Android.bp b/Android.bp
index 11a2ab6..0289573 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,52 @@
 // 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",
 ]
@@ -32,6 +78,7 @@
         "-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",

Lib/Android.bp

diff --git a/Lib/Android.bp b/Lib/Android.bp
index 48e5caa..edb77eb 100644
--- a/Lib/Android.bp
+++ b/Lib/Android.bp
@@ -12,6 +12,26 @@
 // 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,

METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..0839648
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,19 @@
+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
+  }
+}

Modules/getpath.c

diff --git a/Modules/getpath.c b/Modules/getpath.c
index 27f3381..181354d 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -7,6 +7,7 @@
 #include <string.h>
 
 #ifdef __APPLE__
+#include <AvailabilityMacros.h>
 #include <mach-o/dyld.h>
 #endif