Snap for 8426163 from aadd73f92bb86a7341a8f732ed169180560e88be to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I8e574b361242e75acdbfc1e7d48c5d5193dd5da7

2 files changed, 5 insertions, 51 deletions

diff --git a/Android.bp b/Android.bp
index 2d426ceca..00f54d94b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,38 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    default_applicable_licenses: ["external_libcxx_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_libcxx_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-NCSA",
-    ],
-    license_text: [
-        "LICENSE.TXT",
-    ],
-}
-
 cc_defaults {
     name: "libc++ defaults",
     host_supported: true,
@@ -74,6 +42,11 @@ cc_defaults {
                 "-UWIN32_LEAN_AND_MEAN",
             ],
         },
+        windows_x86: {
+            cflags: [
+                "-fsjlj-exceptions",
+            ],
+        },
     },
 }
 
@@ -82,9 +55,7 @@ cc_library_static {
     name: "libc++_static",
     defaults: ["libc++ defaults"],
     vendor_available: true,
-    product_available: true,
     ramdisk_available: true,
-    vendor_ramdisk_available: true,
     recovery_available: true,
     apex_available: [
         "//apex_available:platform",
@@ -142,14 +113,12 @@ cc_library_shared {
     name: "libc++",
     host_supported: true,
     vendor_available: true,
-    product_available: true,
     native_bridge_supported: true,
     vndk: {
         enabled: true,
         support_system_process: true,
     },
     ramdisk_available: true,
-    vendor_ramdisk_available: true,
     recovery_available: true,
     apex_available: [
         "//apex_available:platform",
@@ -160,16 +129,7 @@ cc_library_shared {
     whole_static_libs: ["libc++_static"],
     stl: "none",
 
-    pgo: {
-        sampling: true,
-    },
-
     target: {
-        android: {
-            pgo: {
-                profile_file: "libc++/libc++.profdata",
-            },
-        },
         darwin: {
             unexported_symbols_list: "lib/libc++unexp.exp",
             force_symbols_not_weak_list: "lib/notweak.exp",
@@ -193,9 +153,6 @@ cc_library_static {
     ],
 }
 
-// Not available to vendor modules until libc++ is updated and this library is
-// merged into libc++ proper.
-// https://issuetracker.google.com/147469372
 cc_library_static {
     name: "libc++fs",
     recovery_available: true,
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975ca3..000000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}