X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=device.mk;h=55c03d06214afdcb512071d140045ce191e00846;hp=3d3468b57bd700974585e2455ab528fbdf16535d;hb=4a7414386af24ddd9b25d4614547c4b03ae80339;hpb=1c2abf374a3b3d7fe2e28d410b490733d3426ffe

diff --git a/device.mk b/device.mk
index 3d3468b..55c03d0 100644
--- a/device.mk
+++ b/device.mk
@@ -111,7 +111,10 @@ $(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)
+
+$(call inherit-product,$(if $(wildcard $(PRODUCT_DIR)packages.mk),$(PRODUCT_DIR),$(LOCAL_PATH)/)packages.mk)