Merge "Fix NDK x86 build." am: be49ee652a

am: e8a86aa60c

Change-Id: I17aac83cf55a109a150c5ce99a14a4cb047b4277
This commit is contained in:
Elliott Hughes
2017-05-24 17:13:00 +00:00
committed by android-build-merger

View File

@@ -60,5 +60,5 @@ void _start() {
#include "__dso_handle.h"
#include "atexit.h"
#ifdef __i386__
# include "../../arch-x86/bionic/__stack_chk_fail_local.h"
# include "__stack_chk_fail_local.h"
#endif