From 5c450ed169c9994bcec76bad1056c7f9c5f436cd Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Wed, 23 Sep 2009 17:31:16 -0700 Subject: [PATCH 1/6] Add NDK version reference to template. Change-Id: Ied94685e7c8dde2eab4f708d30cbf2757cea10d5 --- tools/droiddoc/templates-sdk/sdkpage.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index f1d69fb989..328eae139f 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -62,10 +62,10 @@

The Android NDK is a companion tool to the Android SDK that lets Android application developers build performance-critical portions of their apps in native code. It is designed for use only in conjunction with the -Android SDK, so if you have not already installed the Android 1.5 SDK, please do -so before downloading the NDK. Also, please read What is the -Android NDK? to get an understanding of what the NDK offers and whether it -will be useful to you.

+Android SDK, so if you have not already installed the latest Android SDK, please +do so before downloading the NDK. Also, please read What is +the Android NDK? to get an understanding of what the NDK offers and whether +it will be useful to you.

Select the download package that is appropriate for your development computer.

From 1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 29 Sep 2009 18:11:05 -0700 Subject: [PATCH 2/6] Remove kickback/talkback/soundback from SDK. These apps are not in the AOSP tree and cannot be part of the standard SDK build. They are available at http://code.google.com/p/eyes-free/ --- target/product/sdk.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/target/product/sdk.mk b/target/product/sdk.mk index a0d9add70a..d39f1ee073 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -25,10 +25,7 @@ PRODUCT_PACKAGES := \ libwnndict \ ApiDemos \ GestureBuilder \ - SoftKeyboard \ - talkback \ - soundback \ - kickback + SoftKeyboard PRODUCT_COPY_FILES := \ development/data/etc/vold.conf:system/etc/vold.conf From c18736b1a777c386dc3c5e3f878249770b5edd78 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Wed, 30 Sep 2009 09:20:32 -0700 Subject: [PATCH 3/6] remember device-specific releasetools extensions in target-files Store the location of the releasetools extensions in the target-files zip, and make ota_from_target_files use that stored location by default (though it can still be overridden with -s if desired). --- core/Makefile | 17 +++++++++-------- tools/releasetools/common.py | 2 +- tools/releasetools/ota_from_target_files | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/core/Makefile b/core/Makefile index db70d2f082..e70474809d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -814,6 +814,13 @@ $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools) $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION) +ifeq ($(TARGET_RELEASETOOLS_EXTENSIONS),) +# default to common dir for device vendor +$(BUILT_TARGET_FILES_PACKAGE): tool_extensions := $(TARGET_DEVICE_DIR)/../common +else +$(BUILT_TARGET_FILES_PACKAGE): tool_extensions := $(TARGET_RELEASETOOLS_EXTENSIONS) +endif + # Depending on the various images guarantees that the underlying # directories are up-to-date. $(BUILT_TARGET_FILES_PACKAGE): \ @@ -887,6 +894,7 @@ endif $(hide) echo "recovery $(call image-size-from-data-size,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))" >> $(zip_root)/META/imagesizes.txt $(hide) echo "system $(call image-size-from-data-size,$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))" >> $(zip_root)/META/imagesizes.txt $(hide) echo "userdata $(call image-size-from-data-size,$(BOARD_USERDATAIMAGE_PARTITION_SIZE))" >> $(zip_root)/META/imagesizes.txt + $(hide) echo "$(tool_extensions)" > $(zip_root)/META/tool-extensions.txt @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) @@ -909,13 +917,6 @@ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR) -ifeq ($(TARGET_RELEASETOOLS_EXTENSIONS),) -# default to common dir for device vendor -$(INTERNAL_OTA_PACKAGE_TARGET): extensions := $(TARGET_DEVICE_DIR)/../common -else -$(INTERNAL_OTA_PACKAGE_TARGET): extensions := $(TARGET_RELEASETOOLS_EXTENSIONS) -endif - ifeq ($(TARGET_OTA_SCRIPT_MODE),) # default to "auto" $(INTERNAL_OTA_PACKAGE_TARGET): scriptmode := auto @@ -926,7 +927,7 @@ endif $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools @echo "Package OTA: $@" $(hide) ./build/tools/releasetools/ota_from_target_files \ - -s $(extensions) -m $(scriptmode) \ + -m $(scriptmode) \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ $(BUILT_TARGET_FILES_PACKAGE) $@ diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index e758debd1d..27264dd796 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -440,7 +440,7 @@ class DeviceSpecificParams(object): if self.module is None: path = OPTIONS.device_specific - if path is None: return + if not path: return try: if os.path.isdir(path): info = imp.find_module("releasetools", [path]) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 299e60a88b..e719696867 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -57,6 +57,7 @@ if sys.hexversion < 0x02040000: sys.exit(1) import copy +import errno import os import re import sha @@ -855,6 +856,23 @@ def main(argv): print "unzipping target target-files..." OPTIONS.input_tmp = common.UnzipTemp(args[0]) + if OPTIONS.device_specific is None: + # look for the device-specific tools extension location in the input + try: + f = open(os.path.join(OPTIONS.input_tmp, "META", "tool-extensions.txt")) + ds = f.read().strip() + f.close() + if ds: + ds = os.path.normpath(ds) + print "using device-specific extensions in", ds + OPTIONS.device_specific = ds + except IOError, e: + if e.errno == errno.ENOENT: + # nothing specified in the file + pass + else: + raise + common.LoadMaxSizes() if not OPTIONS.max_image_size: print From e3f5cd4a25390db818847be277e25ed494e3b885 Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Wed, 30 Sep 2009 12:25:55 -0700 Subject: [PATCH 4/6] Clean steps for a product configuration change. Cleans up intermediates produced for a prebuilt app included in some product configurations. --- cleanspec.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cleanspec.mk b/cleanspec.mk index 8def002060..43d36303fa 100644 --- a/cleanspec.mk +++ b/cleanspec.mk @@ -90,6 +90,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhardware_le $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/system/app/Launcher.apk) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/bluetooth/) $(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) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST From 962d468d734108880521c6ae58560a00519297e7 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Wed, 30 Sep 2009 14:37:32 -0700 Subject: [PATCH 5/6] revise the deprecated warning to use the 'caution' style and add a line break --- tools/droiddoc/templates/macros.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/droiddoc/templates/macros.cs b/tools/droiddoc/templates/macros.cs index 6ee9701daf..8675b5b505 100644 --- a/tools/droiddoc/templates/macros.cs +++ b/tools/droiddoc/templates/macros.cs @@ -98,8 +98,8 @@ def:short_descr(obj) ?>

-

- +

Date: Wed, 30 Sep 2009 17:20:11 -0700 Subject: [PATCH 6/6] Add assets from all density to the SDK system image. Change-Id: I57500a81607edf04337f0a0a75077c00d6d17274 --- target/product/sdk.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 25cb2360ba..210bd9c8b7 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -38,6 +38,9 @@ PRODUCT_BRAND := generic PRODUCT_NAME := sdk PRODUCT_DEVICE := generic PRODUCT_LOCALES := \ + ldpi \ + hdpi \ + mdpi \ en_US \ en_GB \ en_CA \