svn commit: r423297 - branches/2016Q4/devel/fb-adb

[Jan Beich]

Author: jbeich
Date: Tue Oct  4 19:55:46 2016
New Revision: 423297
URL: https://svnweb.freebsd.org/changeset/ports/423297

Log:
  MFH: r423295
  
  devel/fb-adb: unbreak fetch for 64bit NDK
  
  fetch: https://dl.google.com/android/ndk/android-ndk-r11c-linux-x86_64.zip: Not Found
  
  Note, :7z versus :zip sizes are
  
    $ du -Ah android-ndk-*
    376M    android-ndk-r10e-linux-x86.bin
    1.0G    android-ndk-r10e-linux-x86.zip
    383M    android-ndk-r10e-linux-x86_64.bin
    1.0G    android-ndk-r10e-linux-x86_64.zip
    757M    android-ndk-r11c-linux-x86_64.zip
    721M    android-ndk-r12b-linux-x86_64.zip
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2016Q4/devel/fb-adb/Makefile
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/devel/fb-adb/Makefile
==============================================================================
--- branches/2016Q4/devel/fb-adb/Makefile	Tue Oct  4 19:52:28 2016	(r423296)
+++ branches/2016Q4/devel/fb-adb/Makefile	Tue Oct  4 19:55:46 2016	(r423297)
@@ -49,14 +49,15 @@ DEBUG_CONFIGURE_ENABLE=	debuggable-stubs
 
 # XXX Convert into USES=android once more things depend on it
 NDK_DESC=		Build target stubs using Android NDK
-NDK_MASTER_SITES=	https://dl.google.com/android/ndk/:ndk,p7zip
+NDK_MASTER_SITES=	https://dl.google.com/android/ndk/:7z \
+			https://dl.google.com/android/repository/:zip
 .if defined(ANDROID_NDK)
 # Prefer NDK from environment
 WRKSRC_ndk=		${ANDROID_NDK}
 .else
 NDK_DISTFILES=		${NDK_DISTFILES_${LINUX_ARCH}}
-NDK_DISTFILES_i386=	android-ndk-r10e-linux-x86.bin:ndk,p7zip
-NDK_DISTFILES_x86_64=	android-ndk-r11c-linux-x86_64.zip:ndk
+NDK_DISTFILES_i386=	android-ndk-r10e-linux-x86.bin:7z
+NDK_DISTFILES_x86_64=	android-ndk-r11c-linux-x86_64.zip:zip
 WRKSRC_ndk=		${WRKDIR}/${NDK_DISTFILES:R:C/(-[^-]+){2}$//}
 .endif
 NDK_USES=		7z:partial linux