Raphael Moll
347f305181
Move Windows SDK whitelist out of main.mk
...
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.
Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git
Change-Id: Id6178b000c464c989da2c7f22977986a60de1f44
2012-01-26 15:11:46 -08:00
Dianne Hackborn
512ce9cb42
You know back when I said this thing about Ice Cream Sandwich MR2?
...
What was I thinking?
That would be *ridiculous*.
What sane person would come up with a release like that?!?
I mean... four words! Six if you try to say it! Insane!!
Instead, we shall call you:
Jelly Bean.
Yum.
Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
2012-01-25 11:21:37 -08:00
Jean-Baptiste Queru
922196c332
am 40101047: am 7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
...
* commit '4010104732bdae0de5027c4241db5d3cb6230252':
Remove non-existent AlarmProvider to fix SDK build.
2012-01-24 08:44:22 -08:00
Jean-Baptiste Queru
4010104732
am 7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
...
* commit '7a8efe57a9505940cd51c7664e8643ec9da9d24d':
Remove non-existent AlarmProvider to fix SDK build.
2012-01-24 08:38:57 -08:00
Jean-Baptiste Queru
7a8efe57a9
Merge "Remove non-existent AlarmProvider to fix SDK build."
2012-01-24 07:50:02 -08:00
Ying Wang
c3dbeb5df1
Remove non-existent AlarmProvider to fix SDK build.
...
Change-Id: Ifcd087b9022f29b4b7065a72cafbbc6b3704860b
2012-01-23 10:53:23 -08:00
The Android Open Source Project
a09c28a619
am 51475183: Reconcile with ics-mr1-release
...
* commit '514751834753b30d37eae591ccce2e69e3468602':
IMM20B
IMM20
2012-01-23 10:41:27 -08:00
The Android Open Source Project
5147518347
Reconcile with ics-mr1-release
...
Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11
2012-01-23 10:15:33 -08:00
The Android Open Source Project
03e1c3f3a9
am c541cd6e: Reconcile with ics-mr1-release
...
* commit 'c541cd6ecb59fdaa339585c48395d06ccd03867e':
IMM19
2012-01-20 16:37:56 -08:00
The Android Automerger
ec87a47401
IMM20B
2012-01-20 16:31:06 -08:00
The Android Automerger
5cb3f9d271
IMM20
2012-01-20 16:15:22 -08:00
The Android Automerger
282074349f
merge in ics-mr1-release history after reset to ics-mr1
2012-01-20 16:11:14 -08:00
The Android Open Source Project
a7fbf6769c
am c9054b11: Reconcile with ics-mr1-release
...
* commit 'c9054b11fa3895fe70b2eaba849c6388df449c1e':
IMM18
IMM13
IMM12
2012-01-20 15:52:13 -08:00
Ying Wang
fcf246c989
Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.
...
Change-Id: I2b1de0a253d341bcb7ee05fdc96bdc0d0967985e
2012-01-20 12:59:58 -08:00
The Android Open Source Project
c541cd6ecb
Reconcile with ics-mr1-release
...
Change-Id: I3bdc5d19073e63e031b684bede64b1f5ebdf13e7
2012-01-20 10:25:20 -08:00
The Android Automerger
94e1e3b914
IMM19
2012-01-19 16:31:16 -08:00
The Android Automerger
84eb1e95ab
merge in ics-mr1-release history after reset to ics-mr1
2012-01-19 16:27:27 -08:00
The Android Open Source Project
c9054b11fa
Reconcile with ics-mr1-release
...
Change-Id: I06332ff4f1ca17df8303819c8ea85cf5f63712ca
2012-01-19 13:06:25 -08:00
Doug Zongker
545b7996cc
prefer an explicitly-set TARGET_BOARD_INFO_FILE
...
Change-Id: Ie667a4d0070d1f0bbdfe9fa6d96871bcceb959b8
2012-01-19 10:43:49 -08:00
The Android Automerger
0ce12ef01d
IMM18
2012-01-18 21:20:54 -08:00
The Android Automerger
eec18b3e63
merge in ics-mr1-release history after reset to ics-mr1
2012-01-18 21:16:29 -08:00
Doug Zongker
e5ff5907be
add device-specific hooks at start of OTA phases
...
Change-Id: I47534e6d40e7918ee8cb9e87d76d9030b9273708
2012-01-17 10:55:37 -08:00
The Android Automerger
958ac1c5f8
IMM13
2012-01-13 16:21:18 -08:00
The Android Automerger
59fafc7c9b
merge in ics-mr1-release history after reset to ics-mr1
2012-01-13 16:16:51 -08:00
Jean-Baptiste Queru
783ab23697
am da3631db: (-s ours) am fdbb9f94: am 96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
...
* commit 'da3631dbd120219b883973bb22b64ebd3ef33078':
Remove mention of layoutopt/uix as they are gone.
2012-01-13 11:20:34 -08:00
Jean-Baptiste Queru
da3631dbd1
am fdbb9f94: am 96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
...
* commit 'fdbb9f94bc4b22f60fb46d0babb52c2a0d047aef':
Remove mention of layoutopt/uix as they are gone.
2012-01-12 17:20:28 -08:00
Jean-Baptiste Queru
fdbb9f94bc
am 96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
...
* commit '96a228bd7904b83274575522a267d178b3da2341':
Remove mention of layoutopt/uix as they are gone.
2012-01-12 17:18:48 -08:00
Ying Wang
df2b4b3aab
Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX.
...
Sometimes TARGET_TOOLS_PREFIX is passed in as command line makefile
variable or environmental variable without TARGET_TOOLCHAIN_ROOT.
This change computes TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX in
that case.
Change-Id: I0a37dc1f4d1e3e1951faeffd5e9f926f0a6614dd
2012-01-12 16:38:17 -08:00
Jean-Baptiste Queru
96a228bd79
Merge "Remove mention of layoutopt/uix as they are gone."
2012-01-12 14:07:20 -08:00
The Android Automerger
604b5429ba
IMM12
2012-01-12 14:04:09 -08:00
The Android Automerger
913d46388f
merge in ics-mr1-release history after reset to ics-mr1
2012-01-12 14:00:23 -08:00
Glenn Kasten
51bd3fa0b2
Merge "Fix build warning"
2012-01-12 10:14:23 -08:00
The Android Open Source Project
78aacee8e3
am 6019f7b0: Reconcile with ics-mr1-release
...
* commit '6019f7b0954cdf2e9063087c94f825778a6feda0':
IMM11
2012-01-12 08:58:04 -08:00
The Android Open Source Project
6019f7b095
Reconcile with ics-mr1-release
...
Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf
2012-01-12 08:56:04 -08:00
Glenn Kasten
1022e27642
Fix build warning
...
Change-Id: I1e3a76e4bdae5eec4f75c5d8eb9f533afab6d140
2012-01-12 07:30:27 -08:00
Xavier Ducrohet
4b5e4ba5fd
Remove mention of layoutopt/uix as they are gone.
2012-01-11 18:07:31 -08:00
The Android Automerger
6add6c759a
IMM11
2012-01-11 16:31:51 -08:00
The Android Automerger
5153c456df
merge in ics-mr1-release history after reset to ics-mr1
2012-01-11 16:27:43 -08:00
Brian Muramatsu
777e86a025
Merge "Avoid Rebuilding Core and VMTest Descriptions"
2012-01-11 11:32:17 -08:00
Jean-Baptiste Queru
3b1dbe9302
Merge "Revert "Reference new location of SDK toolchain""
2012-01-11 09:04:25 -08:00
Jean-Baptiste Queru
d75dbec617
Revert "Reference new location of SDK toolchain"
...
This reverts commit 1b834c6660
.
2012-01-11 09:00:41 -08:00
Conley Owens
b5370bc4cb
Merge "Add a module_path_check for vendor files"
2012-01-11 08:36:23 -08:00
Jean-Baptiste Queru
b6737c1366
Merge "Reference new location of SDK toolchain"
2012-01-11 06:36:55 -08:00
Jean-Baptiste Queru
cb8f66305c
Revert "Point arm toolchain to the new gcc-4.6 one."
...
This reverts commit 1f87795eef
.
2012-01-11 04:23:06 -08:00
Scott Main
dfd93fc209
am 5c267863: am f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
...
* commit '5c26786314c934819d460fb565be200ee8894ed0':
docs: add css for Android Design links and add link to site header
2012-01-10 17:18:50 -08:00
Scott Main
5c26786314
am f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
...
* commit 'f962eb101b21814556f4edeb7128508d47cf5564':
docs: add css for Android Design links and add link to site header
2012-01-10 17:16:53 -08:00
Scott Main
f962eb101b
Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
2012-01-10 17:14:34 -08:00
Vladimir Chtchetkine
d0ad72f38f
am 02169251: (-s ours) am 2cbcd24b: Cherry-picked from e6b969f3b
in master. Do not merge.
...
* commit '021692515734748c2632ce7a59fceed40a5eb9b6':
Cherry-picked from e6b969f3b
in master. Do not merge.
2012-01-10 16:44:44 -08:00
Vladimir Chtchetkine
0216925157
am 2cbcd24b: Cherry-picked from e6b969f3b
in master. Do not merge.
...
* commit '2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
Cherry-picked from e6b969f3b
in master. Do not merge.
2012-01-10 16:42:47 -08:00
Vladimir Chtchetkine
2cbcd24ba7
Cherry-picked from e6b969f3b
in master. Do not merge.
...
Add boot property enabling ADBD over QEMU
Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.
Change-Id: I978489c5acf46177b520e775d745bcc78f469837
2012-01-10 16:31:08 -08:00