From fd5269155322b5c5e09a4d1e8ee6c64d2baf5f7b Mon Sep 17 00:00:00 2001 From: Chase Wu Date: Wed, 26 Oct 2022 22:15:47 +0800 Subject: [PATCH] [DO NOT MERGE] cs40l26: using the project folder mk The based mk file is different from master one, so there is no need to merge this patch to master branch. Bug: 181615889 Test: Run all test suites Signed-off-by: Chase Wu Change-Id: I61106aee64c87f77cef966d307ca5f047b5cc0b2 --- device-felix.mk | 5 +---- vibrator/cs40l26/device-stereo.mk | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index dc15424..2db1ac9 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -30,7 +30,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/felix/felix/overlay include device/google/felix/audio/felix/audio-tables.mk include device/google/gs201/device-shipping-common.mk $(call soong_config_set,fp_hal_feature,pixel_product, product_a) -include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk +include device/google/felix/vibrator/cs40l26/device-stereo.mk include device/google/gs101/bluetooth/bluetooth.mk ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),) include device/google/felix/uwb/uwb_calibration.mk @@ -41,9 +41,6 @@ $(call soong_config_set,lyric,camera_hardware,felix) $(call soong_config_set,lyric,tuning_product,felix) $(call soong_config_set,google3a_config,target_device,felix) -BOARD_SEPOLICY_DIRS += \ - hardware/google/pixel-sepolicy/vibrator/common \ - # Init files PRODUCT_COPY_FILES += \ device/google/felix/conf/init.felix.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.felix.rc diff --git a/vibrator/cs40l26/device-stereo.mk b/vibrator/cs40l26/device-stereo.mk index 44d2b92..08e4787 100644 --- a/vibrator/cs40l26/device-stereo.mk +++ b/vibrator/cs40l26/device-stereo.mk @@ -3,4 +3,5 @@ PRODUCT_PACKAGES += \ android.hardware.vibrator-service.cs40l26-dual \ BOARD_SEPOLICY_DIRS += \ - hardware/google/pixel-sepolicy/vibrator/cs40l26 \ + device/google/felix-sepolicy/vibrator/common \ + device/google/felix-sepolicy/vibrator/cs40l26