From aff23fef6529f1167cd91a9e5b21359421ba0a25 Mon Sep 17 00:00:00 2001 From: Patty Date: Fri, 14 Jan 2022 11:29:01 +0800 Subject: [PATCH] Change the makefile include order - The audio-tables.mk is a project specific makefile, the installed file should able to override the common makefile's setting. Bug: 214374267 Test: Make sure the file added in audio-tables.mk can override the common one. Change-Id: I875be3d5840aa0ebc108e15160adce305b805040 --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 2a80583..f138621 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -24,8 +24,8 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cheet DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay -include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/cheetah/audio-tables.mk +include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs101/bluetooth/bluetooth.mk include device/google/gs201/uwb/uwb.mk diff --git a/device-panther.mk b/device-panther.mk index db3641a..f191289 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -24,8 +24,8 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/panth DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay -include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/panther/audio-tables.mk +include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs101/bluetooth/bluetooth.mk