Move the device manifest files to device.mk
BUG: 112008105
Test: Built. Auto stuff appears in manifest.xml
Change-Id: I3b8ddacbdd393430c86468137a73353222c81369
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 3be65a5..e468482 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -119,11 +119,6 @@
INIT_BOOTCHART := true
-DEVICE_MANIFEST_FILE := device/google/cuttlefish/shared/config/manifest.xml
-ifneq (,$(filter cf_x86_auto cf_x86_64_auto aosp_x86_auto aosp_x86_64_auto, $(TARGET_PRODUCT)))
-DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/auto/manifest-extra.xml
-endif
-
# Need this so that the application's loop on reading input can be synchronized
# with HW VSYNC
TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := true
diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 264d64f..04367f8 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -19,6 +19,8 @@
$(call inherit-product, device/google/cuttlefish/shared/device.mk)
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/auto/manifest-extra.xml
+
################################################
# Begin general Android Auto Embedded configurations
diff --git a/shared/device.mk b/shared/device.mk
index a98e574..db848fc 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -14,6 +14,8 @@
# limitations under the License.
#
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
+
PRODUCT_COPY_FILES += device/google/cuttlefish_kernel/4.4-x86_64/kernel:kernel
PRODUCT_SHIPPING_API_LEVEL := 26
