• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

external/busybox


Commit MetaInfo

Revision38f3ea83bf28443261384eb83fc20d67fc7ab0f5 (tree)
Time2018-05-04 19:25:08
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

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.

Change Summary

Incremental Difference

--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,6 @@
11 LOCAL_PATH := $(call my-dir)
22 BB_PATH := $(LOCAL_PATH)
3+INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS += $(BB_PATH)/
34
45 # Bionic Branches Switches
56 BIONIC_I := $(shell test $(PLATFORM_SDK_VERSION) -ge 14 && echo true)
@@ -11,12 +12,13 @@ BIONIC_CFLAGS := \
1112 $(if $(BIONIC_L),-DBIONIC_L) \
1213 $(if $(BIONIC_N),-DBIONIC_N -D_GNU_SOURCE) \
1314 $(if $(BIONIC_O),-DBIONIC_O) \
15+ -fno-stack-protector
1416
1517 # Make a static library for regex.
1618 include $(CLEAR_VARS)
1719 LOCAL_SRC_FILES := android/regex/bb_regex.c
1820 LOCAL_C_INCLUDES := $(BB_PATH)/android/regex
19-LOCAL_CFLAGS := -Wno-sign-compare
21+LOCAL_CFLAGS := -Wno-sign-compare -fno-stack-protector
2022 LOCAL_MODULE := libclearsilverregex
2123 LOCAL_CLANG := false
2224 include $(BUILD_STATIC_LIBRARY)