OSDN Git Service
Ying Wang [Fri, 22 Mar 2013 19:37:56 +0000 (19:37 +0000)]
am
9b93f37c: Delete icu4j from pathmap.mk
* commit '
9b93f37c893979c4c01877ce7d8e653aa9af95b3':
Delete icu4j from pathmap.mk
Ying Wang [Fri, 22 Mar 2013 19:32:50 +0000 (12:32 -0700)]
Delete icu4j from pathmap.mk
frameworks/base/icu4j is gone in jb-mr2-dev.
Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
Scott Main [Fri, 22 Mar 2013 01:38:58 +0000 (01:38 +0000)]
am
5fe9aaac: am
159de1de: am
1b8b0cfe: am
79088780: am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
5fe9aaacefbe3d53a7be280bf017b2e77e7a66ae':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:35:43 +0000 (18:35 -0700)]
am
159de1de: am
1b8b0cfe: am
79088780: am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
159de1de00027ebb9280cf6768d59369416c7a13':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:33:53 +0000 (18:33 -0700)]
am
1b8b0cfe: am
79088780: am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
1b8b0cfee98c8d2779dc740707b547846734053f':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:31:59 +0000 (18:31 -0700)]
am
79088780: am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
7908878061144b25b1e0baf36619db7b32d07c98':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:29:44 +0000 (18:29 -0700)]
am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
8d92d9ef824f265979e68da927f01aba4bb6b314':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:27:16 +0000 (18:27 -0700)]
am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
01a2545bbab916e45eedbd3708f526ed8bd62935':
docs: update templates to remove global content for devsite builds
Scott Main [Wed, 13 Feb 2013 01:32:27 +0000 (17:32 -0800)]
docs: update templates to remove global content for devsite builds
Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c
Scott Main [Wed, 20 Mar 2013 22:30:40 +0000 (22:30 +0000)]
am
1afc758e: am
04f27973: am
8c052d39: am
82fb80eb: am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
1afc758e57d6f7c873111086e4c74614634a2856':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:27:05 +0000 (15:27 -0700)]
am
04f27973: am
8c052d39: am
82fb80eb: am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
04f279730970df0ea5cd8ef6e8f7a5bee6233dc6':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:25:10 +0000 (15:25 -0700)]
am
8c052d39: am
82fb80eb: am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
8c052d395db4643303e03efbc35eca0259cee19e':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:23:08 +0000 (15:23 -0700)]
am
82fb80eb: am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
82fb80eb11188592f34056e8c787a74a28be6543':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:20:42 +0000 (15:20 -0700)]
am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
ec48ff2bed11b0cbdc2686eed28a6edc75425fca':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:18:08 +0000 (15:18 -0700)]
am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
ec93c11194f55fb2bd9ae23fa502d701bfb09664':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:16:27 +0000 (22:16 +0000)]
Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
Scott Main [Mon, 18 Mar 2013 18:31:15 +0000 (11:31 -0700)]
add 64-bit variety NDK packages to download table.
Use same naming convention as SDK packages for consistency.
Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c
The Android Open Source Project [Wed, 20 Mar 2013 16:32:13 +0000 (09:32 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I548290b010c4622ea6c765453284decd219bb77d
The Android Automerger [Wed, 20 Mar 2013 12:57:16 +0000 (05:57 -0700)]
JWQ79
The Android Automerger [Wed, 20 Mar 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 19 Mar 2013 23:53:50 +0000 (16:53 -0700)]
JWQ78B
Scott Main [Tue, 19 Mar 2013 21:49:53 +0000 (21:49 +0000)]
am
18fbd22d: am
22b048e1: am
86372f1c: am
7524d02e: am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
18fbd22dffb106181a4a3e8cfbfc1726e9199fa3':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:48:42 +0000 (14:48 -0700)]
am
22b048e1: am
86372f1c: am
7524d02e: am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
22b048e1069c5f5dffd5f13ee4ef35f4ba06fa2b':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:48:02 +0000 (14:48 -0700)]
am
86372f1c: am
7524d02e: am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
86372f1c0156b096288274ab85128ffbe9f6f8b4':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:46:48 +0000 (14:46 -0700)]
am
7524d02e: am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
7524d02ef25fed9241e507ebda53d73a643134e5':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:44:53 +0000 (14:44 -0700)]
am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
4264799b51dd24fdc154a1ae1b70bc4e0bf7e4a9':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:43:04 +0000 (14:43 -0700)]
am
24790db1: fix indentation style for nested lists
* commit '
24790db1cd7b84c6c36350b232538e519790f799':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:38:59 +0000 (14:38 -0700)]
fix indentation style for nested lists
Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453
Andrew Hsieh [Tue, 19 Mar 2013 18:19:26 +0000 (18:19 +0000)]
am
79a6b76e: am
e874f3ab: am
55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '
79a6b76ec8a2af8898920806431fe5d806e0155e':
Duplicate libgcc.a in front of *so
Andrew Hsieh [Tue, 19 Mar 2013 18:17:07 +0000 (11:17 -0700)]
am
e874f3ab: am
55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '
e874f3ab7c3f70582f877e762c13c1943ed0e398':
Duplicate libgcc.a in front of *so
Andrew Hsieh [Tue, 19 Mar 2013 18:15:49 +0000 (11:15 -0700)]
am
55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '
55c06f75951c0d31560f90822cd4e5073055855c':
Duplicate libgcc.a in front of *so
Andrew Hsieh [Tue, 19 Mar 2013 17:59:50 +0000 (17:59 +0000)]
Merge "Duplicate libgcc.a in front of *so"
Ben Cheng [Tue, 19 Mar 2013 16:32:51 +0000 (16:32 +0000)]
am
53fda201: am
870af852: am
e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit '
53fda201b5a591bbda8ab8e2f307f433f53f5cb7':
Link libgcc.a before shared libraries (especially libc.so).
Ben Cheng [Tue, 19 Mar 2013 16:30:43 +0000 (09:30 -0700)]
am
870af852: am
e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit '
870af852348e700fd7a6d47a4388b249c27a3d8d':
Link libgcc.a before shared libraries (especially libc.so).
Andrew Hsieh [Thu, 7 Mar 2013 12:52:17 +0000 (20:52 +0800)]
Duplicate libgcc.a in front of *so
Also see
6c7bc550adb917157a9f53ebf8898110e37294b2
Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
The Android Automerger [Tue, 19 Mar 2013 12:56:36 +0000 (05:56 -0700)]
JWQ78
The Android Automerger [Tue, 19 Mar 2013 12:55:05 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 19 Mar 2013 01:27:55 +0000 (18:27 -0700)]
JWQ77B
Ben Cheng [Mon, 18 Mar 2013 22:21:07 +0000 (15:21 -0700)]
am
e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit '
e03142454b52d9960a93b04f75c1a9487720a73a':
Link libgcc.a before shared libraries (especially libc.so).
Ben Cheng [Mon, 18 Mar 2013 21:05:22 +0000 (21:05 +0000)]
Merge "Link libgcc.a before shared libraries (especially libc.so)."
Ben Cheng [Wed, 13 Mar 2013 01:15:18 +0000 (18:15 -0700)]
Link libgcc.a before shared libraries (especially libc.so).
[cherry-picked from internal master]
Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
The Android Automerger [Mon, 18 Mar 2013 12:58:12 +0000 (05:58 -0700)]
JWQ77
The Android Automerger [Mon, 18 Mar 2013 12:55:25 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Lorenzo Colitti [Sun, 17 Mar 2013 16:24:00 +0000 (16:24 +0000)]
am
6aaf5895: Include clatd in device builds.
* commit '
6aaf5895eccabf7ec7e4ab961aef2ffbdda26715':
Include clatd in device builds.
Lorenzo Colitti [Sat, 16 Mar 2013 00:41:49 +0000 (09:41 +0900)]
Include clatd in device builds.
Bug:
8276725
Change-Id: I6a4e9c9829ef676c6a3080c03a709be3ec863de5
The Android Automerger [Fri, 15 Mar 2013 19:58:19 +0000 (12:58 -0700)]
JWQ73C
Ying Wang [Fri, 15 Mar 2013 17:37:34 +0000 (17:37 +0000)]
am
d7321d31: Skip userdata.img only if partition size is not give for extfs.
* commit '
d7321d31accd344f4f2ad0a8e0b4f47be4d5128e':
Skip userdata.img only if partition size is not give for extfs.
Ying Wang [Fri, 15 Mar 2013 17:32:29 +0000 (10:32 -0700)]
Skip userdata.img only if partition size is not give for extfs.
We still build yaffs2 images which don't need partition size.
Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
Ying Wang [Fri, 15 Mar 2013 16:47:44 +0000 (16:47 +0000)]
am
4ac826b6: Don\'t build userdata.img if no partition size
* commit '
4ac826b6d39145ac287821e6771bb2ce1102832c':
Don't build userdata.img if no partition size
Ying Wang [Fri, 15 Mar 2013 16:03:39 +0000 (09:03 -0700)]
Don't build userdata.img if no partition size
And retire BOARD_DONT_BUILD_USERDATA_IMG.
This unifies the logic in build/core/Makefile and
build/tools/releasetools/img_from_target_files.
Change-Id: Ib6b4e8e0d8279ed7deaf047e9dc30eb65aba013f
keunyoung [Thu, 14 Mar 2013 23:03:51 +0000 (23:03 +0000)]
am
7a697dd3: Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
* commit '
7a697dd3f5c2809ba925ae8799a0127ca9284862':
add camera.goldfish.jpeg to emulator targets and mini targets
keunyoung [Thu, 14 Mar 2013 22:59:27 +0000 (22:59 +0000)]
Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
keunyoung [Tue, 12 Mar 2013 23:28:37 +0000 (16:28 -0700)]
add camera.goldfish.jpeg to emulator targets and mini targets
- For mini targets, it is for making camera work in mini-emulator targets
Change-Id: I0bebb3ae9135c78af8ba4209ba2ba60e074325b3
The Android Automerger [Thu, 14 Mar 2013 22:09:10 +0000 (15:09 -0700)]
JWQ73B
Ben Cheng [Thu, 14 Mar 2013 20:48:16 +0000 (20:48 +0000)]
am
ea871a06: Link libgcc.a before shared libraries (especially libc.so).
* commit '
ea871a06499e7433b109852d8fdda781da7c14c2':
Link libgcc.a before shared libraries (especially libc.so).
Ben Cheng [Wed, 13 Mar 2013 01:15:18 +0000 (18:15 -0700)]
Link libgcc.a before shared libraries (especially libc.so).
BUG:
8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
Raphael Moll [Thu, 14 Mar 2013 19:48:24 +0000 (19:48 +0000)]
am
cdfb5bac: resolved conflicts for merge of
a3aea5b6 to jb-mr2-dev
* commit '
cdfb5bac3a5721b895cea4789ac2384ff6546992':
Build SDK using prebuilts/devtools.
Raphael Moll [Thu, 14 Mar 2013 19:41:16 +0000 (12:41 -0700)]
resolved conflicts for merge of
a3aea5b6 to jb-mr2-dev
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
Raphael Moll [Thu, 14 Mar 2013 18:44:07 +0000 (11:44 -0700)]
am
0ec2f3df: Merge "Build SDK using prebuilts/devtools."
* commit '
0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3':
Build SDK using prebuilts/devtools.
Raphael Moll [Thu, 14 Mar 2013 18:31:36 +0000 (18:31 +0000)]
Merge "Build SDK using prebuilts/devtools."
The Android Automerger [Thu, 14 Mar 2013 12:57:18 +0000 (05:57 -0700)]
JWQ73
The Android Automerger [Thu, 14 Mar 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 13 Mar 2013 22:46:48 +0000 (15:46 -0700)]
JWQ72B
Raphael Moll [Wed, 13 Mar 2013 22:30:35 +0000 (15:30 -0700)]
Build SDK using prebuilts/devtools.
Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
any more but in the sdk/product.mk instead (which they were.)
Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
The Android Automerger [Wed, 13 Mar 2013 12:56:57 +0000 (05:56 -0700)]
JWQ72
The Android Automerger [Wed, 13 Mar 2013 12:55:10 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Stephen Hines [Wed, 13 Mar 2013 01:22:08 +0000 (01:22 +0000)]
am
6e2d53a5: Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev
* commit '
6e2d53a5cdcc99e3927ae5db537dd74eb5474daf':
We need to use the ARM EABI to pass vector registers properly (i.e. float2).
Stephen Hines [Wed, 13 Mar 2013 01:20:15 +0000 (01:20 +0000)]
Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev
Stephen Hines [Wed, 13 Mar 2013 00:10:19 +0000 (17:10 -0700)]
We need to use the ARM EABI to pass vector registers properly (i.e. float2).
Given the following function signature:
void rsDebug(const char *s, float2 f2);
Under the regular ARM ABI, the arguments would be passed as follows:
r0 <- s
r1 <- f2.x
r2 <- f2.y
Under the ARM EABI, the arguments would be passed as follows:
r0 <- s
r1 <- UNUSED due to alignment padding for vector operation
r2 <- f2.x
r3 <- f2.y
Change-Id: I2332c8555c00003ae900f299fa3aee1b3ccac439
The Android Automerger [Tue, 12 Mar 2013 22:20:23 +0000 (15:20 -0700)]
JWQ71B
Dianne Hackborn [Tue, 12 Mar 2013 19:33:10 +0000 (19:33 +0000)]
am
870d5f16: Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev
* commit '
870d5f16a59eca02b888c223fd86f0570a9253b6':
Add LOCAL_APK_LIBRARIES argument.
Dianne Hackborn [Tue, 12 Mar 2013 19:31:11 +0000 (19:31 +0000)]
Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev
Dianne Hackborn [Tue, 12 Mar 2013 01:04:55 +0000 (18:04 -0700)]
Add LOCAL_APK_LIBRARIES argument.
This allows you to build apks that link against other
apks using the framework's new shared library apk feature.
Also if you are using LOCAL_APK_LIBRARIES, then LOCAL_DEX_PREOPT
will not be allowed. This is because using preopt means the
apk is stripped of its dex file, so the pre-installed apk can't
be redexed if its associated library changes. (Even if the build
system didn't strip the dex, Dalvik still has issues because it
assumes a pre-odex file is always valid.)
Change-Id: I952c0d24f8975f75aff67f78b5faeec91144c3e7
The Android Open Source Project [Tue, 12 Mar 2013 14:14:15 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I69ef6ac591047be719e1dc4a1330a0c9573b90bb
The Android Automerger [Tue, 12 Mar 2013 12:58:43 +0000 (05:58 -0700)]
JWQ71
The Android Automerger [Tue, 12 Mar 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 11 Mar 2013 22:50:48 +0000 (15:50 -0700)]
JWQ70C
keunyoung [Mon, 11 Mar 2013 21:50:51 +0000 (21:50 +0000)]
am
51e11eea: Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev
* commit '
51e11eea6d64dd156ce22ff3103ddf5676ef2d73':
reflect the migration of emulator hal to device/generic/goldfish
keunyoung [Mon, 11 Mar 2013 21:48:54 +0000 (21:48 +0000)]
Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev
Scott Main [Mon, 11 Mar 2013 20:58:29 +0000 (20:58 +0000)]
am
6959bce3: am
e9d67dcc: am
56662610: am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
6959bce3dee76146d7bd6cc92780ffdb29fcf457':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:55:05 +0000 (13:55 -0700)]
am
e9d67dcc: am
56662610: am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
e9d67dccb01cf91d04b71f590b8e91737be70e64':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:51:18 +0000 (13:51 -0700)]
am
56662610: am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
5666261023e8b5362f848ccfd307d52c6b1f2150':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:49:53 +0000 (13:49 -0700)]
am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
5fef291f3e9fa5139d0876a960e0173ef77842da':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:48:34 +0000 (13:48 -0700)]
am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
3aca7544a51296777a91fa6e3ef203cebf14d04c':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:47:13 +0000 (13:47 -0700)]
am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
2d967c6df63c625659dbca486a4ba0a20c1f3561':
tweak jspane width property to ensure bg color for highlighted item is full width
The Android Automerger [Mon, 11 Mar 2013 19:05:10 +0000 (12:05 -0700)]
JWQ70B
keunyoung [Fri, 8 Mar 2013 20:54:36 +0000 (12:54 -0800)]
reflect the migration of emulator hal to device/generic/goldfish
- no longer need to check the presence as device/generic/goldfish is in PDK
Change-Id: I551dd283fb6511d8ebd45a8519f797f8ba2f1a05
Torne (Richard Coles) [Mon, 11 Mar 2013 16:35:06 +0000 (16:35 +0000)]
am
a8d89e15: Merge "Don\'t try to group static libraries on mac." into jb-mr2-dev
* commit '
a8d89e15f0fe4e3e5156526e25e51a7901b57b68':
Don't try to group static libraries on mac.
Torne (Richard Coles) [Mon, 11 Mar 2013 16:31:08 +0000 (16:31 +0000)]
Merge "Don't try to group static libraries on mac." into jb-mr2-dev
Ying Wang [Mon, 11 Mar 2013 16:28:12 +0000 (16:28 +0000)]
am
bacedf66: am
4f499fba: am
c36f41fd: Merge "Support gdb wrappers"
* commit '
bacedf66d2ecf05d100cf830d6dc4bd22f8562e7':
Support gdb wrappers
Ying Wang [Mon, 11 Mar 2013 16:26:06 +0000 (09:26 -0700)]
am
4f499fba: am
c36f41fd: Merge "Support gdb wrappers"
* commit '
4f499fba73dd7bc04248f310df9b8b90f93d5de8':
Support gdb wrappers
Ying Wang [Mon, 11 Mar 2013 16:24:06 +0000 (09:24 -0700)]
am
c36f41fd: Merge "Support gdb wrappers"
* commit '
c36f41fd38c0dfc09ef486e6c3b2eda26c3a5b24':
Support gdb wrappers
Scott Main [Mon, 11 Mar 2013 16:21:07 +0000 (09:21 -0700)]
tweak jspane width property to ensure bg color for highlighted item is full width
Change-Id: I92e66493229476c29cf71c74091f36063638def4
Ying Wang [Mon, 11 Mar 2013 16:08:23 +0000 (16:08 +0000)]
Merge "Support gdb wrappers"
Torne (Richard Coles) [Mon, 11 Mar 2013 14:59:42 +0000 (14:59 +0000)]
Don't try to group static libraries on mac.
Mac's linker doesn't support --start-group and --end-group; it scans
libraries repeatedly even without these options, so it's not necessary.
Change-Id: If22527e75470f7fa9452dc33efe4d40a60d0919a
The Android Automerger [Mon, 11 Mar 2013 12:58:51 +0000 (05:58 -0700)]
JWQ70
The Android Automerger [Mon, 11 Mar 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Michael Wright [Sat, 9 Mar 2013 02:13:27 +0000 (02:13 +0000)]
am
eb73384e: Fixed whitespace and env pollution issues in pez
* commit '
eb73384e02639259b3ef04bb1856607d4dcf265c':
Fixed whitespace and env pollution issues in pez
Michael Wright [Sat, 9 Mar 2013 01:34:02 +0000 (17:34 -0800)]
Fixed whitespace and env pollution issues in pez
Change-Id: I40574d6cdab31e920535c09d24fe8463aee57586
Alex Ray [Fri, 8 Mar 2013 23:38:10 +0000 (23:38 +0000)]
am
f0d08ebd: pez: colored SUCCESS/FAILURE indicator
* commit '
f0d08ebd2f6b32e879efda3c496d24503919e0e9':
pez: colored SUCCESS/FAILURE indicator