Commit: 2ec54c4d2fdaef820528e35b53a149abdca8973b - device-generic-common (git)

device/generic/common

Commit MetaInfo

• Revision: 2ec54c4d2fdaef820528e35b53a149abdca8973b (tree)
• Time: 2019-07-04 16:28:56
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

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

Change Summary

• modified: device.mk

Incremental Difference

--- a/device.mk
+++ b/device.mk
@@ -110,7 +110,8 @@ $(call inherit-product-if-exists,hardware/libsensors/sensors.mk)
 $(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)