Scott Main
1882adfd49
am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit '76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
2012-04-19 19:27:59 -07:00
Scott Main
27e5384054
am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit '76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
2012-04-19 19:27:39 -07:00
Scott Main
76b0139a50
docs: update doc template to make the Resources side nav wider (+40px)
...
Change-Id: I173e64d57f9ec31bf0c3912bca5d46a5f7c78338
2012-04-19 19:23:04 -07:00
Colin Cross
b01807b36d
Merge changes I9a390206,If3e9e846
...
* changes:
build: separate dist tools and ota tools
build: remove unused ota tools
2012-04-19 17:15:44 -07:00
Jean-Baptiste Queru
700741cf45
Merge "Use an https URL"
2012-04-19 15:06:10 -07:00
Jean-Baptiste Queru
5d4bcb490e
Use an https URL
...
Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
2012-04-19 14:53:27 -07:00
Iliyan Malchev
aad195e79e
vbox_x86: add a 256M ext4 cache partition
...
Change-Id: If88895f60308673526a579a96d5b1ed9206c0241
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-19 14:50:10 -07:00
Colin Cross
c312f31871
build: separate dist tools and ota tools
...
aapt is not needed for a dist build and not available in a pdk dist
build. Create a new list DISTTOOLS that dist builds depends on,
and change OTATOOLS to be DISTTOOLS plus aapt, which is build by
make otatools.
Change-Id: I9a39020640b0e2cade8073aa14ee2ada9a20d78b
2012-04-19 13:54:39 -07:00
Colin Cross
4049130cba
build: remove unused ota tools
...
genext2fs, tune2fs, and e2fsck are no longer used by mkuserimg.sh.
Change-Id: If3e9e846e021de0973bde2702e60acdc9f4c57c7
2012-04-19 13:29:27 -07:00
The Android Automerger
396c8cfa15
IMM76J
2012-04-19 12:15:03 -07:00
Keun young Park
0da5e0ba36
Merge "enable recovery img build for PDK"
2012-04-19 10:25:20 -07:00
Keun young Park
782610165f
enable recovery img build for PDK
...
Bug: 6363041
Change-Id: I25dff887dd0946c9506926e66e0514390c20692e
2012-04-19 09:55:24 -07:00
Colin Cross
21adee0184
Move pdk fusion platform.zip file under vendor/pdk
...
Look for the platform.zip file in:
vendor/pdk/DEVICE/PRODUCT-BUILD_VARIANT/platform/platform.zip
Change-Id: I275029842fdf13867d5141549ca8c39abb23600b
2012-04-19 00:50:00 -07:00
Ying Wang
616e596385
Write out export_includes whenever the module is built.
...
Bug: 6362268
Change-Id: If872cf8fe597a02e6ca740a181cea85f486df98e
2012-04-18 17:35:55 -07:00
Ying Wang
fdb236779d
Merge "Revert "Write out export_includes whenever the module is built.""
2012-04-18 16:55:27 -07:00
Ying Wang
c32af65886
Revert "Write out export_includes whenever the module is built."
...
This reverts commit 40c34f3778
2012-04-18 16:55:07 -07:00
Ying Wang
fc17f274bb
Merge "Write out export_includes whenever the module is built."
2012-04-18 16:38:00 -07:00
Ying Wang
40c34f3778
Write out export_includes whenever the module is built.
...
Bug: 6362268
Change-Id: Ic5d028c108423c694736a06c05ec13093d42f1b8
2012-04-18 16:30:17 -07:00
Brett Chabot
a8df794649
Merge "Add smoke tests to sdk build."
2012-04-18 14:56:18 -07:00
Ying Wang
08f5e9a54c
Add back ARM_EABI_TOOLCHAIN.
...
ARM_EABI_TOOLCHAIN is still used by the kernel build.
Change-Id: I5cdad0b478c0836e06a2af567e4e212602da1f3b
2012-04-17 18:10:11 -07:00
Mike Lockwood
8945c2609e
Merge "core.mk: Add rule for init.usb.rc"
2012-04-17 10:40:04 -07:00
David 'Digit' Turner
2056c25edd
resolved conflicts for merge of 296e4828
to master
...
Change-Id: Iae41a458f1eed497119c3abe4bf27194821c075d
2012-04-17 14:50:47 +02:00
David Turner
296e4828ae
am 81d54025: am f04ee373: Merge "Update gdbclient for x86 target"
...
* commit '81d54025c75793c9f8cb2290c81b4075f9274be1':
Update gdbclient for x86 target
2012-04-17 04:51:52 -07:00
David Turner
81d54025c7
am f04ee373: Merge "Update gdbclient for x86 target"
...
* commit 'f04ee373123fab58dfd3adc06966cfe127abf6a6':
Update gdbclient for x86 target
2012-04-17 04:49:17 -07:00
David Turner
f04ee37312
Merge "Update gdbclient for x86 target"
2012-04-17 02:27:50 -07:00
Brett Chabot
1e420b6063
Add smoke tests to sdk build.
...
Change-Id: If614ad21b3323e16b358f248c44c15b0fe5f0e9a
2012-04-16 18:29:48 -07:00
Andrew Flynn
3bdcae333f
Merge "Default ro.carrier to unknown"
2012-04-16 10:25:27 -07:00
Andrew Flynn
dc790b0f1d
Default ro.carrier to unknown
...
This was previously performed by init.c
Change-Id: Id34c636e06dfe2766446f909e9d05557163d812d
2012-04-16 10:16:02 -07:00
Eric Laurent
baf3450462
Merge "Fix problem with audio policy configuration file."
2012-04-14 08:49:33 -07:00
Eric Laurent
55f3f8549f
Fix problem with audio policy configuration file.
...
Having the copy of default audio_policy.conf file in generic_no_telephony.mk
doesn't work because of multiple inheritance on certain products.
Move it to board/generic/device.mk to be consistent with how the audio HAL
modules are managed.
Issue 6333980.
Change-Id: If6053ad596b6f693f43c72ba9cc54cb7a7cfa233
2012-04-13 18:58:20 -07:00
The Android Automerger
f7e1cbc4b6
IMM76I
2012-04-13 14:20:51 -07:00
Jean-Baptiste Queru
dbff3f5b77
Whitelist widevine
...
Change-Id: I4863b335ebc02d642874a4dd3dd9a8af93455d7b
2012-04-13 13:37:56 -07:00
Kevin Hester
db8698be85
am 6c703628: Allow packages to place manifest files in any directory
...
* commit '6c703628c54275797caf2b524686d3dd2e34385c':
Allow packages to place manifest files in any directory
2012-04-13 07:53:58 -07:00
Kevin Hester
6c703628c5
Allow packages to place manifest files in any directory
...
via a new definition LOCAL_ABS_MANIFEST_FILE. The existing
LOCAL_MANIFEST_FILE variable will also be supported.
(Necessary if manifests are being programmatically generated in the
intermediates directory)
Change-Id: I77a8eb1b8040b966b944464281d00c161ff34d3c
2012-04-12 15:35:53 -07:00
Robert Greenwalt
843bc2ccd1
Add MDNS to the build.
...
Change-Id: I025fe959a38344bb072ec13701f934a4fb9a5f36
2012-04-12 14:16:30 -07:00
Colin Cross
dc8f8e4a75
Merge event-log-tags from platform.zip with local *.logtags
...
PDK fusion builds will include system/etc/event-log-tags from a full
build from platform.zip, which needs to be merged into the event-log-tags
built locally based on *.logtags from projects that have source.
Bug: 6297675
Change-Id: I91409f37c6dc88d6942eade2946155c2a6640b6f
2012-04-12 13:59:53 -07:00
Stephen Hines
162a817521
Merge "More Clang tweaks to the build system."
2012-04-11 23:35:03 -07:00
Mike Lockwood
a0d8a6aace
core.mk: Add rule for init.usb.rc
...
Change-Id: I2068c08648aad26bbfb35a6a7890757b5d8b01c9
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-04-11 12:37:06 -07:00
Eric Laurent
0ee7236b3a
Merge "Fix audio broken for sdk builds."
2012-04-10 18:05:08 -07:00
Eric Laurent
d0c6327edd
Fix audio broken for sdk builds.
...
Add missing audio policy configuration file copy for sdk product.
Issue 6289703.
Change-Id: Ica9ce813d945dd76b836c8bd68f3e168a7d537e0
2012-04-10 17:59:22 -07:00
Andreas Huber
19b2be5f8d
Merge "Revert "ARM: compile everything with relro / bind_now.""
2012-04-10 14:54:38 -07:00
Raphael Moll
d740b20bdf
am 048d741f: am 8f5c42e7: am 2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
...
* commit '048d741f0ae835928cc9419d15db187a26e594bb':
Merge "SDK: Also read sdk/build/tools.OS.atree"
2012-04-10 14:48:50 -07:00
Raphael Moll
048d741f0a
am 8f5c42e7: am 2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
...
* commit '8f5c42e778afc5a3bfa2c6a1c6258889690a558b':
Merge "SDK: Also read sdk/build/tools.OS.atree"
2012-04-10 14:46:43 -07:00
Raphael Moll
8f5c42e778
am 2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
...
* commit '2db32730e79cafcf13e1f898a7bee7f82b0449d6':
Merge "SDK: Also read sdk/build/tools.OS.atree"
2012-04-10 14:44:37 -07:00
Ying Wang
3741c322ac
Merge "Merge the NOTICE files when doing pdk fusion build."
2012-04-10 13:59:26 -07:00
Nick Kralevich
b3789be766
Revert "ARM: compile everything with relro / bind_now."
...
This reverts commit 020e4919e8
.
2012-04-10 13:13:29 -07:00
Raphael Moll
2db32730e7
Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
2012-04-10 12:45:47 -07:00
Raphael Moll
b3700ab773
Merge "SDK: Also read sdk/build/tools.OS.atree"
...
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.
(cherry picked from commit 3ab307a68c
)
Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24
2012-04-10 12:21:46 -07:00
Jean-Baptiste Queru
feca6d284c
am 6c7fd59d: am 33c98d9a: am 59d7372d: Merge "Bump DX Java heap to 2GB."
...
* commit '6c7fd59d96930183bc6847423892ba797be3bba6':
Bump DX Java heap to 2GB.
2012-04-10 11:14:03 -07:00
Jean-Baptiste Queru
6c7fd59d96
am 33c98d9a: am 59d7372d: Merge "Bump DX Java heap to 2GB."
...
* commit '33c98d9ab283913b7b76d8a33e138aafe9724d68':
Bump DX Java heap to 2GB.
2012-04-10 11:11:50 -07:00