Commit graph

4205 commits

Author SHA1 Message Date
Ying Wang
f8a7ff191a resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp
Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
2011-03-09 17:02:35 -08:00
Ying Wang
123995f9e1 am be188caf: Dist build.prop in sdk builds.
* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
  Dist build.prop in sdk builds.
2011-03-09 16:47:27 -08:00
Ed Heyl
122b3d196b am f50b9c4c: resolved conflicts for merge of 24297cab to gingerbread-plus-aosp
* commit 'f50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1':
  version bump for new release   (please don't merge)
2011-03-08 14:28:26 -08:00
Ed Heyl
f50b9c4c85 resolved conflicts for merge of 24297cab to gingerbread-plus-aosp
Change-Id: Ia10a4601b7156f6379d1663d811af45103ff81ff
2011-03-08 14:12:25 -08:00
Ying Wang
be188cafd2 Dist build.prop in sdk builds.
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
2011-03-08 14:05:51 -08:00
Ed Heyl
24297cabf4 Merge "version bump for new release (please don't merge)" into gingerbread 2011-03-08 12:35:20 -08:00
Ed Heyl
3c83a5aeb9 version bump for new release (please don't merge)
Change-Id: I94081a1288da434811a1ddaa8a7b7b5da13d9341
2011-03-07 18:08:24 -08:00
David Turner
1c908fa188 am b9c627c6: am 0683a773: Merge "x86: Use GCC 4.4.3"
* commit 'b9c627c6a0c6f0af57d0912175bfc739b0eb6249':
  x86: Use GCC 4.4.3
2011-03-07 13:45:59 -08:00
David Turner
b9c627c6a0 am 0683a773: Merge "x86: Use GCC 4.4.3"
* commit '0683a77348f2a0a529a8e2bcfdf4b6dc6b4c5f5b':
  x86: Use GCC 4.4.3
2011-03-07 13:35:02 -08:00
Ying Wang
64a8eb1118 am 58222219: am 9238d44c: Only copy once even if the first matched src:dest pair appears more than once.
* commit '582222190f8168bdedf6cfeb986f7e4201f6540a':
  Only copy once even if the first matched src:dest pair appears more than once.
2011-03-07 11:10:07 -08:00
Ying Wang
70d6ec5f9b resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp
Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d
2011-03-07 11:07:12 -08:00
Scott Main
71704a690d am 73b09799: am e8f40264: Merge "docs: update android market icon" into honeycomb
* commit '73b0979941a87f5b0bb079b3960038df5db214cb':
  docs: update android market icon
2011-03-07 10:55:01 -08:00
Scott Main
73b0979941 am e8f40264: Merge "docs: update android market icon" into honeycomb
* commit 'e8f402640b278b234594fd68dc5bab4ac94a334e':
  docs: update android market icon
2011-03-07 10:51:43 -08:00
Scott Main
e8f402640b Merge "docs: update android market icon" into honeycomb 2011-03-07 10:44:54 -08:00
Ed Heyl
8e84514ef5 resolved conflicts for merge of 51de6437 to honeycomb-plus-aosp
Change-Id: Ie076ccd04fc02fdc6753b4787bcf5ac12f167d4e
2011-03-05 09:31:29 -08:00
Scott Main
54056ffc52 am 2e426cf0: am 3ab162e7: docs: script update to account for double-nested list items when scrolling sidenav into view
* commit '2e426cf07ce61c00acdb477c6c049b0c1f92f082':
  docs: script update to account for double-nested list items when scrolling sidenav into view
2011-03-05 09:27:30 -08:00
Scott Main
2e426cf07c am 3ab162e7: docs: script update to account for double-nested list items when scrolling sidenav into view
* commit '3ab162e71cbe88ec4d2207c39b9f3d2d7f4c965c':
  docs: script update to account for double-nested list items when scrolling sidenav into view
2011-03-05 09:24:41 -08:00
David Turner
6b11b58a4a am dfa82c43: am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
* commit 'dfa82c438f5557c5bae3b8f8ae2dc8444edc8036':
  x86: Add in the VirtualBox emulator as a separate build target
2011-03-05 09:20:33 -08:00
Ying Wang
582222190f am 9238d44c: Only copy once even if the first matched src:dest pair appears more than once.
* commit '9238d44c92b355bac6b7a13b23f298336338bf3d':
  Only copy once even if the first matched src:dest pair appears more than once.
2011-03-04 17:13:08 -08:00
Ying Wang
0a1f3236e3 am a73b6561: Drop support for target files with no recovery.fstab.
* commit 'a73b6561cee39ad416f4af327dbe72ec565d2423':
  Drop support for target files with no recovery.fstab.
2011-03-04 17:13:04 -08:00
David Turner
0683a77348 Merge "x86: Use GCC 4.4.3" 2011-03-04 16:39:26 -08:00
Ying Wang
9238d44c92 Only copy once even if the first matched src:dest pair appears more than once.
Change-Id: I476923007dac1174371d6e6526d72182eb6c7243
2011-03-04 15:10:15 -08:00
Ying Wang
a73b6561ce Drop support for target files with no recovery.fstab.
Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.
2011-03-04 14:42:13 -08:00
David Turner
51de64377b am 9edd4fa0: Merge "x86: sdk_x86 build target"
* commit '9edd4fa0a629e178382bacf11bd8875ae826d651':
  x86: sdk_x86 build target
2011-03-04 12:39:52 -08:00
David Turner
9edd4fa0a6 Merge "x86: sdk_x86 build target" 2011-03-04 12:25:47 -08:00
Scott Main
3ab162e71c docs: script update to account for double-nested list items when scrolling sidenav into view
Change-Id: I03668f9ecb7da03a7921a0d7eacd2dcaa0a1ba54
2011-03-04 12:24:54 -08:00
David Turner
dfa82c438f am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
* commit 'faa68200661eea15f5b3962386d325609e1f90a8':
  x86: Add in the VirtualBox emulator as a separate build target
2011-03-04 11:46:14 -08:00
David Turner
faa6820066 Merge "x86: Add in the VirtualBox emulator as a separate build target" 2011-03-04 11:41:02 -08:00
Ying Wang
696e7f916c Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist." into honeycomb-mr1 2011-03-04 11:28:01 -08:00
Ying Wang
7ee6c4033b Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: I3d49d5a2d0e1b6bf26a0e1df0df2d6d7e026f85a
2011-03-04 11:21:38 -08:00
Scott Main
a9c45d1311 am befeb8e5: docs: css tweaks to quickview subrule
* commit 'befeb8e5d54efe9511237e7f5cd99707e1717cb5':
  docs: css tweaks to quickview subrule
2011-03-04 11:17:24 -08:00
Ying Wang
3e1d3c4394 Merge "Support stl variants when LOCAL_NDK_VERSION is set." into honeycomb-mr1 2011-03-04 10:57:51 -08:00
Ying Wang
cce4c973e4 Support stl variants when LOCAL_NDK_VERSION is set.
LOCAL_NDK_STL_VARIANT can be set to system, stlport_static, stlport_shared
or gnustl_static. It defaults to system.

Change-Id: I2840d30ff732a00bc0ea70eab8a8179aea0abbdf
2011-03-04 10:48:28 -08:00
Scott Main
6da57060d1 docs: update android market icon
Change-Id: I3659cb6cbeb795debd769efc7245cd14d2a86418
2011-03-04 10:18:04 -08:00
Scott Main
befeb8e5d5 docs: css tweaks to quickview subrule
Change-Id: Ib25255c176ed13e8d0bb5edc4172e1629a886125
2011-03-04 09:56:50 -08:00
Scott Main
6c4e37b153 am 75eb14bc: docs: add default margins for form element
* commit '75eb14bc1c2ae4f46c6d67ec51c1a9e8ed42e25f':
  docs: add default margins for form element
2011-03-04 01:21:45 -08:00
Ying Wang
a67ce69e9a Handle MODULE_LICENSE_MPL the same as MODULE_LICENSE_GPL.
Change-Id: Iefc6df3f3401a591f53ec3f22202044c60acf460
2011-03-03 14:57:10 -08:00
Scott Main
75eb14bc1c docs: add default margins for form element
Change-Id: Ibce828e2f22193e1725420e90d4df408646f23dd
2011-03-03 10:28:02 -08:00
Ying Wang
1bc81fc523 Merge "sdk.atree does not need DIST_DIR any longer." 2011-03-02 21:23:15 -08:00
Bart Sears
2c8ad30f66 am 84684a5e: (-s ours) am b67b2f6b: Merge "Do not merge: Update version to 3.0.1 for HC MR0" into honeycomb
* commit '84684a5ead19f53acad8285fe4242a2bc55b5472':
  Do not merge: Update version to 3.0.1 for HC MR0
2011-03-02 15:33:02 -08:00
Ying Wang
cdd1dc0a6f am 1fe8c892: am 65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
* commit '1fe8c89298df6433c2f70b8ae093b90bd12eb760':
  Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
2011-03-02 12:54:55 -08:00
Wink Saville
9423f913ab am 6d85b7c7: am 243d9ae2: am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '6d85b7c774d224825f7ecd6e7819499daadc4c78':
  WAPPushManager, WAP Push over SMS message handler
2011-03-02 12:53:40 -08:00
Doug Zongker
369985c6f2 remove vestigial WriteFirmwareImage function
Nothing calls this, and the updater function it calls no longer
exists.  The HTC-device-specific thing it used to do was moved to HTC
extension libraries.

Change-Id: I2252adf44ea0c5beb6e9379215d7337880f66f68
2011-03-02 10:57:06 -08:00
Bart Sears
84684a5ead am b67b2f6b: Merge "Do not merge: Update version to 3.0.1 for HC MR0" into honeycomb
* commit 'b67b2f6bad2b0348285899d0c85fe8196f6559a5':
  Do not merge: Update version to 3.0.1 for HC MR0
2011-03-01 18:02:24 -08:00
Bart Sears
b67b2f6bad Merge "Do not merge: Update version to 3.0.1 for HC MR0" into honeycomb 2011-03-01 18:00:22 -08:00
Ying Wang
2adc50374a sdk.atree does not need DIST_DIR any longer.
Change-Id: I34d8f13e1ddc27f853e3f15cfe0351d780a47aa8
2011-03-01 16:13:41 -08:00
Ying Wang
1fe8c89298 am 65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
* commit '652654927da52f9d1d0e75b69be44701686f79e7':
  Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
2011-03-01 14:56:57 -08:00
Ying Wang
652654927d Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
We are deprecating use of AndroidBoard.mk. To move add-radio-file to
Android.mk, cleaning INSTALLED_RADIOIMAGE_TARGET may clean the radio
target set by other Android.mks that get included before
target/board/Android.mk.
Bug: 3500660

Change-Id: Iee19c40c18f0e9ec23bad4b6ab0e600756af615a
2011-03-01 14:16:58 -08:00
Bart Sears
a4388edcb9 Do not merge: Update version to 3.0.1 for HC MR0
Change-Id: I301a5926ea6c04d1d5c050bb3796be1adf515737
2011-03-01 13:56:20 -08:00
Wink Saville
6d85b7c774 am 243d9ae2: am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '243d9ae28ce30dda98bc024794218f1a8b21e85f':
  WAPPushManager, WAP Push over SMS message handler
2011-03-01 13:48:38 -08:00