ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 5bd11b48: Merge changes Ib13d9654,I98723ccd

Browse source 
* commit '5bd11b48875846b304e782afc537b4b4b8a6eb39':
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier
This commit is contained in:
Colin Cross 2014-01-23 16:31:33 -08:00 • committed by Android Git Automerger
commit 4b53b0147a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cutils/atomic-aarch64.h
View file

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

2
libcutils/Android.mk
View file

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

2
libsysutils/Android.mk
View file

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