commit 00e46a2086136f5c5e0938620dc3d027f232d635
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:26:57 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:26:57 2020 +0000
tree 6ab08f285856ffc6858ab574f11f42ec0e7a1c80
parent b717652f6e46c0f5bece2713e9c3af0ae36341d6
parent 689a2af196d2de66803f91dd224e423252d7f171

Snap for 6439596 from 689a2af196d2de66803f91dd224e423252d7f171 to qt-aml-tzdata-release

Change-Id: Idc7baccc383b4f2b5168e0cc0b11dd9395b653e7

Android.bp

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