Revert "Include core makefile before device-specific one."
Revert "Include core makefile before device-specific one."
Revert submission 10117438-car-mk-order
Reason for revert: The auto emulator looks like a giant phone.
Bug: 148219586
Reverted Changes:
Iafb4d62c1: Include core makefile before device-specific one.
I1663477b0: Include core makefile before device-specific one.
Test: make -j60 and ran emulator to make sure the auto audio properties
were loaded correctly.
Change-Id: I8d53b85dd6def993e4886d8859e4527548b184c7
diff --git a/aosp_car_arm.mk b/aosp_car_arm.mk
index 8d6199d..9698d61 100644
--- a/aosp_car_arm.mk
+++ b/aosp_car_arm.mk
@@ -15,8 +15,8 @@
PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
PRODUCT_NAME := aosp_car_arm
PRODUCT_DEVICE := generic
diff --git a/aosp_car_arm64.mk b/aosp_car_arm64.mk
index dfee08e..682f9b1 100644
--- a/aosp_car_arm64.mk
+++ b/aosp_car_arm64.mk
@@ -15,8 +15,8 @@
PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
PRODUCT_NAME := aosp_car_arm64
PRODUCT_DEVICE := generic_arm64
diff --git a/aosp_car_x86.mk b/aosp_car_x86.mk
index a4a5580..f6138c0 100644
--- a/aosp_car_x86.mk
+++ b/aosp_car_x86.mk
@@ -15,8 +15,8 @@
PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
PRODUCT_NAME := aosp_car_x86
PRODUCT_DEVICE := generic_x86
diff --git a/aosp_car_x86_64.mk b/aosp_car_x86_64.mk
index 4e72670..360a349 100644
--- a/aosp_car_x86_64.mk
+++ b/aosp_car_x86_64.mk
@@ -15,8 +15,8 @@
PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
PRODUCT_NAME := aosp_car_x86_64
PRODUCT_DEVICE := generic_x86_64
diff --git a/car_x86_64.mk b/car_x86_64.mk
index 8a4cf35..3832149 100644
--- a/car_x86_64.mk
+++ b/car_x86_64.mk
@@ -15,8 +15,8 @@
PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
$(call inherit-product, device/generic/car/emulator/audio/car_emulator_audio.mk)
PRODUCT_SDK_ADDON_NAME := car_emu_x86_64
