Commit Graph

2352 Commits

Author SHA1 Message Date
The Android Automerger f245bf1c6e FRF75
Change-Id: Icb295f833bad1dd3fb6299e6dc1c68b6706830d8
2010-06-14 14:00:49 -07:00
The Android Automerger 700d5715e0 FRF72
Change-Id: Idc0551b59e3339ab1162bfa0f2f813cd7cf168f1
2010-06-11 11:47:22 -07:00
The Android Automerger 41cdb0732d Merge branch 'froyo' into froyo-release 2010-06-11 11:47:08 -07:00
The Android Automerger 61101d2956 FRF71
Change-Id: I54eda0b63a3ec32b48bbab80c29d3ead8462a3a0
2010-06-10 16:19:36 -07:00
The Android Automerger 7b91fac3c7 Merge branch 'froyo' into froyo-release 2010-06-10 16:19:15 -07:00
Ying Wang a07d37b793 Cherry-pick bug fixes from master.
1. Set correct aidl_preprocess_import for LOCAL_SDK_VERSION current.
2. Set correct PRIVATE_BOOTCLASSPATH for non-empty LOCAL_SDK_VERSION.

Change-Id: Iff8e266931434863521bfa4621767bed31d31cc0
2010-06-09 12:08:07 -07:00
Ying Wang 7a7942899e Merge "Unbundle the build system." into froyo 2010-06-09 11:31:29 -07:00
Ying Wang 0f6f4ca54e Unbundle the build system.
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
2010-06-09 10:26:26 -07:00
The Android Automerger 066933bbae FRF69C
Change-Id: Ied558c99dc92e0fdbf888e507cd8c35ac210b51e
2010-06-08 17:57:58 -07:00
The Android Automerger a0737f734f FRF69B
Change-Id: Ia90d822a9a271e729d3525c8aed6518746a118bf
2010-06-08 17:10:25 -07:00
The Android Automerger 469ffc607e Merge branch 'froyo' into froyo-release 2010-06-08 17:10:05 -07:00
The Android Automerger 626d7ae7d4 FRF69
Change-Id: Id46f5d68895e92ebb51047a608c7f779aeab7f46
2010-06-08 14:09:14 -07:00
Jeff Hamilton 04be0d869a Set JAVA_HOME to point to java 1.5.
Change-Id: I1304b78b17cd13a2231c59385a94e0430a8198ff
2010-06-08 15:38:47 -05:00
The Android Automerger 4117a8bf8a FRF68
Change-Id: Iafa754a31276d3658c45a424d86b9a73d6618fe1
2010-06-07 22:05:04 -07:00
The Android Automerger 4844bb5231 FRF64
Change-Id: I791a6e152fa97089042deeb0260ba70c8bf0eabc
2010-06-03 16:21:19 -07:00
The Android Automerger 819cc02d98 Merge branch 'froyo' into froyo-release 2010-06-03 16:21:06 -07:00
Ying Wang ba16a89dbd Override LOCAL_CERTIFICATE in inherit-package.
it's to fix typo.

Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
2010-06-02 13:24:36 -07:00
The Android Automerger 6279ceb8e6 FRF58
Change-Id: Id34e0594991501e259f6e3487e5f965bf397143e
2010-05-28 15:50:07 -07:00
The Android Automerger 7f9802b0c1 FRF57
Change-Id: I4ff4cac94816e9a5947fbe4956655665ef3669b3
2010-05-27 13:21:39 -07:00
Ying Wang 5291130983 Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
2010-05-26 13:39:31 -07:00
The Android Automerger b0de05ba3f FRF55
Change-Id: I1427e9b235a7a9116da2fa3b8b88317511409e4c
2010-05-25 21:23:40 -07:00
The Android Automerger 6d6d2c03db Merge branch 'froyo' into froyo-release 2010-05-25 21:23:29 -07:00
Xavier Ducrohet 8e5605a774 Add QuickSearchBox to the SDK build.
Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf
2010-05-25 17:03:42 -07:00
Scott Main ca671ab7a6 Revert "Doc change: Update froyo mark for home"
This reverts commit 9d1d6441d9.
2010-05-25 12:22:29 -07:00
The Android Automerger 73fa4725c9 FRF51
Change-Id: I14c23a70aba39001873862a33bbfae93d3f8af64
2010-05-21 12:59:19 -07:00
The Android Automerger fc073ec500 FRF50
Change-Id: Ie060d31c557cfce996f1d4c1d316d03af7d0bd67
2010-05-20 12:28:22 -07:00
The Android Automerger fd6bd8e76e Merge branch 'froyo' into froyo-release 2010-05-20 12:28:03 -07:00
Dirk Dougherty e9b01eb46d Doc change: add tv assets for carousel.
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
2010-05-19 19:42:12 -07:00
Dirk Dougherty 9d1d6441d9 Doc change: Update froyo mark for home
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
2010-05-19 18:25:33 -07:00
The Android Automerger 3c7f3afd4c FRF48
Change-Id: I8962097f15b656d8b3579c0ba921802341cf9274
2010-05-18 19:46:15 -07:00
The Android Automerger 15d9123ec1 FRF47B
Change-Id: If37080f70de84e166156cfa08c7d9f280fa20929
2010-05-17 17:38:14 -07:00
The Android Automerger 6f87136788 FRF47
Change-Id: Ic1b582bc9d7d67cffcaca1eefc67cfa3a41a64f6
2010-05-17 15:19:17 -07:00
The Android Automerger a10bf3242a FRF44
Change-Id: I9463c0ac1febf8088f655040816903ad8176405d
2010-05-14 12:12:31 -07:00
The Android Automerger 0c13675feb FRF42
Change-Id: Ief4e6ddd16774091121603cb6b167dfbe79b27f0
2010-05-12 19:53:35 -07:00
The Android Automerger d00884bac0 FRF41
Change-Id: I7aeb48a7f6a7af6d807a00905ffc3c57028e5880
2010-05-11 16:40:31 -07:00
The Android Automerger a1bb8cd4e0 FRF40
Change-Id: I318dee92db24bebe11234cea595b864eb7caac34
2010-05-10 18:12:11 -07:00
The Android Automerger 8b674a0471 Merge branch 'froyo' into froyo-release 2010-05-10 18:11:58 -07:00
Scott Main 3494d9b3de docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
2010-05-10 10:01:13 -07:00
Scott Main 3044d243c9 Merge "add froyo graphic for homepage and fix css bug" into froyo 2010-05-07 11:32:12 -07:00
The Android Automerger 57904900d9 FRF37
Change-Id: I6e5c40cb315e84fd9d21f64c2a21e071fb4db4b9
2010-05-07 10:58:05 -07:00
The Android Automerger 25d1ecfc02 FRF36
Change-Id: I659c91146118ae9cb8270cd96a45fb2b96041c3c
2010-05-06 17:55:18 -07:00
The Android Automerger 07b4d3f8b0 Merge branch 'froyo' into froyo-release 2010-05-06 17:55:05 -07:00
Dan Bornstein 03fb96f01e Allow for a slightly larger libwebcore, add another library to the list,
correct/update a couple entries, and add a couple more comments.

Bug: 2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
2010-05-06 12:43:47 -07:00
Scott Main ae98747d7c add froyo graphic for homepage and fix css bug
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
2010-05-06 11:43:08 -07:00
The Android Automerger cb1affafb7 FRF35
Change-Id: I6251d32cd9dcaefefd1bd7d35e33e6a3a9c92f04
2010-05-05 22:11:46 -07:00
The Android Automerger 86e0e78862 Merge branch 'froyo' into froyo-release 2010-05-05 22:11:33 -07:00
Ying Wang 4e601a46a6 Merge "Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk" into froyo-release 2010-05-05 14:50:04 -07:00
Dan Bornstein 3ca0e96a3a Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo 2010-05-05 14:36:04 -07:00
Dan Bornstein 7dfcfbc0d4 Fixed a bunch of stuff in the prelink mappings file:
* Added mappings for most of the libraries that didn't already
have them (as observed from my build).

* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.

* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).

* Added a bit of documentation about the whole deal.

Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.

Bug: 2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
2010-05-05 00:10:37 -07:00
Ying Wang 67bddace22 Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk
Change-Id: I733dd28a5df2542ba364095376c1ac033ef62bbd
http://b/issue?id=2650711
2010-05-04 17:24:28 -07:00