Jean-Baptiste Queru
a4354dd8ce
am 2ba46ecd: Merge "Add Esperanto to the list of locales"
...
* commit '2ba46ecdc4bca804ffedc38694910dc1322b42d1':
Add Esperanto to the list of locales
2012-05-02 11:27:35 -07:00
Jean-Baptiste Queru
2ba46ecdc4
Merge "Add Esperanto to the list of locales"
2012-05-02 07:39:16 -07:00
Raphael Moll
c094c0a68f
am d0831659: Merge "Split target/product/sdk.mk into sdk.git"
...
* commit 'd0831659af544b93f3a9592a1cd4f85ff89e8635':
Split target/product/sdk.mk into sdk.git
2012-04-23 15:43:35 -07:00
The Android Open Source Project
76f57fe373
Reconcile with ics-mr1-release
...
Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
2012-04-23 14:40:15 -07:00
Raphael Moll
d0831659af
Merge "Split target/product/sdk.mk into sdk.git"
2012-04-23 12:44:00 -07:00
Jean-Baptiste Queru
695a2b3fd9
am 9b16b129: Merge "Switch to new locations of toolchains"
...
* commit '9b16b1293255be054a84e6f39098c7a35357f636':
Switch to new locations of toolchains
2012-04-23 09:23:58 -07:00
Jean-Baptiste Queru
9b16b12932
Merge "Switch to new locations of toolchains"
2012-04-23 08:31:53 -07:00
Andrew Hsieh
acd812d6a7
am 11e0192d: Merge "Add goldfish audio hw to board/generic_x86"
...
* commit '11e0192d29459aab8f3acebaae113eece492069f':
Add goldfish audio hw to board/generic_x86
2012-04-21 00:52:28 -07:00
Andrew Hsieh
11e0192d29
Merge "Add goldfish audio hw to board/generic_x86"
2012-04-20 16:52:27 -07:00
Jean-Baptiste Queru
9987dbbbb4
am d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
...
* commit 'd0427e493edf2e4de2bd60fd1cc8253e9de233fd':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
2012-04-20 16:43:25 -07:00
Jean-Baptiste Queru
c4aa4ff355
am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."
...
* commit '810b0d8bb4a458c5a92c0bed48b75cbf27f1410d':
Fix build problems with gcc-4.6.x.
2012-04-20 16:43:23 -07:00
The Android Automerger
b0936b79fa
IMM76K
2012-04-20 16:20:26 -07:00
Jean-Baptiste Queru
a50ef1c124
Switch to new locations of toolchains
...
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
2012-04-20 16:15:42 -07:00
Raphael Moll
f66f3476e4
Split target/product/sdk.mk into sdk.git
...
This changes target/product/sdk.mk so that the list of tools
and libs to build for the SDK be actually defined in both
sdk.git and development.git.
Depends on dev.git change I6bbc6644a and sdk.git change Id270eba6
Change-Id: I790df85ea8620f73c769aec0f92f474de60b63f9
2012-04-20 14:14:55 -07:00
Scott Main
9041aa50fb
am 6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:35:12 -07:00
Scott Main
6b719da316
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
Change-Id: I0125b1d585a0adde7f5f485f3288fdc7a8a55faf
2012-04-20 10:19:54 -07:00
Jean-Baptiste Queru
d0427e493e
Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
2012-04-20 08:30:21 -07:00
Jean-Baptiste Queru
810b0d8bb4
Merge "Fix build problems with gcc-4.6.x."
2012-04-20 08:30:05 -07:00
Jing Yu
c856e31523
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
...
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html
-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.
This patch does not affect gcc-4.4.3 build.
Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
2012-04-20 07:53:16 -07:00
Doug Kwan
422a3650d3
Fix build problems with gcc-4.6.x.
...
Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
2012-04-20 07:52:47 -07:00
Andrew Hsieh
ecd054c609
Add goldfish audio hw to board/generic_x86
...
Without it, app with audio may crash x86 emulator
Change-Id: Ie9b30a2827c0a559e7cf73b7b21604f36c379483
2012-04-20 16:08:14 +08: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
The Android Automerger
396c8cfa15
IMM76J
2012-04-19 12:15:03 -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
The Android Automerger
f7e1cbc4b6
IMM76I
2012-04-13 14:20:51 -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
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
33c98d9ab2
am 59d7372d: Merge "Bump DX Java heap to 2GB."
...
* commit '59d7372dec8b4befa06496b94bd7eef06d506696':
Bump DX Java heap to 2GB.
2012-04-10 11:09:40 -07:00
Mark D Horn
7d0ede730d
Update gdbclient for x86 target
...
Check the Target Architecture to choose the correct
version of the gdb client.
Change-Id: I1d75df235a18e60c6a7142a95c93b0fce69ee736
Signed-off-by: Mark D Horn <mark.d.horn@intel.com >
2012-04-10 10:37:07 -07:00
Jean-Baptiste Queru
59d7372dec
Merge "Bump DX Java heap to 2GB."
2012-04-10 09:39:09 -07:00
Jean-Baptiste Queru
64cd96ce7f
Bump DX Java heap to 2GB.
...
Change-Id: I240a24f9bb8511fea8f420f76b4541018ae79a0c
2012-04-10 08:21:21 -07:00
Kenny Root
026e219f78
am b22f6853: Merge changes I5a63fd61,I7c6f59fe
...
* commit 'b22f6853d9e6dd45491a20e31a63beda6c0f3717':
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
2012-04-06 18:06:09 -07:00
Kenny Root
b22f6853d9
Merge changes I5a63fd61,I7c6f59fe
...
* changes:
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
2012-04-06 14:42:46 -07:00
Stephen Smalley
56882bf9b4
Support the setting of file security contexts in OTA and update packages.
...
Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.
Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24
Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
2012-04-06 15:35:41 -04:00
Stephen Smalley
5042392262
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
...
This configuration is used to determine the file security contexts
to set on the files in the yaffs2 or ext4 image that is generated.
This is similar to the android_filesystem_config.h tables for determining
the UID/GID/mode, but as a configuration rather than code.
Change-Id: I7c6f59fe7cb8bc4c86c8790f991b12dd93a61f68
2012-04-06 15:34:37 -04:00
The Android Automerger
a399ee40fe
IMM76H
2012-04-05 15:48:38 -07:00
Roman Nurik
c403055b10
am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
...
* commit '51c9e67ec01d37bb67881ef06b7f38d4da36e945':
docs: Android Design: v3 update (CSS changes)
2012-04-04 10:55:53 -07:00
Roman Nurik
51c9e67ec0
Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
2012-04-04 10:53:51 -07:00
Scott Main
0af1d53ef2
am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
...
* commit '1048bd3fb3c34de37375a6f1c8cd10f88411f758':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
2012-04-03 14:00:18 -07:00
Scott Main
1048bd3fb3
docs: revert the change that made "new" tags stick on the first line
...
and thus allow them to wrap.
Change-Id: Id6b68e38a11f4fb314a0408c78bf7e2b543c8d00
2012-04-03 13:26:25 -07:00
The Android Automerger
95e56d7b29
IMM76G
2012-04-02 15:31:28 -07:00
Roman Nurik
5eed15e5cb
docs: Android Design: v3 update (CSS changes)
...
Change-Id: I00ffb845038f3054e03b41582859ecff4ab63a3e
2012-03-29 13:28:37 -07:00
The Android Automerger
41a2c75b54
IMM76F
2012-03-29 13:09:16 -07:00
The Android Automerger
2b88d205a5
IMM76E
2012-03-28 14:45:44 -07:00
Raphael Moll
f515ad2797
am b6addfb2: am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
...
* commit 'b6addfb250606175ca679c8fb6e549cd98eee5b0':
Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:55:44 -07:00
Raphael Moll
d0bcf3869e
am 2696eb6d: am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
...
* commit '2696eb6d11759e8a0cd839e9f10c90e38efea21a':
SDK atree: support HOST_OUT location.
2012-03-27 17:55:43 -07:00
Raphael Moll
b6addfb250
am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
...
* commit 'a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0':
Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:53:32 -07:00