am be0af1f7: Merge "Strip my_clang on assignment."
* commit 'be0af1f7fb4b4a52bf85f3be1e5b1e71ccfbc2c1':
Strip my_clang on assignment.
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/sdk.mk b/target/product/sdk.mk
index 2962fd2..04157e8 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -65,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