Merge change I04432db5 into eclair-mr2
* changes:
use aapt to build jar files instead of the system zip
diff --git a/cleanspec.mk b/cleanspec.mk
index 5a74a76..1387f07 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -92,7 +92,11 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sholes/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/com.amazon.mp3_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/com.amazon.mp3.apk)
-$(call add-clean-stop, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/core/main.mk b/core/main.mk
index e7f97f0..a07172d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -357,6 +357,7 @@
dalvik/tools/hprof-conv \
development/emulator/mksdcard \
development/tools/line_endings \
+ development/tools/sdklauncher \
development/host \
external/expat \
external/libpng \
@@ -390,6 +391,7 @@
development/tools/sdkstats \
development/tools/sdkmanager \
development/tools/mkstubs \
+ development/tools/layoutopt \
frameworks/base \
frameworks/base/tools/layoutlib \
external/googleclient \
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index fd41239..91755c9 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 := Eclair
+ PLATFORM_VERSION := 2.0
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 := Eclair
+ PLATFORM_VERSION_CODENAME := REL
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"