From bf9a0bcb47de1ddadca272a7227071a46d4d5fac Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Fri, 24 Jun 2022 21:41:22 +0800 Subject: Opt host darwin libcxx out of LLD LLD does not implement force_symbols_weak_list or force_symbols_not_weak_list. Fallback to ld64. Test: presubmit Bug: 236924555 Change-Id: I90acaf3f562993cde6da2d2d8cc75cc18cbfc88a --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index 4b01aa28a..c67399499 100644 --- a/Android.bp +++ b/Android.bp @@ -168,6 +168,9 @@ cc_library_shared { target: { darwin: { + // TODO: LLD does not implement force_symbols_weak_list or + // force_symbols_not_weak_list. Opt out and keep using ld64. + use_clang_lld: false, unexported_symbols_list: "lib/libc++unexp.exp", force_symbols_not_weak_list: "lib/notweak.exp", force_symbols_weak_list: "lib/weak.exp", -- cgit v1.2.3 From b27c78260b9e6563b5655c8c5331e0b5090d313f Mon Sep 17 00:00:00 2001 From: William Escande Date: Thu, 16 Jun 2022 17:26:10 -0700 Subject: Move user file along to the new package name Repro step: * Flash old build * Pair device * Change it's metadata: * Change connection_policy * Change Volume * Change phone_access * build and flash without wipe * observe device metadata Test: Repro step above Bug: 234063703 Ignore-AOSP-First: will be picked later Change-Id: I230be7dd8d657679c2b33c6324f3b525a98d1e2d (cherry picked from commit 578c0d318681072b6c037423a01489a8a4b07629) Merged-In: I230be7dd8d657679c2b33c6324f3b525a98d1e2d --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index a494eb4ee..1ce1365ab 100644 --- a/Android.bp +++ b/Android.bp @@ -205,6 +205,7 @@ cc_library_static { "//apex_available:platform", "com.android.art", "com.android.art.debug", + "com.android.bluetooth", ], // being part of updatable apexes, this should work on older releases min_sdk_version: "apex_inherit", -- cgit v1.2.3 From fe75d5e6ebb70c906ac91ff8d55d4dcfa1d8e100 Mon Sep 17 00:00:00 2001 From: William Escande Date: Mon, 22 Aug 2022 11:27:54 -0700 Subject: [Bluetooth apex] Use new apex name The Bluetooth apex name is now called com.android.btservices Bug: 243054261 Test: Build Change-Id: I1e12d9f88c7b8815796a2e0b6e1107b52129f573 --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index bbbca1c04..2a2dbe6f4 100644 --- a/Android.bp +++ b/Android.bp @@ -208,7 +208,7 @@ cc_library_static { "//apex_available:platform", "com.android.art", "com.android.art.debug", - "com.android.bluetooth", + "com.android.btservices", ], // being part of updatable apexes, this should work on older releases min_sdk_version: "apex_inherit", -- cgit v1.2.3 From b37855cd3b023b51246b6365152c2ffedb4715a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Sun, 18 Sep 2022 01:38:52 +0000 Subject: Remove Python 2 "test" that doesn't test anything. This file appears to be related to testing, but it's not actually a test (executing it doesn't run any tests) and it's otherwise unused. Bug: 245854393 Test: presubmit Change-Id: Ie0e21e0789c5481256ddb8caa278fc709dd3bff9 --- Android.bp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Android.bp b/Android.bp index 2a2dbe6f4..648a7dfde 100644 --- a/Android.bp +++ b/Android.bp @@ -286,23 +286,6 @@ cc_binary { cpp_std: "c++17", } -python_test { - name: "filesystem_dynamic_test_helper.py", - main: "test/support/filesystem_dynamic_test_helper.py", - srcs: [ - "test/support/filesystem_dynamic_test_helper.py", - ], - version: { - py2: { - enabled: true, - embedded_launcher: true, - }, - py3: { - enabled: false, - }, - }, -} - // Export libc++ headers for inclusion in the musl sysroot. genrule { name: "libc_musl_sysroot_libc++_headers", -- cgit v1.2.3 From 69c72cf1ae966f4fae3013d50a683ab3025c08e6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 26 Jan 2023 14:06:41 -0800 Subject: Build sdk variants of libc++ for riscv64 There is no prebuilt libc++ for riscv64 provided by the NDK, build it using the platform sources instead. Test: lunch aosp_riscv64-userdebug && m -k bbg Change-Id: I3e443925549d04edebc9adc56116c5254dbf4307 --- Android.bp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Android.bp b/Android.bp index 648a7dfde..519101739 100644 --- a/Android.bp +++ b/Android.bp @@ -96,6 +96,10 @@ cc_library_static { ], // being part of updatable apexes, this should work on older releases min_sdk_version: "apex_inherit", + // sdk_version normally isn't needed as only the platform variant + // is used, except on riscv64 which doesn't have an NDK libc++ and + // reuses this module for sdk variants. + sdk_version: "current", native_bridge_supported: true, srcs: [ "src/algorithm.cpp", @@ -161,6 +165,10 @@ cc_library_shared { ], // being part of updatable apexes, this should work on older releases min_sdk_version: "apex_inherit", + // sdk_version normally isn't needed as only the platform variant + // is used, except on riscv64 which doesn't have an NDK libc++ and + // reuses this module for sdk variants. + sdk_version: "current", whole_static_libs: ["libc++_static"], stl: "none", -- cgit v1.2.3 From 19461d9be82faa4cd29ab0217e5e504382040a9d Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Tue, 21 Feb 2023 17:39:08 +0900 Subject: Suppress -fcoroutines-ts deprecation warning Starting from clang-r487747, clang emits the following warning: clang++: error: the '-fcoroutines-ts' flag is deprecated and it will be removed in Clang 17; use '-std=c++20' or higher to use standard C++ coroutines instead [-Werror,-Wdeprecated-experimental-coroutine] Test: presubmit Change-Id: Ib0082dee2e7d3f16dc8c23b757c90ede9f229cb4 --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index 519101739..748973dcd 100644 --- a/Android.bp +++ b/Android.bp @@ -252,6 +252,7 @@ cc_binary { "-fsized-deallocation", "-fexceptions", "-fcoroutines-ts", + "-Wno-deprecated-experimental-coroutine", "-Wno-format-zero-length", "-Wno-implicit-fallthrough", "-Wno-non-virtual-dtor", -- cgit v1.2.3 From fe9066ae4e98d7d2851c309b4134c59c9fab9d83 Mon Sep 17 00:00:00 2001 From: Helen Qin Date: Wed, 1 Mar 2023 19:31:36 +0000 Subject: Revert "Suppress -fcoroutines-ts deprecation warning" Revert submission 2446165-update-clang-r487747 Reason for revert: DroidMonitor-triggered revert due to breakage bug b/271252582 and b/271243811 Reverted changes: /q/submissionid:2446165-update-clang-r487747 Bug: 271252582 Bug: 271243811 Change-Id: Ib2f5cafe2bcb0375bfd4a7933419995a6737b86e --- Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/Android.bp b/Android.bp index 748973dcd..519101739 100644 --- a/Android.bp +++ b/Android.bp @@ -252,7 +252,6 @@ cc_binary { "-fsized-deallocation", "-fexceptions", "-fcoroutines-ts", - "-Wno-deprecated-experimental-coroutine", "-Wno-format-zero-length", "-Wno-implicit-fallthrough", "-Wno-non-virtual-dtor", -- cgit v1.2.3 From cc74b9688788061952ee1458bca2782558bbbb95 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Mon, 6 Mar 2023 08:04:23 +0000 Subject: Revert^2 "Suppress -fcoroutines-ts deprecation warning" fe9066ae4e98d7d2851c309b4134c59c9fab9d83 Change-Id: I845142c0f27d0c830304a6e2b061e3e390c45254 --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index 519101739..748973dcd 100644 --- a/Android.bp +++ b/Android.bp @@ -252,6 +252,7 @@ cc_binary { "-fsized-deallocation", "-fexceptions", "-fcoroutines-ts", + "-Wno-deprecated-experimental-coroutine", "-Wno-format-zero-length", "-Wno-implicit-fallthrough", "-Wno-non-virtual-dtor", -- cgit v1.2.3