device/generic/common
リビジョン | 183391619b9320aaf866f87905a4f7af124e82e4 (tree) |
---|---|
日時 | 2018-10-04 20:17:34 |
作者 | Chih-Wei Huang <cwhuang@linu...> |
コミッター | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
@@ -115,3 +115,5 @@ $(call inherit-product-if-exists,vendor/google/products/gms.mk) | ||
115 | 115 | |
116 | 116 | # Get native bridge settings |
117 | 117 | $(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk) |
118 | + | |
119 | +$(call inherit-product,$(if $(wildcard $(PRODUCT_DIR)packages.mk),$(PRODUCT_DIR),$(LOCAL_PATH)/)packages.mk) |
@@ -22,7 +22,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ | ||
22 | 22 | ro.com.android.dateformat=MM-dd-yyyy \ |
23 | 23 | |
24 | 24 | $(call inherit-product,$(LOCAL_PATH)/device.mk) |
25 | -$(call inherit-product,$(LOCAL_PATH)/packages.mk) | |
26 | 25 | |
27 | 26 | # Get a list of languages. |
28 | 27 | $(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk) |