Merge "external/svox is going away." am: ff806ece8d am: 635febc86f am: 1a79b21385

am: 51ec0bda61

Change-Id: Ibbbf07abbd8d887bfc9f98a50550e4146de6e0a0
This commit is contained in:
Elliott Hughes
2017-10-15 04:25:26 +00:00
committed by android-build-merger
2 changed files with 0 additions and 11 deletions

View File

@@ -48,9 +48,6 @@ PRODUCT_LOCALES := en_US
# Get some sounds # Get some sounds
$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
# Get the TTS language packs
$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)
# Get a list of languages. # Get a list of languages.
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)

View File

@@ -119,14 +119,6 @@ $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
# include available languages for TTS in the system image
-include external/svox/pico/lang/PicoLangDeDeInSystem.mk
-include external/svox/pico/lang/PicoLangEnGBInSystem.mk
-include external/svox/pico/lang/PicoLangEnUsInSystem.mk
-include external/svox/pico/lang/PicoLangEsEsInSystem.mk
-include external/svox/pico/lang/PicoLangFrFrInSystem.mk
-include external/svox/pico/lang/PicoLangItItInSystem.mk
# locale. en_US is both first and in alphabetical order to # locale. en_US is both first and in alphabetical order to
# ensure this is the default locale. # ensure this is the default locale.
PRODUCT_LOCALES := \ PRODUCT_LOCALES := \