Merge branch 'addond-v3' into 'rho'

Add talkback

See merge request MindTheGapps/vendor_gapps!6

arm/Android.bp

@@ -17,6 +17,17 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "GoogleTTS",
+	owner: "gapps",
+	apk: "proprietary/product/app/GoogleTTS/GoogleTTS.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
 android_app_import {
 	name: "MarkupGoogle",
 	owner: "gapps",
@@ -28,6 +39,17 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "talkback",
+	owner: "gapps",
+	apk: "proprietary/product/app/talkback/talkback.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
 android_app_import {
 	name: "SetupWizardPrebuilt",
 	owner: "gapps",

arm/arm-vendor.mk

@@ -16,7 +16,9 @@ PRODUCT_COPY_FILES += \
     vendor/gapps/arm/proprietary/product/app/MarkupGoogle/lib/arm/libsketchology_native.so:$(TARGET_COPY_OUT_PRODUCT)/app/MarkupGoogle/lib/arm/libsketchology_native.so
 
 PRODUCT_PACKAGES += \
+    GoogleTTS \
     MarkupGoogle \
+    talkback \
     SetupWizardPrebuilt \
     Velvet
 endif

arm64/Android.bp

@@ -17,6 +17,17 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "GoogleTTS",
+	owner: "gapps",
+	apk: "proprietary/product/app/GoogleTTS/GoogleTTS.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
 android_app_import {
 	name: "MarkupGoogle",
 	owner: "gapps",
@@ -28,6 +39,17 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "talkback",
+	owner: "gapps",
+	apk: "proprietary/product/app/talkback/talkback.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
 android_app_import {
 	name: "SetupWizardPrebuilt",
 	owner: "gapps",

arm64/arm64-vendor.mk

@@ -17,7 +17,9 @@ PRODUCT_COPY_FILES += \
     vendor/gapps/arm64/proprietary/product/app/MarkupGoogle/lib/arm64/libsketchology_native.so:$(TARGET_COPY_OUT_PRODUCT)/app/MarkupGoogle/lib/arm64/libsketchology_native.so
 
 PRODUCT_PACKAGES += \
+    GoogleTTS \
     MarkupGoogle \
+    talkback \
     SetupWizardPrebuilt \
     Velvet
 endif

build/meta/com/google/android/update-binary

@@ -95,7 +95,9 @@ compute_apps_size() {
 
 remove_big_optional_apps() {
   ui_print "Low resource device detected, removing large extras"
+  rm -rf product/app/GoogleTTS
   rm -rf product/app/MarkupGoogle
+  rm -rf product/app/talkback
   rm -rf product/priv-app/AndroidMigratePrebuilt
   rm -rf product/priv-app/SetupWizardPrebuilt
   rm -rf product/priv-app/Velvet

proprietary-files-arm-nongrouper.txt

@@ -1,4 +1,6 @@
+-product/app/GoogleTTS/GoogleTTS.apk;PRESIGNED|a97434b91c0a6fd725311c80910bf70846bda7bf
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-product/app/talkback/talkback.apk;PRESIGNED|1ac672a6d0201b8b26304c18616d738b5ba2c56e
 -product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|77dbc6656fc920e0d89b9ac8cffdd60250a45ff0
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|29900224869ef94c1fffa1cab31bc8260d86a736
 product/app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db

proprietary-files-arm64-nongrouper.txt

@@ -1,4 +1,6 @@
+-product/app/GoogleTTS/GoogleTTS.apk;PRESIGNED|bebab759e59f6c3fe42e71e0bd7556c4b303c041
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-product/app/talkback/talkback.apk;PRESIGNED|06b2ef653ebe999b46417cc7d2f97c7317350259
 -product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|074346bfb2128d64049b373e447837a300a4054f
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|d6321f135f7f0f503d37bb1ee3f8c1dbae6d2b9c
 product/app/MarkupGoogle/lib/arm64/libsketchology_native.so|5c55b4d32beeeca04b4e9f4ce1a2cd3e15a32c8c