am b36cfdb7: am 4b53b014: am 5bd11b48: Merge changes Ib13d9654,I98723ccd

* commit 'b36cfdb718f30c667858f8bac04d012366dca94f':
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier
This commit is contained in:
Colin Cross 2014-01-24 00:36:13 +00:00 committed by Android Git Automerger
commit 7d076b3bf3
3 changed files with 3 additions and 3 deletions

View file

@ -66,7 +66,7 @@ void android_memory_barrier(void)
extern ANDROID_ATOMIC_INLINE
void android_memory_store_barrier(void)
{
__asm__ __volatile__ ("dmb isht" : : : "memory");
__asm__ __volatile__ ("dmb ishst" : : : "memory");
}
#endif

View file

@ -124,7 +124,7 @@ else # !arm
endif # !x86
endif # !arm
LOCAL_C_INCLUDES := $(libcutils_c_includes) $(KERNEL_HEADERS)
LOCAL_C_INCLUDES := $(libcutils_c_includes)
LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS += $(targetSmpFlag)
include $(BUILD_STATIC_LIBRARY)

View file

@ -16,7 +16,7 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE:= libsysutils
LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
LOCAL_C_INCLUDES :=
LOCAL_CFLAGS :=