From 73d9ed3bf28330006e324d634e6b5b9414a3f701 Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Mon, 11 Mar 2019 16:27:14 +0000 Subject: Enable libcompiler_rt on Windows This allows building libcompiler_rt for Windows, which is necessary to build a native version of layoutlib. This removes libunwindbacktrace and libunwind_static from the static libraries, as they do not build on Windows and do not appear necessary for libcompiler_rt. Test: lunch sdk && make libcompiler_rt Change-Id: I265fafb66d1e8213a10ab023df8e7256d5ab7831 --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 4191d9259..b8be74026 100644 --- a/Android.bp +++ b/Android.bp @@ -404,7 +404,7 @@ cc_library { shared_libs: ["liblzma"], }, windows: { - static_libs: ["libunwindbacktrace", "libunwind_static"], + enabled: true, // Only build enable_execute_stack.c on non-Windows hosts. exclude_srcs: ["lib/builtins/enable_execute_stack.c"], }, -- cgit v1.2.3