JWQ87C

[android-x86/build.git] / core / product.mk

diff --git a/core/product.mk b/core/product.mk
index 81042a1..bbd0c31 100644 (file)
--- a/core/product.mk
+++ b/core/product.mk
@@ -71,6 +71,9 @@ _product_var_list := \
     PRODUCT_AAPT_CONFIG \
     PRODUCT_AAPT_PREF_CONFIG \
     PRODUCT_PACKAGES \
+    PRODUCT_PACKAGES_DEBUG \
+    PRODUCT_PACKAGES_ENG \
+    PRODUCT_PACKAGES_TESTS \
     PRODUCT_DEVICE \
     PRODUCT_MANUFACTURER \
     PRODUCT_BRAND \
@@ -90,8 +93,9 @@ _product_var_list := \
     PRODUCT_DEFAULT_WIFI_CHANNELS \
     PRODUCT_DEFAULT_DEV_CERTIFICATE \
     PRODUCT_RESTRICT_VENDOR_FILES \
-    PRODUCT_FACTORY_RAMDISK_MODULES \
     PRODUCT_VENDOR_KERNEL_HEADERS \
+    PRODUCT_FACTORY_RAMDISK_MODULES \
+    PRODUCT_FACTORY_BUNDLE_MODULES
 
 
 define dump-product
@@ -166,7 +170,7 @@ $(if ,, \
     $(eval pb := $(strip $(PRODUCTS.$(p).PRODUCT_BRAND))) \
     $(if $(pb),,$(error $(p): PRODUCT_BRAND must be defined.)) \
     $(foreach cf,$(strip $(PRODUCTS.$(p).PRODUCT_COPY_FILES)), \
-      $(if $(filter 2,$(words $(subst :,$(space),$(cf)))),, \
+      $(if $(filter 2 3,$(words $(subst :,$(space),$(cf)))),, \
         $(error $(p): malformed COPY_FILE "$(cf)") \
        ) \
      ) \
@@ -205,6 +209,7 @@ endef
 _product_stash_var_list := $(_product_var_list) \
        TARGET_ARCH \
        TARGET_ARCH_VARIANT \
+       TARGET_CPU_VARIANT \
        TARGET_BOARD_PLATFORM \
        TARGET_BOARD_PLATFORM_GPU \
        TARGET_BOARD_KERNEL_HEADERS \
@@ -231,6 +236,7 @@ _product_stash_var_list += \
        BOARD_KERNEL_BASE \
        BOARD_HAVE_BLUETOOTH \
        BOARD_HAVE_BLUETOOTH_BCM \
+       BOARD_HAVE_BLUETOOTH_QCOM \
        BOARD_VENDOR_QCOM_AMSS_VERSION \
        BOARD_VENDOR_USE_AKMD \
        BOARD_EGL_CFG \