OSDN Git Service

android-x86/build.git
13 years agostore user-visible image sizes in target-files
Doug Zongker [Thu, 16 Sep 2010 18:28:43 +0000 (11:28 -0700)]
store user-visible image sizes in target-files

Do the yaffs-specific adjustments to image sizes in common.CheckSize,
instead of baking it into the image size stored in the target-files
package.  Remove the special fs_type flag and fold it into the
"info_dict" we have for saving key-value pairs from the build system.

Change-Id: I6e63f3330f6277d9a946b22e66cadeb51203ba14

13 years agoMerge "support for ext4/EMMC in target_files and OTA generation" into gingerbread
Doug Zongker [Thu, 16 Sep 2010 18:38:06 +0000 (11:38 -0700)]
Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread

13 years agosupport for ext4/EMMC in target_files and OTA generation
Doug Zongker [Thu, 1 Jul 2010 22:30:11 +0000 (15:30 -0700)]
support for ext4/EMMC in target_files and OTA generation

Move the image sizes into a more generic key-value file.  Make them
optional.  Add additional key/value pairs describing what kind of
filesystem the device uses.  Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.

Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.

Change-Id: Ic1c651f754ed00ba1cffe8cf56c43f7f3b0ebfd7

13 years agoMerge "DO NOT MERGE - These errors were missing from the list, which made it impossib...
Joe Onorato [Thu, 16 Sep 2010 18:17:37 +0000 (11:17 -0700)]
Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread

13 years agoDO NOT MERGE - These errors were missing from the list, which made it impossible...
Joe Onorato [Thu, 16 Sep 2010 18:16:51 +0000 (14:16 -0400)]
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.

Change-Id: I94652bad7084f3868049b4ea0e43bb90f86dba6f

13 years agoDon't increase partition size for ext4 user images. [DO NOT MERGE]
Ying Wang [Thu, 16 Sep 2010 17:54:03 +0000 (10:54 -0700)]
Don't increase partition size for ext4 user images. [DO NOT MERGE]

Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f

13 years agoDO NOT MERGE - Remove extra printf
Joe Onorato [Thu, 16 Sep 2010 16:34:07 +0000 (12:34 -0400)]
DO NOT MERGE - Remove extra printf

Change-Id: I8a2e4fac78010fe531b080d3555557e557c038b9

13 years agoMerge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Joe Onorato [Thu, 16 Sep 2010 16:02:54 +0000 (09:02 -0700)]
Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread

13 years agoMerge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Joe Onorato [Thu, 16 Sep 2010 16:02:17 +0000 (09:02 -0700)]
Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread

13 years agoDO NOT MERGE - Add a -knowntags option to droiddoc
Joe Onorato [Thu, 16 Sep 2010 15:57:42 +0000 (11:57 -0400)]
DO NOT MERGE - Add a -knowntags option to droiddoc

This lets us remove the special cases in Comment.java and specify additional
tags to not warn about for the big docs build.

Change-Id: I25ad651616f162919c56daa2d4bdf6333c9dd87d

13 years agoAllow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Joe Onorato [Thu, 16 Sep 2010 15:57:19 +0000 (11:57 -0400)]
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.

Change-Id: I568b416efe5ccefac6b5e6e99ddccc23600b1f74

13 years agoGrandfather the simulator-specific modules. do not merge.
Jean-Baptiste Queru [Thu, 16 Sep 2010 02:51:50 +0000 (19:51 -0700)]
Grandfather the simulator-specific modules. do not merge.

Those aren't new modules that were added recently, they just never got
considered when generating the original list of grandfathered modules

Change-Id: I0e6ff940936454048b59c0fc38e24e533e8598ae

13 years agoAdd a better explanation about how to deal with user modules
Jean-Baptiste Queru [Wed, 15 Sep 2010 20:59:29 +0000 (13:59 -0700)]
Add a better explanation about how to deal with user modules

Change-Id: Ib79cc0f4b47648daa18db97aa949cd167c8d44a9

13 years agoremove the system board name from the build fingerprint
Doug Zongker [Wed, 15 Sep 2010 20:02:12 +0000 (13:02 -0700)]
remove the system board name from the build fingerprint

Change-Id: I4cbbd03084b6ac24184b7475be3d34130094667d

