am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."
* commit '8330c4c5e6f8bb8b64e1b45ceed603b49853a086':
Apply LOCAL_CXX_STL to also prebuilts.
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 32979af..1e172ed 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
# which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string.
- PLATFORM_VERSION := 4.4.3.43.43.43
+ PLATFORM_VERSION := 4.4.3
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -59,7 +59,7 @@
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is the current development code-name, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
- PLATFORM_VERSION_CODENAME := AOSP
+ PLATFORM_VERSION_CODENAME := REL
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index c7b0520..059697e 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -22,6 +22,7 @@
PRODUCT_PACKAGES := \
libfwdlockengine \
OpenWnn \
+ PinyinIME \
libWnnEngDic \
libWnnJpnDic \
libwnndict \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 5882451..04157e8 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -33,6 +33,7 @@
libWnnJpnDic \
libwnndict \
TeleService \
+ PinyinIME \
Protips \
SoftKeyboard \
SystemUI \
@@ -64,7 +65,6 @@
Dialer
-
# Define the host tools and libs that are parts of the SDK.
-include sdk/build/product_sdk.mk
-include development/build/product_sdk.mk