diff options
author | Oscar Azucena <oscarazu@google.com> | 2020-01-24 00:03:11 +0000 |
---|---|---|
committer | Oscar Azucena <oscarazu@google.com> | 2020-01-24 10:21:22 -0800 |
commit | 20966be438c19121651dba80c5711a5e58d98acf (patch) | |
tree | 28b618734b79cc20e2347fc094f0c7aa73699f44 /car_x86_64.mk | |
parent | 5711e602842bac0181401cbc51519f847a72616b (diff) | |
download | car-20966be438c19121651dba80c5711a5e58d98acf.tar.gz |
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
Diffstat (limited to 'car_x86_64.mk')
-rw-r--r-- | car_x86_64.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |