Snap for 8426163 from be7dffa7316362bd093dfc85ddc5a63dd79b5dd5 to mainline-tzdata2-release
Change-Id: Ic2bb0f93abcf422e047b5619ce81605e0a021bd9
diff --git a/.clang-format b/.clang-format
deleted file mode 120000
index 973b2fa..0000000
--- a/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../../../build/soong/scripts/system-clang-format
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 9fdb9a6..67ac2ab 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,35 +1,6 @@
-package {
- default_applicable_licenses: ["system_memory_libion_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: "system_memory_libion_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-GPL-2.0",
- ],
- // large-scale-change unable to identify any license_text files
-}
-
cc_library {
name: "libion",
vendor_available: true,
- product_available: true,
recovery_available: true,
vndk: {
enabled: true,
diff --git a/METADATA b/METADATA
deleted file mode 100644
index a885ed6..0000000
--- a/METADATA
+++ /dev/null
@@ -1,4 +0,0 @@
-third_party {
- # would be NOTICE save for GPL in original-kernel-headers/linux/*
- license_type: RESTRICTED
-}
diff --git a/ion.c b/ion.c
index 8fdbb60..07b4caf 100644
--- a/ion.c
+++ b/ion.c
@@ -48,7 +48,7 @@
* Check for FREE IOCTL here; it is available only in the old
* kernels, not the new ones.
*/
- int err = ion_free(fd, (ion_user_handle_t)0);
+ int err = ion_free(fd, (ion_user_handle_t)NULL);
version = (err == -ENOTTY) ? ION_VERSION_MODERN : ION_VERSION_LEGACY;
atomic_store_explicit(&g_ion_version, version, memory_order_release);
}
diff --git a/tests/Android.bp b/tests/Android.bp
index f3389c6..989e029 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -14,10 +14,6 @@
// limitations under the License.
//
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
cc_test {
name: "ion-unit-tests",
cflags: [
