Ying Wang
e05e444f6b
Merge "Establish the built module dependencies on prebuilt shared library"
2013-07-13 05:10:32 +00:00
Ying Wang
ada8f29657
Establish the built module dependencies on prebuilt shared library
...
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
2013-07-12 22:05:14 -07:00
Nick Kralevich
c5e460b356
am 4e76f806
: am a682f6db
: am 4e132ca5
: Merge "emulator: increase system partition to 550M"
...
* commit '4e76f806d49c0b4e7fa31653555a5a16713a8778':
emulator: increase system partition to 550M
2013-07-12 20:48:32 -07:00
Nick Kralevich
4e76f806d4
am a682f6db
: am 4e132ca5
: Merge "emulator: increase system partition to 550M"
...
* commit 'a682f6db7b3e1259ce4abc829bd6763850565494':
emulator: increase system partition to 550M
2013-07-12 20:46:51 -07:00
Nick Kralevich
a682f6db7b
am 4e132ca5
: Merge "emulator: increase system partition to 550M"
...
* commit '4e132ca5e5c5048d7a95563eddd9f5ef11346678':
emulator: increase system partition to 550M
2013-07-12 20:44:41 -07:00
Nick Kralevich
4e132ca5e5
Merge "emulator: increase system partition to 550M"
2013-07-13 03:42:05 +00:00
Nick Kralevich
865ffd4efe
emulator: increase system partition to 550M
...
Yes, 400M isn't enough. I can't believe it either.
Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
2013-07-12 20:28:59 -07:00
Scott Main
e80ddbe976
fix design/develop boxes float
...
Change-Id: Id6de3e74667f5cc485290509919e0f5cce689505
2013-07-12 19:22:24 -07:00
The Android Automerger
11622182a2
"JSS11H"
2013-07-12 18:49:06 -07:00
The Android Automerger
1adb5ed7e9
"JSS11G"
2013-07-12 17:10:48 -07:00
Nick Kralevich
265b8866cc
am 38437bad
: am e9ee5e11
: am 5411ef9c
: Merge "emulator: increase system partition size to 400M"
...
* commit '38437bade23ff6fc5fe5c30dacebc178c56d47ba':
emulator: increase system partition size to 400M
2013-07-12 15:20:30 -07:00
Nick Kralevich
38437bade2
am e9ee5e11
: am 5411ef9c
: Merge "emulator: increase system partition size to 400M"
...
* commit 'e9ee5e11b499f5be72b365585001e310b776d698':
emulator: increase system partition size to 400M
2013-07-12 15:17:20 -07:00
Nick Kralevich
e9ee5e11b4
am 5411ef9c
: Merge "emulator: increase system partition size to 400M"
...
* commit '5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
emulator: increase system partition size to 400M
2013-07-12 15:15:33 -07:00
Nick Kralevich
5411ef9cc4
Merge "emulator: increase system partition size to 400M"
2013-07-12 22:14:02 +00:00
The Android Open Source Project
be5ffb8e10
am 29b708aa
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '29b708aac70b694879d4867e1943926716a08fea':
JSS11F
"JSS11E"
2013-07-12 14:55:01 -07:00
The Android Open Source Project
29b708aac7
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec
2013-07-12 14:52:07 -07:00
Nick Kralevich
de2709baac
emulator: increase system partition size to 400M
...
300M is too small.
Change-Id: Icbe4e76d6e5c8a50cc6e6d74e324335bc66b8466
2013-07-12 13:44:48 -07:00
The Android Automerger
7712d0ca94
JSS11F
2013-07-12 12:19:57 -07:00
Ying Wang
7600917dac
am 263359df
: am 6685bd01
: am 2476ec99
: Merge "use ext4 instead of yaffs for the emulator"
...
* commit '263359df4399e86a26a70711b8004b54c8fe44b0':
use ext4 instead of yaffs for the emulator
2013-07-12 11:14:28 -07:00
Ying Wang
263359df43
am 6685bd01
: am 2476ec99
: Merge "use ext4 instead of yaffs for the emulator"
...
* commit '6685bd01a953a550f0cebe342e9a1125adffd6b3':
use ext4 instead of yaffs for the emulator
2013-07-12 11:12:49 -07:00
Ying Wang
6685bd01a9
am 2476ec99
: Merge "use ext4 instead of yaffs for the emulator"
...
* commit '2476ec994d449d31c89571723b4b17826639c1bf':
use ext4 instead of yaffs for the emulator
2013-07-12 11:11:56 -07:00
Ying Wang
2476ec994d
Merge "use ext4 instead of yaffs for the emulator"
2013-07-12 18:10:13 +00:00
The Android Automerger
cce09abc61
"JSS11E"
2013-07-12 10:53:23 -07:00
JP Abgrall
fa920b3164
Merge "core: don't hardcode "out" during findleaves.py invocations."
2013-07-12 17:08:10 +00:00
The Android Open Source Project
4550fe1d40
am 76be17de
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '76be17de7a7fc811da0145252855802d06d55367':
"JSS11D"
JSS11C
"JSS11B"
2013-07-12 07:30:00 -07:00
The Android Open Source Project
76be17de7a
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I5f92acba878b1d0f149df1499cc09f3cda23f7e3
2013-07-12 07:27:32 -07:00
Nick Kralevich
3c9fae2840
use ext4 instead of yaffs for the emulator
...
Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I7c605457b485d169654263caf55eb7d5a9a60c2e
2013-07-11 22:39:38 -07:00
The Android Automerger
4e9b763cf2
"JSS11D"
2013-07-11 20:26:53 -07:00
JP Abgrall
1390cac3ce
core: don't hardcode "out" during findleaves.py invocations.
...
"out" can be $OUT_DIR
Bug: 7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
2013-07-11 19:08:06 -07:00
Ying Wang
7ba0850a47
am 032ad054
: am a1b948af
: am cbeb6e81
: Merge "Include ping6 in all device builds"
...
* commit '032ad0542b395d1277b634b1243f36ae2100eb16':
Include ping6 in all device builds
2013-07-11 19:01:44 -07:00
Ying Wang
032ad0542b
am a1b948af
: am cbeb6e81
: Merge "Include ping6 in all device builds"
...
* commit 'a1b948afdb5a46e168cf59ea4045b63722ee8b47':
Include ping6 in all device builds
2013-07-11 18:56:02 -07:00
Ying Wang
a1b948afdb
am cbeb6e81
: Merge "Include ping6 in all device builds"
...
* commit 'cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
Include ping6 in all device builds
2013-07-11 18:52:19 -07:00
The Android Automerger
69a20402b6
JSS11C
2013-07-11 18:41:43 -07:00
The Android Automerger
29b849f196
"JSS11B"
2013-07-11 17:12:16 -07:00
Ying Wang
cbeb6e81fe
Merge "Include ping6 in all device builds"
2013-07-11 19:08:49 +00:00
The Android Open Source Project
3307664326
am d8d0c17e
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit 'd8d0c17e22f42597497e8f9f5c134621e399e22a':
"JSS11"
"JWR66V"
2013-07-11 11:49:43 -07:00
The Android Open Source Project
3a4fdca66f
am 7c8042a3
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '7c8042a39858bc42e3eb5ede616acbee7e8a3f06':
"JSS10"
2013-07-11 10:17:26 -07:00
The Android Open Source Project
92d1500482
am 4d9f13dd
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '4d9f13dd0fcefad9ce2e27f3b48bc0e4ba3fb9b1':
"JSS09B"
JWR66U
2013-07-11 10:17:05 -07:00
Jeff Brown
85fe0c5446
am 9d80f708
: am a3d60ae8
: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
...
* commit '9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
Revert "Remove mediarouter v7 support library from SDK."
2013-07-11 10:17:00 -07:00
The Android Open Source Project
d8d0c17e22
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448
2013-07-11 08:22:27 -07:00
The Android Open Source Project
37f11e06f3
am 93351ede
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '93351edefa033cade3c8f06729a1b2a73f70e18b':
"JSS09"
2013-07-11 08:08:03 -07:00
The Android Automerger
e17c7f4324
"JSS11"
2013-07-11 05:56:15 -07:00
The Android Automerger
751f517813
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-11 05:55:09 -07:00
Lorenzo Colitti
c5bb87fff1
Include ping6 in all device builds
...
ping6 is currently only included in debug builds. Include it
everywhere, now that it doesn't need to be setuid any more.
Bug: 9469682
Change-Id: Ia78f6b0e5fc8f7042fb99cdb4a0add426bb56c7e
2013-07-11 12:54:05 +09:00
The Android Automerger
c80dc3e407
"JWR66V"
2013-07-10 18:34:56 -07:00
Ying Wang
fd30db5f29
Merge "Bring in runtime-specific product variables in a more general way."
2013-07-11 01:23:29 +00:00
Ying Wang
22ef79850e
Bring in runtime-specific product variables in a more general way.
...
Change-Id: Ibd0e0e8e3e0ca6afd125db8035ce08a7399b7547
2013-07-10 18:14:40 -07:00
Ying Wang
6238cd9185
Demultiplex the coretests description rules
...
Previously for each target generate-core-test-description will be called
6 times that end in 6x6 calls of the function.
That's unnecessary and unsafe.
Change-Id: I03eef89b61c552b5f47f0a478feb9687fd9717da
2013-07-10 16:58:52 -07:00
Scott Main
27403b8036
add style to add nexus 4 frame to screenshots
...
Change-Id: I1e96cbd755c4c6f88c807160b9a86b77a5ebed74
2013-07-10 16:36:05 -07:00
Ying Wang
6a5ab75268
Merge "Clean up files' dependencies on phony targets."
2013-07-10 20:10:51 +00:00