move grouper specific vars to device.mk

Change-Id: I99ac60e01c6b03c83e0670d39de3ed35a1df9f3d
diff --git a/device-common.mk b/device-common.mk
index e7b9c3e..3100bc7 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -30,8 +30,7 @@
     wifi.interface=wlan0 \
     wifi.supplicant_scan_interval=15 \
     tf.enable=y \
-    drm.service.enabled=true \
-    ro.carrier=wifi-only
+    drm.service.enabled=true
 
 # Set default USB interface
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
@@ -41,7 +40,6 @@
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_KERNEL):kernel \
-    device/asus/grouper/init.grouper.rc:root/init.grouper.rc \
     device/asus/grouper/fstab.grouper:root/fstab.grouper \
     device/asus/grouper/ueventd.grouper.rc:root/ueventd.grouper.rc \
     device/asus/grouper/init.grouper.usb.rc:root/init.grouper.usb.rc \
@@ -151,4 +149,3 @@
 
 WIFI_BAND := 802_11_BG
  $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)
-
diff --git a/device.mk b/device.mk
index da27eb6..b54047f 100644
--- a/device.mk
+++ b/device.mk
@@ -14,6 +14,12 @@
 # limitations under the License.
 #
 
+PRODUCT_PROPERTY_OVERRIDES := \
+    ro.carrier=wifi-only
+
+PRODUCT_COPY_FILES := \
+    device/asus/grouper/init.grouper.rc:root/init.grouper.rc
+
 # the actual meat of the device-specific product definition
 $(call inherit-product, device/asus/grouper/device-common.mk)