git.osdn.net Git - android-x86/build.git/log

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

commit | commitdiff | tree

Ying Wang [Wed, 9 Jun 2010 18:31:29 +0000 (11:31 -0700)]

Merge "Unbundle the build system." into froyo

commit | commitdiff | tree

Ying Wang [Wed, 9 Jun 2010 17:26:26 +0000 (10:26 -0700)]

Unbundle the build system.

Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0

commit | commitdiff | tree

The Android Automerger [Wed, 9 Jun 2010 00:57:58 +0000 (17:57 -0700)]

FRF69C

Change-Id: Ied558c99dc92e0fdbf888e507cd8c35ac210b51e

commit | commitdiff | tree

The Android Automerger [Wed, 9 Jun 2010 00:10:25 +0000 (17:10 -0700)]

FRF69B

Change-Id: Ia90d822a9a271e729d3525c8aed6518746a118bf

commit | commitdiff | tree

The Android Automerger [Wed, 9 Jun 2010 00:10:05 +0000 (17:10 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

The Android Automerger [Tue, 8 Jun 2010 21:09:14 +0000 (14:09 -0700)]

FRF69

Change-Id: Id46f5d68895e92ebb51047a608c7f779aeab7f46

commit | commitdiff | tree

Jeff Hamilton [Mon, 7 Jun 2010 20:03:54 +0000 (15:03 -0500)]

Set JAVA_HOME to point to java 1.5.

Change-Id: I1304b78b17cd13a2231c59385a94e0430a8198ff

commit | commitdiff | tree

The Android Automerger [Tue, 8 Jun 2010 05:05:04 +0000 (22:05 -0700)]

FRF68

Change-Id: Iafa754a31276d3658c45a424d86b9a73d6618fe1

commit | commitdiff | tree

The Android Automerger [Thu, 3 Jun 2010 23:21:19 +0000 (16:21 -0700)]

FRF64

Change-Id: I791a6e152fa97089042deeb0260ba70c8bf0eabc

commit | commitdiff | tree

The Android Automerger [Thu, 3 Jun 2010 23:21:06 +0000 (16:21 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Ying Wang [Wed, 2 Jun 2010 20:24:36 +0000 (13:24 -0700)]

Override LOCAL_CERTIFICATE in inherit-package.

it's to fix typo.

Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723

commit | commitdiff | tree

The Android Automerger [Fri, 28 May 2010 22:50:07 +0000 (15:50 -0700)]

FRF58

Change-Id: Id34e0594991501e259f6e3487e5f965bf397143e

commit | commitdiff | tree

The Android Automerger [Thu, 27 May 2010 20:21:39 +0000 (13:21 -0700)]

FRF57

Change-Id: I4ff4cac94816e9a5947fbe4956655665ef3669b3

commit | commitdiff | tree

Ying Wang [Wed, 26 May 2010 20:13:56 +0000 (13:13 -0700)]

Cherry-pick unbundled build changes from master

Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92

commit | commitdiff | tree

The Android Automerger [Wed, 26 May 2010 04:23:40 +0000 (21:23 -0700)]

FRF55

Change-Id: I1427e9b235a7a9116da2fa3b8b88317511409e4c

commit | commitdiff | tree

The Android Automerger [Wed, 26 May 2010 04:23:29 +0000 (21:23 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Xavier Ducrohet [Wed, 26 May 2010 00:03:07 +0000 (17:03 -0700)]

Add QuickSearchBox to the SDK build.

Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf

commit | commitdiff | tree

Scott Main [Tue, 25 May 2010 19:22:29 +0000 (12:22 -0700)]

Revert "Doc change: Update froyo mark for home"

This reverts commit 9d1d6441d97eeea80c70c549646d7c177936e148.

commit | commitdiff | tree

The Android Automerger [Fri, 21 May 2010 19:59:19 +0000 (12:59 -0700)]

FRF51

Change-Id: I14c23a70aba39001873862a33bbfae93d3f8af64

commit | commitdiff | tree

The Android Automerger [Thu, 20 May 2010 19:28:22 +0000 (12:28 -0700)]

FRF50

Change-Id: Ie060d31c557cfce996f1d4c1d316d03af7d0bd67

commit | commitdiff | tree

The Android Automerger [Thu, 20 May 2010 19:28:03 +0000 (12:28 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Dirk Dougherty [Wed, 19 May 2010 05:12:23 +0000 (22:12 -0700)]

Doc change: add tv assets for carousel.

Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc

commit | commitdiff | tree

Dirk Dougherty [Thu, 20 May 2010 01:25:33 +0000 (18:25 -0700)]

Doc change: Update froyo mark for home

Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6

commit | commitdiff | tree

The Android Automerger [Wed, 19 May 2010 02:46:15 +0000 (19:46 -0700)]

FRF48

Change-Id: I8962097f15b656d8b3579c0ba921802341cf9274

commit | commitdiff | tree

The Android Automerger [Tue, 18 May 2010 00:38:14 +0000 (17:38 -0700)]

FRF47B

Change-Id: If37080f70de84e166156cfa08c7d9f280fa20929

commit | commitdiff | tree

The Android Automerger [Mon, 17 May 2010 22:19:17 +0000 (15:19 -0700)]

FRF47

Change-Id: Ic1b582bc9d7d67cffcaca1eefc67cfa3a41a64f6

commit | commitdiff | tree

The Android Automerger [Fri, 14 May 2010 19:12:31 +0000 (12:12 -0700)]

FRF44

Change-Id: I9463c0ac1febf8088f655040816903ad8176405d

commit | commitdiff | tree

The Android Automerger [Thu, 13 May 2010 02:53:35 +0000 (19:53 -0700)]

FRF42

Change-Id: Ief4e6ddd16774091121603cb6b167dfbe79b27f0

commit | commitdiff | tree

The Android Automerger [Tue, 11 May 2010 23:40:31 +0000 (16:40 -0700)]

FRF41

Change-Id: I7aeb48a7f6a7af6d807a00905ffc3c57028e5880

commit | commitdiff | tree

The Android Automerger [Tue, 11 May 2010 01:12:11 +0000 (18:12 -0700)]

FRF40

Change-Id: I318dee92db24bebe11234cea595b864eb7caac34

commit | commitdiff | tree

The Android Automerger [Tue, 11 May 2010 01:11:58 +0000 (18:11 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Scott Main [Mon, 10 May 2010 15:18:26 +0000 (08:18 -0700)]

docs: lighten the "new" red. softens the effect and makes it more legible when selected

Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35

commit | commitdiff | tree

Scott Main [Fri, 7 May 2010 18:32:12 +0000 (11:32 -0700)]

Merge "add froyo graphic for homepage and fix css bug" into froyo

commit | commitdiff | tree

The Android Automerger [Fri, 7 May 2010 17:58:05 +0000 (10:58 -0700)]

FRF37

Change-Id: I6e5c40cb315e84fd9d21f64c2a21e071fb4db4b9

commit | commitdiff | tree

The Android Automerger [Fri, 7 May 2010 00:55:18 +0000 (17:55 -0700)]

FRF36

Change-Id: I659c91146118ae9cb8270cd96a45fb2b96041c3c

commit | commitdiff | tree

The Android Automerger [Fri, 7 May 2010 00:55:05 +0000 (17:55 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Dan Bornstein [Thu, 6 May 2010 02:33:47 +0000 (19:33 -0700)]

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

commit | commitdiff | tree

Scott Main [Thu, 6 May 2010 18:43:08 +0000 (11:43 -0700)]

add froyo graphic for homepage and fix css bug

Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db

commit | commitdiff | tree

The Android Automerger [Thu, 6 May 2010 05:11:46 +0000 (22:11 -0700)]

FRF35

Change-Id: I6251d32cd9dcaefefd1bd7d35e33e6a3a9c92f04

commit | commitdiff | tree

The Android Automerger [Thu, 6 May 2010 05:11:33 +0000 (22:11 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Ying Wang [Wed, 5 May 2010 21:50:04 +0000 (14:50 -0700)]

Merge "Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk" into froyo-release

commit | commitdiff | tree

Dan Bornstein [Wed, 5 May 2010 21:36:04 +0000 (14:36 -0700)]

Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo

commit | commitdiff | tree

Dan Bornstein [Mon, 3 May 2010 22:15:57 +0000 (15:15 -0700)]

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

commit | commitdiff | tree

Ying Wang [Tue, 4 May 2010 23:37:33 +0000 (16:37 -0700)]

Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk

Change-Id: I733dd28a5df2542ba364095376c1ac033ef62bbd
http://b/issue?id=2650711

commit | commitdiff | tree

Scott Main [Wed, 5 May 2010 00:24:26 +0000 (17:24 -0700)]

fix css bug for paragraphs in table cells
- only select the direct descendant for p:last-child in a td

Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649

commit | commitdiff | tree

android-build SharedAccount [Mon, 3 May 2010 22:15:03 +0000 (15:15 -0700)]

FRF33B

Change-Id: I43e4e71d977ff530cc36565a0450edded231a34b

commit | commitdiff | tree

The Android Automerger [Mon, 3 May 2010 15:10:21 +0000 (08:10 -0700)]

FRF33

Change-Id: I7991b820eb9ef0671dbbef2729dbfc3efd21e3af

commit | commitdiff | tree

The Android Automerger [Mon, 3 May 2010 15:10:08 +0000 (08:10 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

android-build SharedAccount [Fri, 30 Apr 2010 01:00:16 +0000 (18:00 -0700)]

FRF29B

Change-Id: Ib1d0b8236ef81f4c4e2fa4b97ed9be776b5602d1

commit | commitdiff | tree

The Android Automerger [Thu, 29 Apr 2010 20:34:27 +0000 (13:34 -0700)]

FRF29

Change-Id: I420d44a306f38461d0443142ce1ee0ea426d5cc0

commit | commitdiff | tree

Doug Zongker [Wed, 28 Apr 2010 23:05:21 +0000 (16:05 -0700)]

add metadata to OTA package in easily-parsed form

This is only for use by the tools that manipulate OTA packages; it
doesn't touch device code.

Change-Id: I1e21b24b86340d8f86c9d15b2aeb79c461f75d18

commit | commitdiff | tree

The Android Automerger [Wed, 28 Apr 2010 19:21:35 +0000 (12:21 -0700)]

FRF28

Change-Id: I73b82507a9c4bd71e678771c9e0135806617857a

commit | commitdiff | tree

The Android Automerger [Wed, 28 Apr 2010 19:21:08 +0000 (12:21 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Scott Main [Tue, 27 Apr 2010 21:23:04 +0000 (14:23 -0700)]

Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo

commit | commitdiff | tree

The Android Automerger [Mon, 26 Apr 2010 18:45:10 +0000 (11:45 -0700)]

FRF26

Change-Id: Ia56baf9d3ec4d1836cc41b13841ad7d5299cdb87

commit | commitdiff | tree

The Android Automerger [Mon, 26 Apr 2010 18:44:47 +0000 (11:44 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

android-build SharedAccount [Fri, 23 Apr 2010 22:00:19 +0000 (15:00 -0700)]

FRF23B

Change-Id: Ieac192af4ede1c43949e9a25825382a8f5cc4b38

commit | commitdiff | tree

Raphael [Sat, 17 Apr 2010 00:50:09 +0000 (17:50 -0700)]

Support building Windows SDK under Linux.

- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

(Merge master Change I9d08d0df)

commit | commitdiff | tree

Raphael [Wed, 14 Apr 2010 19:19:12 +0000 (12:19 -0700)]

Make zipalign build for the Win SDK under Linux.

(Merge master Change Ibd667437)

commit | commitdiff | tree

The Android Automerger [Fri, 23 Apr 2010 18:55:17 +0000 (11:55 -0700)]

FRF23

Change-Id: I11369ad3f740a7f32924666a2be2d2324892d468

commit | commitdiff | tree

Scott Main [Fri, 23 Apr 2010 18:41:30 +0000 (11:41 -0700)]

support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct

Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6

commit | commitdiff | tree

The Android Automerger [Thu, 22 Apr 2010 23:16:49 +0000 (16:16 -0700)]

FRF22

Change-Id: Id599e3f330ee19ce3c521b618406a399fc05cc30

commit | commitdiff | tree

android-build SharedAccount [Wed, 21 Apr 2010 22:49:51 +0000 (15:49 -0700)]

FRF21B

Change-Id: I81caf83e64aeb793df87132a2b70105cfc37cf6f

commit | commitdiff | tree

The Android Automerger [Wed, 21 Apr 2010 17:46:53 +0000 (10:46 -0700)]

FRF21

Change-Id: I0a48513425a3b5d327fc4baca48d660e1e7f3d51

commit | commitdiff | tree

The Android Automerger [Wed, 21 Apr 2010 17:46:41 +0000 (10:46 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Scott Main [Thu, 15 Apr 2010 23:34:41 +0000 (16:34 -0700)]

docs: misc css changes
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell

Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660

commit | commitdiff | tree

Scott Main [Tue, 20 Apr 2010 22:34:22 +0000 (15:34 -0700)]

Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo

commit | commitdiff | tree

Roman Nurik [Tue, 13 Apr 2010 23:23:42 +0000 (16:23 -0700)]

cherry-pick from master: 42092024ebd81896e741829c50f37a7e0095392e

Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.

Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda

commit | commitdiff | tree

The Android Automerger [Mon, 19 Apr 2010 19:50:36 +0000 (12:50 -0700)]

FRF19

Change-Id: I0001f872e23dafac03eea530997403dc924398ea

commit | commitdiff | tree

The Android Automerger [Mon, 19 Apr 2010 19:50:23 +0000 (12:50 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Brad Fitzpatrick [Fri, 16 Apr 2010 23:55:41 +0000 (16:55 -0700)]

For userdebug builds, enable Dalvik lock contention sampling.

Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3

commit | commitdiff | tree

android-build SharedAccount [Fri, 16 Apr 2010 20:29:19 +0000 (13:29 -0700)]

FRF15D

Change-Id: Ie9d5588da5e7ba40af0aa59380dbefdb2ae2190d

commit | commitdiff | tree

android-build SharedAccount [Fri, 16 Apr 2010 18:44:21 +0000 (11:44 -0700)]

FRF15C

Change-Id: I18c1bcf6c5dafcab5fddfac9c91f2cb719989955

commit | commitdiff | tree

Scott Main [Fri, 16 Apr 2010 16:00:29 +0000 (09:00 -0700)]

docs: add script to capture the ctrl+f key event (initiates 'find' search
on the page) and expand all inherited members.

Also move the appropriate methods from -docs.js into -reference.js where
they belong and add some function documentation.

Change-Id: I421bbf27d3b41d377776b3d64a97380458fcebd6

commit | commitdiff | tree

android-build SharedAccount [Thu, 15 Apr 2010 22:43:06 +0000 (15:43 -0700)]

FRF15B

Change-Id: Ie0b692ab96a598d5ce86151bc189bfd1ec339ae3

commit | commitdiff | tree

The Android Automerger [Thu, 15 Apr 2010 15:12:44 +0000 (08:12 -0700)]

FRF15

Change-Id: Ieb6a3aa05ecac44676e1f9af2ff42cb7b0982a7a

commit | commitdiff | tree

The Android Automerger [Wed, 14 Apr 2010 18:28:38 +0000 (11:28 -0700)]

FRF14

Change-Id: I029b56662620274c63afb26239cd3aa982626bd7

commit | commitdiff | tree

The Android Automerger [Wed, 14 Apr 2010 18:28:25 +0000 (11:28 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Wu-cheng Li [Sun, 4 Apr 2010 09:14:23 +0000 (17:14 +0800)]

Fix the check of double quoted @see tag.

Originally \n was not discarded so a balanced quoted string still
has compile error.

bug:2553570
Change-Id: I073c0c0ba370d55493d3ee6d17c7ebe9f42afe7a

commit | commitdiff | tree

The Android Automerger [Tue, 13 Apr 2010 15:08:05 +0000 (08:08 -0700)]

FRF13

Change-Id: I42ad464136133700fb6e727bbb8d5c68899ede5f

commit | commitdiff | tree

The Android Automerger [Mon, 12 Apr 2010 22:45:43 +0000 (15:45 -0700)]

FRF12B

Change-Id: I35a7addef84c4f4f1b31e6f3185155f44915f4b6

commit | commitdiff | tree

The Android Automerger [Mon, 12 Apr 2010 16:45:42 +0000 (09:45 -0700)]

FRF12

Change-Id: I83a967378dddbdf116e41ebe1b8f2d667151d4ea

commit | commitdiff | tree

The Android Automerger [Mon, 12 Apr 2010 16:45:29 +0000 (09:45 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Scott Main [Sat, 10 Apr 2010 00:03:42 +0000 (17:03 -0700)]

Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak styles for the icon tables to eliminate obscure 'caption' class" into froyo

commit | commitdiff | tree

Xavier Ducrohet [Fri, 9 Apr 2010 01:07:27 +0000 (18:07 -0700)]

Add camera sounds to the emulator system image build.

Bug: 2538315

Change-Id: I30c477ecbe5f0c0a64ca7c3796e72642df0002bf

commit | commitdiff | tree

Scott Main [Mon, 29 Mar 2010 16:50:34 +0000 (09:50 -0700)]

cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
docs: various stylesheet changes
indent tables
revise figure class
add caption classes for tables and images
add styles for xml reference docs (used by resource types docs)
tweak styles for the icon tables to eliminate obscure 'caption' class

Change-Id: I23f53d884f39a5f6a4b45172186e0d1c7619da30

commit | commitdiff | tree

Daniel Sandler [Thu, 8 Apr 2010 23:54:50 +0000 (16:54 -0700)]

Merge "Add Protips to all builds." into froyo

commit | commitdiff | tree

The Android Automerger [Thu, 8 Apr 2010 15:27:32 +0000 (08:27 -0700)]

FRF08

Change-Id: I11fef9bff647fb2cebe3f1377c2b36a1f75c4ea3

commit | commitdiff | tree

The Android Automerger [Thu, 8 Apr 2010 15:27:19 +0000 (08:27 -0700)]

Merge branch 'froyo' into froyo-release

commit | commitdiff | tree

Dianne Hackborn [Wed, 7 Apr 2010 21:13:47 +0000 (14:13 -0700)]

Add clean step for SDK version change.

Change-Id: I2ea85496af49572115dbbd9a98787b1fd54adc50