Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b36cfdb7 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

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

* commit '4b53b014':
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier
parents 17ff7a8b 4b53b014

include/cutils/atomic-aarch64.h

+1 −1
Original line number Diff line number Diff line
@@ -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

libcutils/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

libsysutils/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_MODULE:= libsysutils



LOCAL_C_INCLUDES := $(KERNEL_HEADERS)

LOCAL_C_INCLUDES :=



LOCAL_CFLAGS :=