Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 635febc8 authored Oct 15, 2017 by Elliott Hughes Committed by android-build-merger Oct 15, 2017

Merge "external/svox is going away."

am: ff806ece

Change-Id: I1c3fa0d99c6cf53c6266e7c775addcbde56114f9

parents 9ecc0da2 ff806ece

target/product/full_base.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -48,9 +48,6 @@ PRODUCT_LOCALES := en_US
		# Get some sounds
		$(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.
		$(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk)

target/product/sdk_base.mk

+0 −8

Original line number	Diff line number	Diff line
		@@ -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, $(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
		# ensure this is the default locale.
		PRODUCT_LOCALES := \