13 years agoMerge "Allow devices without AndroidBoard.mk" into gingerbread
Jean-Baptiste Queru [Wed, 15 Sep 2010 19:54:56 +0000 (12:54 -0700)]
Merge "Allow devices without AndroidBoard.mk" into gingerbread

13 years agoAllow devices without AndroidBoard.mk
Jean-Baptiste Queru [Wed, 15 Sep 2010 18:59:33 +0000 (11:59 -0700)]
Allow devices without AndroidBoard.mk

A long time ago, Android.mk in devices had the same semantics
as the current AndroidBoard.mk. This eventually caused problems
(as it didn't allow having a true Android.mk there) so we switched,
and left an error behind in case people were still using the old
semantics (i.e. having an Android.mk but no AndroidBoard.mk).

Fast forward a few years to the present: we're finding that we want
to get rid of AndroidBoard.mk, so there are devices that will have
Android.mk but not AndroidBoard.mk. As this is becoming a legitimate
case, the error for it is removed, and the include for AndroidBoard.mk
is made optional.

Change-Id: Ic683419d4aaab122259715e0112660d2a6359e91

13 years agoMerge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Ying Wang [Wed, 15 Sep 2010 18:52:34 +0000 (11:52 -0700)]
Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread

13 years agoanother module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in

Change-Id: I37e0e0ae0056a2315e1102f79fd923143928f6fe

13 years agoanother module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in

Change-Id: Ibf24b4507b0c367117c33476a07d7189aeb3dff7

13 years agoanother module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in

Change-Id: I024ba177e6ca4745e38feb2395e57c46354c2eea

13 years agoChange "make PRODUCT-XXX-tests" to build only tests-build-target
Ying Wang [Tue, 14 Sep 2010 23:07:56 +0000 (16:07 -0700)]
Change "make PRODUCT-XXX-tests" to build only tests-build-target

Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a

13 years agoRevert "Default host module tag to optional."
Jean-Baptiste Queru [Tue, 14 Sep 2010 20:25:42 +0000 (13:25 -0700)]
Revert "Default host module tag to optional."

This reverts commit 528362f07460cfee42190e68ee2ffde4f08f0af4.

13 years agoFail the build when using a user tag on a non-legacy module. do not merge
Jean-Baptiste Queru [Tue, 14 Sep 2010 15:59:21 +0000 (08:59 -0700)]
Fail the build when using a user tag on a non-legacy module. do not merge

The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.

Change-Id: I67bef9a967576b77a5d6c298178f03c66722eb37

13 years agoRefine the comment.
Ying Wang [Tue, 14 Sep 2010 01:33:31 +0000 (18:33 -0700)]
Refine the comment.

The host tools include script as well as native binaries.

Change-Id: I8bdd62bf5117ac71e2607d2cb4cd7b08bcbe7b14

13 years agoAdd host modules needed by SDK build.
Ying Wang [Tue, 14 Sep 2010 01:11:11 +0000 (18:11 -0700)]
Add host modules needed by SDK build.

Since host module tag is defaulted to optional now, we have to explicitly
add those modules to the SDK product config file.

Change-Id: I8f6c4dcb17ef7716ae3590d6e96ddd5d07cc0582

13 years agoDefault host module tag to optional.
Ying Wang [Mon, 13 Sep 2010 21:56:15 +0000 (14:56 -0700)]
Default host module tag to optional.

Change-Id: I8ae572b368e7ecdcc8e5bb257bb2f6084b5fb508

13 years agomove File and Difference classes into common script
Doug Zongker [Sun, 12 Sep 2010 22:26:16 +0000 (15:26 -0700)]
move File and Difference classes into common script

This makes them accessible from device-specific extensions (so they
can be used to send radio images as binary patches, for instance).

Change-Id: I2f2174b93b4265abf9400f9e5a0982caca0771e9

13 years agoFix host-dexed libraries.
Ying Wang [Sat, 11 Sep 2010 01:38:10 +0000 (18:38 -0700)]
Fix host-dexed libraries.

With this change, host-dexed library A can have host-dexed library B in its LOCAL_JAVA_LIBRARIES.
Bug: 2992136

Change-Id: I794613d3230d4eb471a0566c325078da8fa38b86

13 years agoSupport to build host dex.
Ying Wang [Fri, 10 Sep 2010 23:19:24 +0000 (16:19 -0700)]
Support to build host dex.

Change-Id: I55df5e4051dbeb89a70d6d7b89fb6110f133d9d7

13 years agoDist userdataimg and tests-zip-package for tests builds
Ying Wang [Fri, 10 Sep 2010 21:39:33 +0000 (14:39 -0700)]
Dist userdataimg and tests-zip-package for tests builds

So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion

Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea

13 years agofix typo
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:28:41 +0000 (15:28 -0700)]
fix typo

