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
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
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
Roman Nurik
5eed15e5cb
docs: Android Design: v3 update (CSS changes)
...
Change-Id: I00ffb845038f3054e03b41582859ecff4ab63a3e
2012-03-29 13:28:37 -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
Raphael Moll
2696eb6d11
am 3b1ebe7d
: Merge "SDK atree: support HOST_OUT location."
...
* commit '3b1ebe7dc291175886f21ffbbccdb98b560efabf':
SDK atree: support HOST_OUT location.
2012-03-27 17:53:32 -07:00
Raphael Moll
a8dd58a8a6
Merge "Allow make 3.82 to be used under Cygwin 1.7"
2012-03-27 16:16:45 -07:00
Raphael Moll
4c45699015
Allow make 3.82 to be used under Cygwin 1.7
...
(Manual merge of 76bf62d75e
)
Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
2012-03-27 14:35:34 -07:00
Raphael Moll
3b1ebe7dc2
Merge "SDK atree: support HOST_OUT location."
2012-03-27 11:40:47 -07:00
Jean-Baptiste Queru
acd3010843
am d17c8977
: am 0b6a436f
: Merge "Fix build"
...
* commit 'd17c89776e71f61852ac6ec3a75859a832cf1ba6':
Fix build
2012-03-27 08:08:41 -07:00
Jean-Baptiste Queru
d17c89776e
am 0b6a436f
: Merge "Fix build"
...
* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
Fix build
2012-03-27 08:07:09 -07:00
Jean-Baptiste Queru
0b6a436f09
Merge "Fix build"
2012-03-27 07:37:58 -07:00
Glenn Kasten
f396f56817
Fix build
...
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
2012-03-27 07:24:24 -07:00
Scott Main
dde474b618
am 33666ade
: docs: re-add android design icon, which had been removed from original location
...
* commit '33666ade7a13f2c466346b05b2a7dd1f0f80cb43':
docs: re-add android design icon, which had been removed from original location
2012-03-26 14:30:00 -07:00
Scott Main
33666ade7a
docs: re-add android design icon, which had been removed from original location
...
Change-Id: I30f3a38ab3e80e78595e28c46815874e4a84f2ed
2012-03-26 13:24:14 -07:00
The Android Open Source Project
6e271c76b6
Reconcile with ics-mr1-release
...
Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157
2012-03-26 09:47:10 -07:00
The Android Automerger
0db00f2ebf
IMM76D
2012-03-25 12:34:33 -07:00
The Android Automerger
b9624520b4
IMM76C
2012-03-23 14:38:56 -07:00
Andrew Hsieh
5d9aedef30
am 2245d17d
: Point to new linux prebuilt toolchain for SDK build
...
* commit '2245d17dc847ecb5371807466788552ca0198152':
Point to new linux prebuilt toolchain for SDK build
2012-03-22 11:03:14 -07:00
Andrew Hsieh
2245d17dc8
Point to new linux prebuilt toolchain for SDK build
...
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
2012-03-22 09:55:36 -07:00
Raphael Moll
74160ed4c4
SDK atree: support HOST_OUT location.
...
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
2012-03-21 22:34:48 -07:00
The Android Open Source Project
7000342da9
Reconcile with ics-mr1-release
...
Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8
2012-03-21 08:22:52 -07:00
The Android Automerger
54578dd1aa
IMM76B
2012-03-20 17:15:23 -07:00
Ying Wang
4243532d4a
am 301843ae
: am 29e44b7a
: Merge "Fix for "dexopt: No such file or directory" error"
...
* commit '301843ae3e5a5d121ecc01b58ea3f15ae07c860f':
Fix for "dexopt: No such file or directory" error
2012-03-20 15:22:30 -07:00
Ying Wang
301843ae3e
am 29e44b7a
: Merge "Fix for "dexopt: No such file or directory" error"
...
* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
Fix for "dexopt: No such file or directory" error
2012-03-20 15:20:14 -07:00
Ying Wang
29e44b7a83
Merge "Fix for "dexopt: No such file or directory" error"
2012-03-20 11:05:56 -07:00
The Android Automerger
fe0a544ea6
IMM76
2012-03-16 19:36:35 -07:00
The Android Automerger
83defc2504
merge in ics-mr1-release history after reset to ics-mr1
2012-03-16 19:30:18 -07:00
The Android Automerger
3ca86b2abd
IMM72B
2012-03-13 17:16:36 -07:00
The Android Automerger
f44b3505ad
IMM72
2012-03-12 19:36:17 -07:00
The Android Automerger
ca97d052d7
merge in ics-mr1-release history after reset to ics-mr1
2012-03-12 19:30:56 -07:00
The Android Automerger
031e57b381
second try
2012-03-11 00:58:08 -08:00
The Android Automerger
c3afa8fe03
IMM68C
2012-03-10 09:10:29 -08:00
The Android Automerger
4ea508be53
IMM70
2012-03-10 09:08:53 -08:00