am 5a98ec04: resolved conflicts for merge of 54ddcc27
to gingerbread-plus-aosp
Merge commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d' * commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d': Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
This commit is contained in:
commit
2ea6527e7b
|
@ -47,6 +47,12 @@ ifeq ($(strip $(LOCAL_NO_FDO_SUPPORT)),)
|
|||
LOCAL_LDFLAGS += $(TARGET_FDO_CFLAGS)
|
||||
endif
|
||||
|
||||
###########################################################
|
||||
## Explicitly declare assembly-only __ASSEMBLY__ macro for
|
||||
## assembly source
|
||||
###########################################################
|
||||
LOCAL_ASFLAGS += -D__ASSEMBLY__
|
||||
|
||||
###########################################################
|
||||
## Define PRIVATE_ variables from global vars
|
||||
###########################################################
|
||||
|
|
Loading…
Reference in New Issue