resolved conflicts for merge of 54ddcc27
to gingerbread-plus-aosp
Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
This commit is contained in:
commit
5a98ec046c
|
@ -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