Skip to content
Snippets Groups Projects
Commit 33a4e7e4 authored by Andrew Hsieh's avatar Andrew Hsieh Committed by Gerrit Code Review
Browse files

Merge "Add explicit LOCAL_ASFLAGS=-m32 for x86 target"

parents 5c3bee7d 1516181d
Branches aosp-new/android10-release aosp-new/android10-s1-release aosp-new/android10-s2-release aosp-new/android10-s3-release aosp-new/android10-tests-release aosp-new/aosp-new/android10-release aosp-new/aosp-new/android10-s1-release aosp-new/aosp-new/android10-s2-release aosp-new/aosp-new/android10-s3-release aosp-new/aosp-new/android10-tests-release caf_migration/LA.AU.0.0.2.c1_rb1.12 caf_migration/LA.AU.0.0.2.c1_rb1.14 caf_migration/LA.AU.0.0.2.c1_rb2.5 caf_migration/LA.AU.0.1.0.r1 caf_migration/LA.AU.0.1.0.r2 caf_migration/LA.AU.0.1.1_rb1.3 caf_migration/aosp-new/android10-release caf_migration/aosp-new/android10-s1-release caf_migration/aosp-new/android10-s2-release caf_migration/aosp-new/android10-s3-release caf_migration/aosp-new/android10-tests-release caf_migration/automotive-aosp.lnx.2.1.r1-rel
Tags android-10.0.0_r1 android-10.0.0_r10 android-10.0.0_r11 android-10.0.0_r17 android-10.0.0_r2 android-10.0.0_r3 android-10.0.0_r4 android-10.0.0_r46 android-10.0.0_r47 android-10.0.0_r5 android-10.0.0_r6 android-cts-10.0_r1 android-cts-10.0_r10 android-cts-10.0_r11 android-cts-10.0_r12 android-cts-10.0_r13 android-cts-10.0_r14 android-cts-10.0_r15 android-cts-10.0_r16 android-cts-10.0_r2 android-cts-10.0_r3 android-cts-10.0_r4 android-cts-10.0_r5 android-cts-10.0_r6 android-cts-10.0_r7 android-cts-10.0_r8 android-cts-10.0_r9 android-security-10.0.0_r48 android-vts-10.0_r1 android-vts-10.0_r10 android-vts-10.0_r11 android-vts-10.0_r12 android-vts-10.0_r13 android-vts-10.0_r14 android-vts-10.0_r15 android-vts-10.0_r16 android-vts-10.0_r2 android-vts-10.0_r3 android-vts-10.0_r4 android-vts-10.0_r5 android-vts-10.0_r6 android-vts-10.0_r7 android-vts-10.0_r8 android-vts-10.0_r9
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
Android.mk
+ 3
− 0
View file @ 33a4e7e4
......@@ -31,6 +31,7 @@ LOCAL_CFLAGS := \
-Wpointer-arith -falign-jumps=1 -falign-loops=1 \
-falign-functions=1 -Wundef
LOCAL_CFLAGS += -m32 -O2 -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
LOCAL_ASFLAGS += -m32
LOCAL_C_INCLUDES := $(LOCAL_PATH)/stage1
......@@ -88,6 +89,7 @@ LOCAL_CFLAGS := \
-falign-functions=1 -Wundef
LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
LOCAL_ASFLAGS += -m32
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFSYS_EXT2FS=1 -DSUPPORT_SERIAL=1
......@@ -125,6 +127,7 @@ LOCAL_CFLAGS := \
-falign-functions=1 -Wundef
LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
LOCAL_ASFLAGS += -m32
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFSYS_EXT2FS=1 -DSUPPORT_SERIAL=1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment