diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-12 21:20:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-12 21:20:53 +0000 |
| commit | 030085f53df7d74b861b12de792596406ff667f3 (patch) | |
| tree | d35fbfc276b6ddb360be2c169549d480c12c7d14 | |
| parent | e8b585e18b4308e0d79327c5e9db546d7c37902e (diff) | |
| parent | 62aec19b717d169fbce74a87a24af90fa8391681 (diff) | |
| download | compiler-rt-android-wear-n-preview-3.tar.gz | |
Merge "Android.bp: Update to match make builds"android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3
| -rw-r--r-- | Android.bp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index c84136328..87fe44c52 100644 --- a/Android.bp +++ b/Android.bp @@ -65,6 +65,7 @@ cc_library { // 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 @@ cc_library { 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 @@ cc_library { ], }, android: { - srcs: ["lib/builtins/enable_execute_stack.c"], shared_libs: ["libdl", "liblog"], static_libs: ["liblzma"], }, @@ -388,6 +386,8 @@ cc_library { }, windows: { static_libs: ["libunwindbacktrace"], + // Only build enable_execute_stack.c on non-Windows hosts. + exclude_srcs: ["lib/builtins/enable_execute_stack.c"], }, }, |