From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 4 Jul 2019 07:27:56 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
X-Git-Tag: android-x86-8.1-r3~6
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=4a7414386af24ddd9b25d4614547c4b03ae80339;hp=-c

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
---

4a7414386af24ddd9b25d4614547c4b03ae80339
diff --combined device.mk
index cbbba00,41f818a..55c03d0
--- a/device.mk
+++ b/device.mk
@@@ -35,7 -35,6 +35,7 @@@ PRODUCT_COPY_FILES := 
      $(if $(wildcard $(PRODUCT_DIR)modules.blacklist),$(PRODUCT_DIR),$(LOCAL_PATH)/)modules.blacklist:system/etc/modules.blacklist \
      $(if $(wildcard $(PRODUCT_DIR)fstab.$(TARGET_PRODUCT)),$(PRODUCT_DIR)fstab.$(TARGET_PRODUCT),$(LOCAL_PATH)/fstab.x86):root/fstab.$(TARGET_PRODUCT) \
      $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
 +    $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant_overlay.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
      $(if $(wildcard $(PRODUCT_DIR)excluded-input-devices.xml),$(PRODUCT_DIR),$(LOCAL_PATH)/)excluded-input-devices.xml:system/etc/excluded-input-devices.xml \
      $(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/init.x86.rc):root/init.$(TARGET_PRODUCT).rc \
      $(if $(wildcard $(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/ueventd.x86.rc):root/ueventd.$(TARGET_PRODUCT).rc \
@@@ -50,7 -49,7 +50,7 @@@ PRODUCT_COPY_FILES += 
      device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \
      frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
      frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
 -    frameworks/base/compiled-classes-phone:system/etc/compiled-classes \
 +    frameworks/base/config/compiled-classes-phone:system/etc/compiled-classes \
      frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
      frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
      frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
@@@ -86,9 -85,6 +86,9 @@@ PRODUCT_AAPT_PREF_CONFIG := mdp
  
  DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
  
 +# Get Android 8.0 HIDL HALs
 +$(call inherit-product,$(LOCAL_PATH)/treble.mk)
 +
  # Get the firmwares
  $(call inherit-product,device/generic/firmware/firmware.mk)
  
@@@ -111,7 -107,8 +111,8 @@@ $(call inherit-product-if-exists,hardwa
  $(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
  
  # Get GMS
- $(call inherit-product-if-exists,vendor/google/products/gms.mk)
+ GAPPS_VARIANT ?= pico
+ $(call inherit-product-if-exists,$(if $(wildcard vendor/google/products/gms.mk),vendor/google/products/gms.mk,vendor/opengapps/build/opengapps-packages.mk))
  
  # Get native bridge settings
  $(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk)