Merge "Android.bp: Update to match make builds" am: 030085f53d
am: 273b50e4e5
* commit '273b50e4e57b2c3ce1c334f8ffda71cbc94e26e7':
Android.bp: Update to match make builds
Change-Id: Iebcdade7b12ff7f58fc82fe84c5bbbd3514dac8f
diff --git a/Android.bp b/Android.bp
index c841363..87fe44c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,6 +65,7 @@
// Skip apple_versioning.c since it is unused.
// Skip atomic.c since it needs to be built separately according to the docs.
srcs: [
+ "lib/builtins/enable_execute_stack.c",
"lib/builtins/absvdi2.c",
"lib/builtins/absvsi2.c",
"lib/builtins/absvti2.c",
@@ -345,8 +346,6 @@
target: {
not_windows: {
- // Only build enable_execute_stack.c on non-Windows hosts.
- srcs: ["lib/builtins/enable_execute_stack.c"],
host_ldlibs: [
"-lpthread",
"-lc",
@@ -354,7 +353,6 @@
],
},
android: {
- srcs: ["lib/builtins/enable_execute_stack.c"],
shared_libs: ["libdl", "liblog"],
static_libs: ["liblzma"],
},
@@ -388,6 +386,8 @@
},
windows: {
static_libs: ["libunwindbacktrace"],
+ // Only build enable_execute_stack.c on non-Windows hosts.
+ exclude_srcs: ["lib/builtins/enable_execute_stack.c"],
},
},