Change-Id: If4acf972380a94b160a656f849c4106025d3e6b2

13 years agoa few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE

Change-Id: I6a2337bb557735276c93c306caac43a59abff47c

13 years agoa few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE

Change-Id: I5f4c9f9ac948c2ba6865eae7dca2c0ed4d10702b

13 years agoMerge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Dan Bornstein [Wed, 8 Sep 2010 19:37:11 +0000 (12:37 -0700)]
Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread

13 years agoa few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE

Change-Id: I7526ad40f27853a2f83bc0c4c4f80ff709fcaf40

13 years agoEnable WITH_HOST_DALVIK for "user" builds on Linux.
Dan Bornstein [Wed, 8 Sep 2010 00:45:44 +0000 (17:45 -0700)]
Enable WITH_HOST_DALVIK for "user" builds on Linux.

Bug: 2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5

13 years agoMerge "Warn when new modules are found that use user tags - DO NOT MERGE" into ginger...
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:22:48 +0000 (10:22 -0700)]
Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread

13 years agocleanspec for corrupted build.prop
Jean-Baptiste Queru [Tue, 7 Sep 2010 18:18:09 +0000 (11:18 -0700)]
cleanspec for corrupted build.prop

Change-Id: Ib8d6719af92759272ae25607862391647dfe408d

13 years agoRevert "Allow properties with spaces in their values"
Jean-Baptiste Queru [Tue, 7 Sep 2010 17:51:12 +0000 (10:51 -0700)]
Revert "Allow properties with spaces in their values"

This reverts commit de3bfade571033b01fbaccac2f0fdf7193e8d3ee.

13 years agoFix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Ying Wang [Tue, 7 Sep 2010 17:26:18 +0000 (10:26 -0700)]
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE

Cherry-pick from master.

Change-Id: I0a56e3e91efd53ad2671136b6fe00ee675f56230

13 years agoWarn when new modules are found that use user tags - DO NOT MERGE
Jean-Baptiste Queru [Fri, 3 Sep 2010 23:32:58 +0000 (16:32 -0700)]
Warn when new modules are found that use user tags - DO NOT MERGE

Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38

13 years agoMerge "return to using subprocess for running commands" into gingerbread
Doug Zongker [Fri, 3 Sep 2010 21:31:03 +0000 (14:31 -0700)]
Merge "return to using subprocess for running commands" into gingerbread

13 years agoreturn to using subprocess for running commands
Doug Zongker [Fri, 3 Sep 2010 21:15:34 +0000 (14:15 -0700)]
return to using subprocess for running commands

Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags
argument (it wasn't working before because it was getting one argument
"-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128"
and mkyaffs2image apparently just ignores that bogus argument?)

Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d

13 years agoremove remaining amend support
Doug Zongker [Wed, 21 Apr 2010 21:08:44 +0000 (14:08 -0700)]
remove remaining amend support

Remove the remaining (unused and untested) support for generating
amend scripts.  This means that you won't be able to OTA directly from
cupcake to gingerbread.

Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337

13 years agoMerge "The old clean target had bit rotted." into gingerbread
Joe Onorato [Fri, 3 Sep 2010 17:26:04 +0000 (10:26 -0700)]
Merge "The old clean target had bit rotted." into gingerbread

13 years agoThe old clean target had bit rotted.
Joe Onorato [Fri, 3 Sep 2010 17:25:11 +0000 (13:25 -0400)]
The old clean target had bit rotted.

Clean and clobber are now the same thing.

Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40

13 years agoFix inherited dependency when instrmentation.
Ying Wang [Thu, 2 Sep 2010 22:41:01 +0000 (15:41 -0700)]
Fix inherited dependency when instrmentation.

It turns out we should also LOCAL_INSTRUMENTATION_FOR.
To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR.

Bug: 2902591
Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1

