Change to use the aosp_product.mk under /build/make/target/product
Also deletes the redundant aosp_product.mk.
ro.com.android.dataroaming=true is a vendor property, so moves it
to device_vendor.mk.
Bug: 135502030
Test: Compare system, product and vendor in out with/without the patch
Change-Id: Ic320862cfa32251f7e768476a180092045e41be8
diff --git a/vsoc_arm64/phone/aosp_cf.mk b/vsoc_arm64/phone/aosp_cf.mk
index 8814694..8ce225d 100644
--- a/vsoc_arm64/phone/aosp_cf.mk
+++ b/vsoc_arm64/phone/aosp_cf.mk
@@ -34,17 +34,21 @@
#
# All components inherited here go to product image (same as GSI product)
#
-$(call inherit-product, device/google/cuttlefish/shared/phone/aosp_product.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
#
# All components inherited here go to vendor image
#
$(call inherit-product, device/google/cuttlefish/shared/phone/device_vendor.mk)
+#
+# Special settings for the target
+#
DEVICE_PACKAGE_OVERLAYS += device/google/cuttlefish/vsoc_arm64/phone/overlay
$(call inherit-product, device/google/cuttlefish/vsoc_arm64/device.mk)
+
PRODUCT_NAME := aosp_cf_arm64_phone
PRODUCT_DEVICE := vsoc_arm64
PRODUCT_MODEL := Cuttlefish arm64 phone