diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:26:00 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:26:00 -0700 |
| commit | 40d5df28bc4278d543697c960267ba3b5da74163 (patch) | |
| tree | 4a1cae5501cb263d8b2fbd821ff0434bc7732809 /linker/Android.mk | |
| parent | 6ed844f1f2e3a53939b606011a76fb3e353a7a92 (diff) | |
| parent | 50a83255d80f98b857c3f72dd2225d4bbc720ca3 (diff) | |
| download | android_bionic-gingerbread-release.tar.gz android_bionic-gingerbread-release.tar.bz2 android_bionic-gingerbread-release.zip | |
Merge branch 'gingerbread' of git://git.omapzoom.org/platform/bionic into 237cm-7.1.0gingerbread-release
Conflicts:
libc/Android.mk
libthread_db/Android.mk
Change-Id: I4a730f70bf3b31331ab9cee5f1a098d4162ef4b7
Diffstat (limited to 'linker/Android.mk')
| -rw-r--r-- | linker/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index 5ab48a09c..0cbaf366a 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -62,6 +62,7 @@ LOCAL_CFLAGS += -DANDROID_ARM_LINKER else ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += -DANDROID_X86_LINKER + LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/arch-x86/bionic else ifeq ($(TARGET_ARCH),sh) LOCAL_CFLAGS += -DANDROID_SH_LINKER |