diff options
| author | mincheli <mincheli@google.com> | 2023-10-23 18:33:41 +0800 |
|---|---|---|
| committer | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-31 06:17:07 +0000 |
| commit | 2d1201d13a52cdac3b3efd8b51ec4e7d9bc382ec (patch) | |
| tree | fd63ff6f5c9e69c1c0f2101b5a8bd488797b76b4 | |
| parent | d489eba3dc8fb24ba93679a72d968895a6c65439 (diff) | |
| download | gs101-2d1201d13a52cdac3b3efd8b51ec4e7d9bc382ec.tar.gz | |
gs101 includes TTS voice packs from gs-common/device.mk
And it removes the duplicated voice packs in gs101/tts
Bug: 140145973
Test: manual test
Change-Id: Id6cdf33e7670120e9e1f7cc39ecc9ff620fa8c9a
| -rw-r--r-- | device-common.mk | 1 | ||||
| -rw-r--r-- | tts/de-de/de-de-x-multi-r43.zvoice | bin | 13656899 -> 0 bytes | |||
| -rw-r--r-- | tts/es-es/es-es-x-multi-r43.zvoice | bin | 6980057 -> 0 bytes | |||
| -rw-r--r-- | tts/fr-fr/fr-fr-x-multi-r44.zvoice | bin | 15235885 -> 0 bytes | |||
| -rw-r--r-- | tts/it-it/it-it-x-multi-r40.zvoice | bin | 9236946 -> 0 bytes | |||
| -rw-r--r-- | tts/ja-jp/ja-jp-x-multi-r42.zvoice | bin | 23955700 -> 0 bytes | |||
| -rw-r--r-- | tts/voice_packs.mk | 22 |
7 files changed, 0 insertions, 23 deletions
diff --git a/device-common.mk b/device-common.mk index ef90ca1a..4c925e59 100644 --- a/device-common.mk +++ b/device-common.mk @@ -18,7 +18,6 @@ ifneq ($(BOARD_WITHOUT_RADIO),true) -include vendor/google_devices/gs101/proprietary/telephony/device-vendor.mk endif include device/google/gs101/device.mk -include device/google/gs101/tts/voice_packs.mk ifneq ($(BOARD_WITHOUT_RADIO),true) # Telephony diff --git a/tts/de-de/de-de-x-multi-r43.zvoice b/tts/de-de/de-de-x-multi-r43.zvoice Binary files differdeleted file mode 100644 index 5c3afdb9..00000000 --- a/tts/de-de/de-de-x-multi-r43.zvoice +++ /dev/null diff --git a/tts/es-es/es-es-x-multi-r43.zvoice b/tts/es-es/es-es-x-multi-r43.zvoice Binary files differdeleted file mode 100644 index 2cebf9fd..00000000 --- a/tts/es-es/es-es-x-multi-r43.zvoice +++ /dev/null diff --git a/tts/fr-fr/fr-fr-x-multi-r44.zvoice b/tts/fr-fr/fr-fr-x-multi-r44.zvoice Binary files differdeleted file mode 100644 index 7cf7f42a..00000000 --- a/tts/fr-fr/fr-fr-x-multi-r44.zvoice +++ /dev/null diff --git a/tts/it-it/it-it-x-multi-r40.zvoice b/tts/it-it/it-it-x-multi-r40.zvoice Binary files differdeleted file mode 100644 index fe10249c..00000000 --- a/tts/it-it/it-it-x-multi-r40.zvoice +++ /dev/null diff --git a/tts/ja-jp/ja-jp-x-multi-r42.zvoice b/tts/ja-jp/ja-jp-x-multi-r42.zvoice Binary files differdeleted file mode 100644 index 7225ef01..00000000 --- a/tts/ja-jp/ja-jp-x-multi-r42.zvoice +++ /dev/null diff --git a/tts/voice_packs.mk b/tts/voice_packs.mk deleted file mode 100644 index 395ffb17..00000000 --- a/tts/voice_packs.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2022 The Android Open-Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Voice packs for Text-To-Speech -PRODUCT_COPY_FILES += \ - device/google/gs101/tts/ja-jp/ja-jp-x-multi-r42.zvoice:product/tts/google/ja-jp/ja-jp-x-multi-r42.zvoice\ - device/google/gs101/tts/fr-fr/fr-fr-x-multi-r44.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r44.zvoice\ - device/google/gs101/tts/de-de/de-de-x-multi-r43.zvoice:product/tts/google/de-de/de-de-x-multi-r43.zvoice\ - device/google/gs101/tts/it-it/it-it-x-multi-r40.zvoice:product/tts/google/it-it/it-it-x-multi-r40.zvoice\ - device/google/gs101/tts/es-es/es-es-x-multi-r43.zvoice:product/tts/google/es-es/es-es-x-multi-r43.zvoice |