From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 26 Oct 2017 10:27:29 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=1a1353f2d351b7e9879c865454c2304a7a8e0c61

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86
---

1a1353f2d351b7e9879c865454c2304a7a8e0c61
diff --cc BoardConfig.mk
index 552e913,fef9278..9dd7703
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@@ -64,12 -63,16 +64,12 @@@ BOARD_EGL_WORKAROUND_BUG_10194508 := tr
  
  USE_CAMERA_STUB ?= false
  
 -SUPERUSER_EMBEDDED := true
 -SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
 -
  # This enables the wpa wireless driver
 -BOARD_WPA_SUPPLICANT_DRIVER ?= NL80211
 -BOARD_WPA_SUPPLICANT_PRIVATE_LIB ?= private_lib_driver_cmd
 -WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
 -WIFI_DRIVER_MODULE_PATH ?= auto
 +BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 +WPA_SUPPLICANT_VERSION := VER_2_1_DEVEL
 +WIFI_DRIVER_MODULE_NAME := brcmfmac
  
- BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi swrast virgl vmwgfx
+ BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi virgl vmwgfx
  ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
  TARGET_HARDWARE_3D := true
  endif
diff --cc nativebridge/bin/enable_nativebridge
index 97274a8,0f8cd13..306de9d
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@@ -20,13 -34,8 +34,8 @@@ els
  		while [ "$(getprop net.dns1)" = "" ]; do
  			sleep 10
  		done
- 		if [ -z "$1" ]; then
- 			[ "`uname -m`" = "x86_64" ] && url=http://goo.gl/Knnmyl || url=http://goo.gl/JsoX2C
- 		else
- 			url=http://goo.gl/n6KtQa
- 		fi
- 		busybox wget $url -cO houdini$1.sfs && continue
- 		rm -f houdini$1.sfs
 -		wget $url -cO houdini$v.sfs && continue
++		busybox wget $url -cO houdini$v.sfs && continue
+ 		rm -f houdini$v.sfs
  		sleep 30
  	done
  fi