13 years agoAllow properties with spaces in their values
Jean-Baptiste Queru [Thu, 2 Sep 2010 21:30:56 +0000 (14:30 -0700)]
Allow properties with spaces in their values

This way, such properties can be set in product definition files
instead of having to live in system.prop, which eliminates the need
for system.prop

Change-Id: I25d9665f65436df8215940e46380deb31b8161ba

13 years agoDisable new longjmp in glibc 2.11 and later.
Ying Wang [Wed, 1 Sep 2010 23:39:11 +0000 (16:39 -0700)]
Disable new longjmp in glibc 2.11 and later.

Bug: 2967937
Change-Id: I4e2a5f806ad45a01ca7f8c4d032cd29fce1d794d

13 years agofix the build still
Joe Onorato [Tue, 31 Aug 2010 19:56:49 +0000 (12:56 -0700)]
fix the build still

Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8

13 years agoDO NOT MERGE - Back port change from master that enforces correctness in the javadoc...
Joe Onorato [Tue, 31 Aug 2010 18:27:25 +0000 (11:27 -0700)]
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.

Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb

13 years agoCleanspec to make sure everything works consistently after turning off OpenCore.
Andreas Huber [Mon, 30 Aug 2010 21:17:14 +0000 (14:17 -0700)]
Cleanspec to make sure everything works consistently after turning off OpenCore.

Change-Id: Icf3ba66b8183e36247b4cfc623643e37f78d7144
related-to-bug: 2941153

13 years agoBuild without OpenCore by default, remove obsolete opt-in to stagefright.
Andreas Huber [Mon, 30 Aug 2010 19:48:03 +0000 (12:48 -0700)]
Build without OpenCore by default, remove obsolete opt-in to stagefright.

Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug: 2941153

13 years agoRefactor a bit.
Ying Wang [Thu, 26 Aug 2010 23:04:09 +0000 (16:04 -0700)]
Refactor a bit.

Change-Id: I4573e7a5239536f49571d9222865e2526da573c8

13 years agoTry to fix system.img in update zip file.
Ying Wang [Thu, 26 Aug 2010 21:01:50 +0000 (14:01 -0700)]
Try to fix system.img in update zip file.

Change-Id: Ic4f1c7478a22b1f8134ac768904e437fcfea700a

13 years agoFix mkyaffs2image extra flags in the release tools.
Ying Wang [Thu, 26 Aug 2010 03:39:41 +0000 (20:39 -0700)]
Fix mkyaffs2image extra flags in the release tools.

Change-Id: I806e3e85ef89941edf04352331e25730c491c470

13 years agoDisable building OTA package if there is no kernel.
Ying Wang [Wed, 25 Aug 2010 23:06:06 +0000 (16:06 -0700)]
Disable building OTA package if there is no kernel.

Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb

13 years agoShow command lines run by releasetools.
Ying Wang [Wed, 25 Aug 2010 22:23:21 +0000 (15:23 -0700)]
Show command lines run by releasetools.

Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309

13 years agoFix mkbootimg parameters for releasetools.
Ying Wang [Wed, 25 Aug 2010 21:29:34 +0000 (14:29 -0700)]
Fix mkbootimg parameters for releasetools.

Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3

13 years agoMerge "DO NOT MERGE: Fix the build by ignoring directories that don't exist." into...
Bill Napier [Wed, 25 Aug 2010 17:00:59 +0000 (10:00 -0700)]
Merge "DO NOT MERGE: Fix the build by ignoring directories that don't exist." into gingerbread

13 years agoDO NOT MERGE: Fix the build by ignoring directories that don't exist.
Bill Napier [Wed, 25 Aug 2010 16:59:14 +0000 (09:59 -0700)]
DO NOT MERGE: Fix the build by ignoring directories that don't exist.

Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3

13 years agoMerge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
Ying Wang [Wed, 25 Aug 2010 16:32:00 +0000 (09:32 -0700)]
Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread

13 years agoMerge "Add support for multiple html directories to droiddoc." into gingerbread
Rohit Mungee [Wed, 25 Aug 2010 05:58:30 +0000 (22:58 -0700)]
Merge "Add support for multiple html directories to droiddoc." into gingerbread

13 years agoAdd support for multiple html directories to droiddoc.
Bill Napier [Wed, 25 Aug 2010 05:16:01 +0000 (22:16 -0700)]
Add support for multiple html directories to droiddoc.

The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.

Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33

