| Revision | 38f3ea83bf28443261384eb83fc20d67fc7ab0f5 (tree) |
|---|---|
| Time | 2018-05-04 19:25:08 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Android: fix building issues of oreo-x86
To build with gcc, we have to add external/busybox to the variable
INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS.
Add -fno-stack-protector to avoid missing stack_chk_fail_local
issue.
Android.mk (diff)| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | LOCAL_PATH := $(call my-dir) |
| 2 | 2 | BB_PATH := $(LOCAL_PATH) |
| 3 | +INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS += $(BB_PATH)/ | |
| 3 | 4 | |
| 4 | 5 | # Bionic Branches Switches |
| 5 | 6 | BIONIC_I := $(shell test $(PLATFORM_SDK_VERSION) -ge 14 && echo true) |
| @@ -11,12 +12,13 @@ BIONIC_CFLAGS := \ | ||
| 11 | 12 | $(if $(BIONIC_L),-DBIONIC_L) \ |
| 12 | 13 | $(if $(BIONIC_N),-DBIONIC_N -D_GNU_SOURCE) \ |
| 13 | 14 | $(if $(BIONIC_O),-DBIONIC_O) \ |
| 15 | + -fno-stack-protector | |
| 14 | 16 | |
| 15 | 17 | # Make a static library for regex. |
| 16 | 18 | include $(CLEAR_VARS) |
| 17 | 19 | LOCAL_SRC_FILES := android/regex/bb_regex.c |
| 18 | 20 | LOCAL_C_INCLUDES := $(BB_PATH)/android/regex |
| 19 | -LOCAL_CFLAGS := -Wno-sign-compare | |
| 21 | +LOCAL_CFLAGS := -Wno-sign-compare -fno-stack-protector | |
| 20 | 22 | LOCAL_MODULE := libclearsilverregex |
| 21 | 23 | LOCAL_CLANG := false |
| 22 | 24 | include $(BUILD_STATIC_LIBRARY) |
Android-x86
Fork