Merge ""Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function is in a system header file. If so, the function can be prefixed by "rs". Otherwise, "rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking."
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 3fa5463..f2f8e33 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -54,6 +54,8 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/core/main.mk b/core/main.mk
index 8172b22..9efdc5d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -474,7 +474,7 @@
# Before we go and include all of the module makefiles, stash away
# the PRODUCT_* values so you can't get to them.
-stash_product_vars:=#true
+stash_product_vars:=true
ifeq ($(stash_product_vars),true)
$(call stash-product-vars, __STASHED, DO_NOT_USE_IN_ANDROID_MK_)
endif
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 771c0fd..557f791 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -156,7 +156,6 @@
installd \
ip \
iptables \
- ip-up-vpn \
iself \
isprelinked \
jarjar \
@@ -208,14 +207,6 @@
libcamerastub \
libc_common \
libchromium_net \
- libclangAnalysis \
- libclangAST \
- libclangBasic \
- libclangCodeGen \
- libclangIndex \
- libclangLex \
- libclangParse \
- libclangSema \
libc_nomalloc \
libctest \
libcutils \
diff --git a/target/product/core.mk b/target/product/core.mk
index a4f8318..7e295be 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -41,6 +41,7 @@
framework-res \
hprof-conv \
icu.dat \
+ ip-up-vpn \
jasmin \
jasmin.jar \
libcrypto \
diff --git a/target/product/full_no_telephony.mk b/target/product/full_no_telephony.mk
index cc497ef..735383a 100644
--- a/target/product/full_no_telephony.mk
+++ b/target/product/full_no_telephony.mk
@@ -40,3 +40,6 @@
# Get a list of languages.
$(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk)
+
+# Get the TTS language packs
+$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)