13 years agoLink against Mac OSX 10.5 SDK if building on 10.6.
Ying Wang [Wed, 25 Aug 2010 01:33:22 +0000 (18:33 -0700)]
Link against Mac OSX 10.5 SDK if building on 10.6.

So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).

Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5

13 years agoDisable CheckSize on ext partitions to fix build [DO NOT MERGE]
Ying Wang [Tue, 24 Aug 2010 18:18:07 +0000 (11:18 -0700)]
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]

Original CL: 59920

Change-Id: I81437996670a61e10284293d25a08da8907ad296

13 years agomerge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:07:41 +0000 (19:07 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Change-Id: Ic1040aa7e00cdc01af2f2cb4c741bafe4936904c

13 years agoPass pagesize to makebootimage.
Ying Wang [Mon, 23 Aug 2010 19:56:25 +0000 (12:56 -0700)]
Pass pagesize to makebootimage.

Change-Id: I719d765245469921de105430fdd92d478ea48e82

13 years agoBackport ext4 support from master [DO NOT MERGE]
Ying Wang [Mon, 23 Aug 2010 18:34:40 +0000 (11:34 -0700)]
Backport ext4 support from master [DO NOT MERGE]

ext4 support is needed by crespo.

Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9

13 years agoRestore OTA for crespo. [DO NOT MERGE]
Ying Wang [Sat, 21 Aug 2010 23:49:07 +0000 (16:49 -0700)]
Restore OTA for crespo. [DO NOT MERGE]

Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3

13 years agoBetter way to disable OTAs for crespo - DO NOT MERGE
Jean-Baptiste Queru [Sat, 21 Aug 2010 02:19:00 +0000 (19:19 -0700)]
Better way to disable OTAs for crespo - DO NOT MERGE

OTAs need to be disabled for all products using crespo
hardware, not just a single one.

Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab

13 years agoDisable OTA for crespo [DO NOT MERGE]
Ying Wang [Fri, 20 Aug 2010 23:45:19 +0000 (16:45 -0700)]
Disable OTA for crespo [DO NOT MERGE]

Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f

13 years agoFRG51
android-build SharedAccount [Fri, 20 Aug 2010 16:21:16 +0000 (09:21 -0700)]
FRG51

Change-Id: Ifa272e3b63d85a5b25a43e3869fea4e62ea0d037

13 years agoFRG49
android-build SharedAccount [Wed, 18 Aug 2010 21:38:05 +0000 (14:38 -0700)]
FRG49

Change-Id: Ibf2fb1a5f077bda95006ffcccf3208ac53a4835d

13 years agoam 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 15:45:04 +0000 (08:45 -0700)]
am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release

Merge commit '817a8ac99392228f894d18ea40b0fb4c1b6ca8fe' into gingerbread

* commit '817a8ac99392228f894d18ea40b0fb4c1b6ca8fe':
  bump version from 2.2 to 2.2.1 for next froyo release

13 years agobump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release

Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f

13 years agobump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release

Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f

13 years agoFRG22D
android-build SharedAccount [Fri, 13 Aug 2010 18:49:07 +0000 (11:49 -0700)]
FRG22D

Change-Id: Ia5abcd21305a9ee7f646023401e59cb5bb35c700

13 years agoFRG22C
android-build SharedAccount [Wed, 11 Aug 2010 19:23:53 +0000 (12:23 -0700)]
FRG22C

Change-Id: I222497bad7b4eff02a05393678b2e07fc260c55a

13 years agoFRG22B
android-build SharedAccount [Wed, 11 Aug 2010 05:04:39 +0000 (22:04 -0700)]
FRG22B

Change-Id: I0e01dccb378cec768ea51e1454b1c50c8a1a7b75

13 years agoMake ProGuard keep necessary members for serializable classes
Hung-ying Tyan [Tue, 10 Aug 2010 09:50:25 +0000 (17:50 +0800)]
Make ProGuard keep necessary members for serializable classes

Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193

13 years agoMerge "Add voip(SIP related codes) into framework." into gingerbread
Chung-yih Wang [Fri, 6 Aug 2010 02:35:35 +0000 (19:35 -0700)]
Merge "Add voip(SIP related codes) into framework." into gingerbread

