The Android Automerger
4a131b8d14
JWQ80
2013-03-21 05:57:05 -07:00
The Android Automerger
2d818b9b97
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-21 05:55:09 -07:00
Scott Main
1afc758e57
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.
2013-03-20 15:27:05 -07:00
Scott Main
04f2797309
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.
2013-03-20 15:25:10 -07:00
Scott Main
8c052d395d
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.
2013-03-20 15:23:08 -07:00
Scott Main
82fb80eb11
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.
2013-03-20 15:20:42 -07:00
Scott Main
ec48ff2bed
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.
2013-03-20 15:18:08 -07:00
Scott Main
ec93c11194
Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
2013-03-20 22:16:27 +00:00
Scott Main
a2303454fd
add 64-bit variety NDK packages to download table.
...
Use same naming convention as SDK packages for consistency.
Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c
2013-03-20 15:01:35 -07:00
The Android Automerger
3cf2cf02aa
JWQ79B
2013-03-20 14:37:24 -07:00
The Android Automerger
b225d8b17e
JDQ39E
2013-03-20 12:24:22 -07:00
The Android Automerger
9b8ce9c7d8
JWQ79
2013-03-20 05:57:16 -07:00
The Android Automerger
74d2c90590
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-20 05:55:12 -07:00
The Android Automerger
e0fdbf1878
JWQ78B
2013-03-19 16:53:50 -07:00
Scott Main
18fbd22dff
am 22b048e1
: am 86372f1c
: am 7524d02e
: am 4264799b
: am 24790db1
: fix indentation style for nested lists
...
* commit '22b048e1069c5f5dffd5f13ee4ef35f4ba06fa2b':
fix indentation style for nested lists
2013-03-19 14:48:42 -07:00
Scott Main
22b048e106
am 86372f1c
: am 7524d02e
: am 4264799b
: am 24790db1
: fix indentation style for nested lists
...
* commit '86372f1c0156b096288274ab85128ffbe9f6f8b4':
fix indentation style for nested lists
2013-03-19 14:48:02 -07:00
Scott Main
86372f1c01
am 7524d02e
: am 4264799b
: am 24790db1
: fix indentation style for nested lists
...
* commit '7524d02ef25fed9241e507ebda53d73a643134e5':
fix indentation style for nested lists
2013-03-19 14:46:48 -07:00
Scott Main
7524d02ef2
am 4264799b
: am 24790db1
: fix indentation style for nested lists
...
* commit '4264799b51dd24fdc154a1ae1b70bc4e0bf7e4a9':
fix indentation style for nested lists
2013-03-19 14:44:53 -07:00
Scott Main
4264799b51
am 24790db1
: fix indentation style for nested lists
...
* commit '24790db1cd7b84c6c36350b232538e519790f799':
fix indentation style for nested lists
2013-03-19 14:43:04 -07:00
Scott Main
24790db1cd
fix indentation style for nested lists
...
Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453
2013-03-19 14:38:59 -07:00
Andrew Hsieh
79a6b76ec8
am e874f3ab
: am 55c06f75
: Merge "Duplicate libgcc.a in front of *so"
...
* commit 'e874f3ab7c3f70582f877e762c13c1943ed0e398':
Duplicate libgcc.a in front of *so
2013-03-19 11:17:07 -07:00
Andrew Hsieh
e874f3ab7c
am 55c06f75
: Merge "Duplicate libgcc.a in front of *so"
...
* commit '55c06f75951c0d31560f90822cd4e5073055855c':
Duplicate libgcc.a in front of *so
2013-03-19 11:15:49 -07:00
Andrew Hsieh
55c06f7595
Merge "Duplicate libgcc.a in front of *so"
2013-03-19 17:59:51 +00:00
Ben Cheng
53fda201b5
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).
2013-03-19 09:30:43 -07:00
Andrew Hsieh
8725b941b0
Duplicate libgcc.a in front of *so
...
Also see 6c7bc550ad
Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
2013-03-19 07:51:52 -07:00
The Android Automerger
1935014378
JWQ78
2013-03-19 05:56:36 -07:00
The Android Automerger
1e20705df3
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-19 05:55:05 -07:00
The Android Automerger
1be8428490
JWQ77B
2013-03-18 18:27:55 -07:00
Ben Cheng
870af85234
am e0314245
: Merge "Link libgcc.a before shared libraries (especially libc.so)."
...
* commit 'e03142454b52d9960a93b04f75c1a9487720a73a':
Link libgcc.a before shared libraries (especially libc.so).
2013-03-18 15:21:07 -07:00
Ben Cheng
e03142454b
Merge "Link libgcc.a before shared libraries (especially libc.so)."
2013-03-18 21:05:23 +00:00
Ben Cheng
6c7bc550ad
Link libgcc.a before shared libraries (especially libc.so).
...
[cherry-picked from internal master]
Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
2013-03-18 14:00:44 -07:00
The Android Automerger
44f38bf6ec
JWQ77
2013-03-18 05:58:12 -07:00
The Android Automerger
7aeacb922e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-18 05:55:25 -07:00
Lorenzo Colitti
6aaf5895ec
Include clatd in device builds.
...
Bug: 8276725
Change-Id: I6a4e9c9829ef676c6a3080c03a709be3ec863de5
2013-03-16 09:48:11 +09:00
The Android Automerger
bd73daca63
JWQ73C
2013-03-15 12:58:19 -07:00
Ying Wang
d7321d31ac
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
2013-03-15 10:32:29 -07:00
Ying Wang
4ac826b6d3
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
2013-03-15 09:03:39 -07:00
keunyoung
7a697dd3f5
Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
2013-03-14 22:59:28 +00:00
keunyoung
d9b0e80c1d
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
2013-03-14 15:35:33 -07:00
The Android Automerger
164e483fd7
JWQ73B
2013-03-14 15:09:10 -07:00
Ben Cheng
ea871a0649
Link libgcc.a before shared libraries (especially libc.so).
...
BUG: 8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
2013-03-14 13:39:29 -07:00
Raphael Moll
cdfb5bac3a
resolved conflicts for merge of a3aea5b6
to jb-mr2-dev
...
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
2013-03-14 12:42:04 -07:00
Raphael Moll
a3aea5b6eb
am 0ec2f3df
: Merge "Build SDK using prebuilts/devtools."
...
* commit '0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3':
Build SDK using prebuilts/devtools.
2013-03-14 11:44:07 -07:00
Raphael Moll
0ec2f3df4b
Merge "Build SDK using prebuilts/devtools."
2013-03-14 18:31:36 +00:00
The Android Automerger
a910a319de
JDQ39D
2013-03-14 09:09:42 -07:00
The Android Automerger
056e58abd5
JWQ73
2013-03-14 05:57:18 -07:00
The Android Automerger
2b00e9b48e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-14 05:55:12 -07:00
The Android Automerger
19dd77c2b4
JWQ72B
2013-03-13 15:46:48 -07:00
Raphael Moll
8a2b7707dd
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
2013-03-13 15:30:35 -07:00
The Android Automerger
bc92c0ffeb
JWQ72
2013-03-13 05:56:57 -07:00