Snap for 6439596 from 689a2af196d2de66803f91dd224e423252d7f171 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: Idc7baccc383b4f2b5168e0cc0b11dd9395b653e7

1 files changed, 4 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index d112d6b9..dbdb2f31 100644
--- a/Android.bp
+++ b/Android.bp
@@ -398,6 +398,10 @@ cc_defaults {
     },
 
     target: {
+        linux_glibc: {
+            // Remove dependencies on libgcc
+            ldflags: ["-nostdlib"],
+        },
         linux_bionic: {
             enabled: true,
         },
@@ -419,7 +423,6 @@ cc_library_static {
     name: "libunwind_static",
     defaults: ["libunwind_core_defaults"],
     vendor_available: true,
-    native_bridge_supported: true,
 }
 
 //-----------------------------------------------------------------------
@@ -429,7 +432,6 @@ cc_library_static {
     name: "libunwindbacktrace",
     defaults: ["libunwind_defaults"],
     vendor_available: true,
-    native_bridge_supported: true,
     sdk_version: "21",
     srcs: [
         "src/unwind/BacktraceWrapper.c",