Android-x86
Forkdevice/generic/common
| Revision | 4a7414386af24ddd9b25d4614547c4b03ae80339 (tree) |
|---|---|
| Time | 2019-07-04 16:27:56 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
| @@ -111,7 +111,8 @@ $(call inherit-product-if-exists,hardware/libsensors/sensors.mk) | ||
| 111 | 111 | $(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk) |
| 112 | 112 | |
| 113 | 113 | # Get GMS |
| 114 | -$(call inherit-product-if-exists,vendor/google/products/gms.mk) | |
| 114 | +GAPPS_VARIANT ?= pico | |
| 115 | +$(call inherit-product-if-exists,$(if $(wildcard vendor/google/products/gms.mk),vendor/google/products/gms.mk,vendor/opengapps/build/opengapps-packages.mk)) | |
| 115 | 116 | |
| 116 | 117 | # Get native bridge settings |
| 117 | 118 | $(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk) |
device.mk