diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-29 21:11:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 21:11:42 +0000 |
| commit | 867a5c68f0fd8a7f2d8b574b201c1f8f93016f6a (patch) | |
| tree | 807f4b8bf53d18f204cb1d182294d0ec13465e0c | |
| parent | a599713a7972528ca0336809f960a18974a6c924 (diff) | |
| parent | 0b5b52ab2e9e41bfa78b070593d9a9c83d5ac9c2 (diff) | |
| download | device_generic_car-867a5c68f0fd8a7f2d8b574b201c1f8f93016f6a.tar.gz device_generic_car-867a5c68f0fd8a7f2d8b574b201c1f8f93016f6a.tar.bz2 device_generic_car-867a5c68f0fd8a7f2d8b574b201c1f8f93016f6a.zip | |
Merge "Fixed audio service crash due to missing library." into rvc-dev am: 0b5b52ab2e
Change-Id: I02f8c171d326903abf2676ef4e8bc376c28d1c9f
| -rw-r--r-- | AndroidProducts.mk | 2 | ||||
| -rw-r--r-- | emulator/aosp_car_emulator.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 0270f3c..ae3ca08 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -27,3 +27,5 @@ COMMON_LUNCH_CHOICES := \ aosp_car_x86-userdebug \ aosp_car_x86_64-userdebug \ car_x86_64-userdebug \ + +EMULATOR_VENDOR_NO_SOUND_TRIGGER := true
\ No newline at end of file diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk index 04f9031..5011c97 100644 --- a/emulator/aosp_car_emulator.mk +++ b/emulator/aosp_car_emulator.mk @@ -15,5 +15,4 @@ $(call inherit-product, device/generic/car/common/car.mk) # This overrides device/generic/car/common/car.mk -$(call inherit-product, device/generic/car/emulator/audio/car_emulator_audio.mk) - +$(call inherit-product, device/generic/car/emulator/audio/car_emulator_audio.mk)
\ No newline at end of file |