13 years agoam 4f2436dc: update carousel icon for nexus one dev phone
Scott Main [Thu, 5 Aug 2010 22:10:05 +0000 (15:10 -0700)]
am 4f2436dc: update carousel icon for nexus one dev phone

Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread

* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
  update carousel icon for nexus one dev phone

13 years agoam 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Scott Main [Thu, 5 Aug 2010 22:10:03 +0000 (15:10 -0700)]
am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo

Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread

* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
  Doc change: Add nexus one to dev phones image.

13 years agoupdate carousel icon for nexus one dev phone
Scott Main [Thu, 5 Aug 2010 16:44:47 +0000 (09:44 -0700)]
update carousel icon for nexus one dev phone

Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6

13 years agoMerge "Doc change: Add nexus one to dev phones image." into froyo
Scott Main [Thu, 5 Aug 2010 15:05:37 +0000 (08:05 -0700)]
Merge "Doc change: Add nexus one to dev phones image." into froyo

13 years agoTracking merge of dalvik-dev to gingerbread
Brian Carlstrom [Thu, 5 Aug 2010 06:17:47 +0000 (23:17 -0700)]
Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd36b12054ac73992a2737ea294387116
git cherry-pick --no-commit d05d74b2d6f717ee25ca14c913ea7610c030ecd1
git cherry-pick --no-commit 5479d77e320420ef0cd7250d1a6729839ef907ce

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c

13 years agoAdd voip(SIP related codes) into framework.
Chung-yih Wang [Thu, 5 Aug 2010 03:31:07 +0000 (11:31 +0800)]
Add voip(SIP related codes) into framework.

Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629

13 years ago33b special
android-build SharedAccount [Wed, 4 Aug 2010 05:24:15 +0000 (22:24 -0700)]
33b special

Change-Id: I025cf8d2db61752e6816a3ca726445fd869bbc57

13 years agoFRG33
android-build SharedAccount [Mon, 2 Aug 2010 21:03:32 +0000 (14:03 -0700)]
FRG33

Change-Id: I04cafed766813daf17316651bf5403c3e4823a74

13 years agoam 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Ying Wang [Thu, 29 Jul 2010 17:27:45 +0000 (10:27 -0700)]
am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo

Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
  Dist apkcerts.txt for unbundled builds

13 years agoMerge "Dist apkcerts.txt for unbundled builds" into froyo
Ying Wang [Thu, 29 Jul 2010 17:21:15 +0000 (10:21 -0700)]
Merge "Dist apkcerts.txt for unbundled builds" into froyo

13 years agoam 3a0576a4: merge from open-source froyo
The Android Open Source Project [Wed, 28 Jul 2010 18:35:24 +0000 (11:35 -0700)]
am 3a0576a4: merge from open-source froyo

Merge commit '3a0576a41881ceb11c3b11642666abc2f3d5a271' into gingerbread

* commit '3a0576a41881ceb11c3b11642666abc2f3d5a271':

13 years agomerge from open-source froyo
The Android Open Source Project [Wed, 28 Jul 2010 18:24:38 +0000 (11:24 -0700)]
merge from open-source froyo

Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f

13 years agoreconcile forked froyos
The Android Open Source Project [Wed, 28 Jul 2010 17:40:27 +0000 (10:40 -0700)]
reconcile forked froyos

Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7

13 years agoam af44485f: merge from open-source froyo
The Android Open Source Project [Mon, 26 Jul 2010 19:06:35 +0000 (12:06 -0700)]
am af44485f: merge from open-source froyo

Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
  Include Test Case List from CTS Project

13 years agomerge from open-source froyo
The Android Open Source Project [Mon, 26 Jul 2010 19:02:01 +0000 (12:02 -0700)]
merge from open-source froyo

Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa

13 years agoDist apkcerts.txt for unbundled builds
Ying Wang [Fri, 23 Jul 2010 23:42:13 +0000 (16:42 -0700)]
Dist apkcerts.txt for unbundled builds

Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7

13 years agoDoc change: Add nexus one to dev phones image.
Dirk Dougherty [Fri, 23 Jul 2010 21:00:22 +0000 (14:00 -0700)]
Doc change: Add nexus one to dev phones image.

Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02

13 years agoresolved conflicts for merge of 121a7873 to gingerbread
Evan Charlton [Fri, 23 Jul 2010 19:21:48 +0000 (12:21 -0700)]
resolved conflicts for merge of 121a7873 to gingerbread

Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e