diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 795935bae87e9bbf239a048facaad510f37fd1fc..93443f51b8abf6214980106ebdcbe7c3acbeed87 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -276,6 +276,8 @@ cc_library_static {
"-O3",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -1009,6 +1011,8 @@ cc_library_static {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -1418,6 +1422,8 @@ cc_library_static {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -1762,6 +1768,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -2013,6 +2021,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -2082,6 +2092,8 @@ cc_library_static {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -2368,6 +2380,8 @@ cc_object {
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -2482,6 +2496,8 @@ cc_object {
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -2683,6 +2699,8 @@ cc_library_shared {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -3372,6 +3390,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -3758,6 +3778,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -3873,6 +3895,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -3969,6 +3993,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -4122,6 +4148,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -4260,6 +4288,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -4934,6 +4964,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -5058,6 +5090,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -5195,6 +5229,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -5883,6 +5919,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -6011,6 +6049,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -6263,6 +6303,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -6352,6 +6394,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -6877,6 +6921,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -6974,6 +7020,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7060,6 +7108,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7136,6 +7186,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7202,6 +7254,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7268,6 +7322,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7334,6 +7390,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7400,6 +7458,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7466,6 +7526,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7532,6 +7594,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7599,6 +7663,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7665,6 +7731,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7733,6 +7801,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7799,6 +7869,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7865,6 +7937,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7931,6 +8005,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -7997,6 +8073,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8063,6 +8141,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8129,6 +8209,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8195,6 +8277,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8261,6 +8345,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8327,6 +8413,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8393,6 +8481,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8460,6 +8550,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8529,6 +8621,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8598,6 +8692,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8667,6 +8763,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8736,6 +8834,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8805,6 +8905,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8874,6 +8976,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -8940,6 +9044,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9006,6 +9112,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9075,6 +9183,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9142,6 +9252,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9208,6 +9320,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9276,6 +9390,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9348,6 +9464,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9414,6 +9532,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9480,6 +9600,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9546,6 +9668,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9614,6 +9738,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9685,6 +9811,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9763,6 +9891,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9829,6 +9959,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9901,6 +10033,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -9967,6 +10101,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10041,6 +10177,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10111,6 +10249,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10177,6 +10317,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10243,6 +10385,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10308,6 +10452,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10376,6 +10522,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10710,6 +10858,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10780,6 +10930,8 @@ cc_object {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10920,6 +11072,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -10996,6 +11150,8 @@ cc_library_static {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -11320,6 +11476,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -11603,6 +11761,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -11689,6 +11849,8 @@ cc_library_static {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -11907,6 +12069,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -12073,6 +12237,8 @@ cc_library_static {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fstack-protector",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
@@ -12158,6 +12324,8 @@ cc_library_static {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
@@ -12247,6 +12415,8 @@ cc_binary {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fstack-protector",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
@@ -12394,6 +12564,8 @@ cc_library_static {
"-O2",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fstack-protector",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
@@ -12519,6 +12691,8 @@ cc_library_static {
"-Oz",
"-fdata-sections",
"-ffunction-sections",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
"-g1",
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 9dc5cdbfb98fc174a2476c2c24cd2189f2e6ac14..592c0707793102d80d985d9b4ecc2c90022f3826 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -139,7 +139,9 @@ cflag_allowlist = [
"-fvisibility-inlines-hidden",
"-fstack-protector",
"-mno-outline",
- "-mno-outline-atomics"
+ "-mno-outline-atomics",
+ "-fno-asynchronous-unwind-tables",
+ "-fno-unwind-tables",
]
# Linker flags which are passed through to the blueprint.