Skip to content
  • maxwen's avatar
    busybox: squashed commit of merging cm-12.1 · 27116bab
    maxwen authored
    With fixes to LOCAL_C_INCLUDES for libsepol in M and fixed
    some missing includes to enable building for 64 bit devices
    
    Conflicts:
    	Android.mk
    	android/libc/arch-x86/syscalls/swapoff.S
    	android/libc/arch-x86/syscalls/swapon.S
    	android/libc/arch-x86/syscalls/sysinfo.S
    	android/librpc/pmap_rmt.c
    	android/reboot.c
    	include-full/copy-current.sh
    	include-minimal/copy-current.sh
    	include/platform.h
    	networking/interface.c
    	networking/nslookup.c
    
    Change-Id: If6092fa87f3d21190db1af4f70daa150eb462660
    27116bab