OSDN Git Service
The Android Automerger [Wed, 11 Apr 2012 14:13:23 +0000 (07:13 -0700)]
JRN11
The Android Automerger [Wed, 11 Apr 2012 13:59:35 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
Eric Laurent [Wed, 11 Apr 2012 01:05:08 +0000 (18:05 -0700)]
Merge "Fix audio broken for sdk builds."
Eric Laurent [Wed, 11 Apr 2012 00:59:22 +0000 (17:59 -0700)]
Fix audio broken for sdk builds.
Add missing audio policy configuration file copy for sdk product.
Issue
6289703.
Change-Id: Ica9ce813d945dd76b836c8bd68f3e168a7d537e0
The Android Automerger [Tue, 10 Apr 2012 23:09:04 +0000 (16:09 -0700)]
JRN10C
Nick Kralevich [Tue, 10 Apr 2012 20:13:29 +0000 (13:13 -0700)]
Revert "ARM: compile everything with relro / bind_now."
This reverts commit
020e4919e89a824783dbe8716bc56785267323f7.
Andreas Huber [Tue, 10 Apr 2012 21:54:38 +0000 (14:54 -0700)]
Merge "Revert "ARM: compile everything with relro / bind_now.""
Raphael Moll [Tue, 10 Apr 2012 21:48:50 +0000 (14:48 -0700)]
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"
Raphael Moll [Tue, 10 Apr 2012 21:46:43 +0000 (14:46 -0700)]
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"
Raphael Moll [Tue, 10 Apr 2012 21:44:37 +0000 (14:44 -0700)]
am
2db32730: Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
* commit '
2db32730e79cafcf13e1f898a7bee7f82b0449d6':
Merge "SDK: Also read sdk/build/tools.OS.atree"
Ying Wang [Tue, 10 Apr 2012 20:59:26 +0000 (13:59 -0700)]
Merge "Merge the NOTICE files when doing pdk fusion build."
Nick Kralevich [Tue, 10 Apr 2012 20:13:29 +0000 (13:13 -0700)]
Revert "ARM: compile everything with relro / bind_now."
This reverts commit
020e4919e89a824783dbe8716bc56785267323f7.
Raphael Moll [Tue, 10 Apr 2012 19:45:47 +0000 (12:45 -0700)]
Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""
Raphael Moll [Fri, 2 Mar 2012 20:40:04 +0000 (12:40 -0800)]
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
3ab307a68cbc30ab37d15f62e88dd19b51ac9632)
Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24
The Android Automerger [Tue, 10 Apr 2012 18:28:05 +0000 (11:28 -0700)]
JRN10B
Jean-Baptiste Queru [Tue, 10 Apr 2012 18:14:03 +0000 (11:14 -0700)]
am
6c7fd59d: am
33c98d9a: am
59d7372d: Merge "Bump DX Java heap to 2GB."
* commit '
6c7fd59d96930183bc6847423892ba797be3bba6':
Bump DX Java heap to 2GB.
Jean-Baptiste Queru [Tue, 10 Apr 2012 18:11:50 +0000 (11:11 -0700)]
am
33c98d9a: am
59d7372d: Merge "Bump DX Java heap to 2GB."
* commit '
33c98d9ab283913b7b76d8a33e138aafe9724d68':
Bump DX Java heap to 2GB.
Jean-Baptiste Queru [Tue, 10 Apr 2012 18:09:40 +0000 (11:09 -0700)]
am
59d7372d: Merge "Bump DX Java heap to 2GB."
* commit '
59d7372dec8b4befa06496b94bd7eef06d506696':
Bump DX Java heap to 2GB.
Ying Wang [Tue, 10 Apr 2012 00:04:12 +0000 (17:04 -0700)]
Merge the NOTICE files when doing pdk fusion build.
Bug:
6297249
Change-Id: I693ab15e5a2eacda3c8b9d2ce36469ea177ae178
Jean-Baptiste Queru [Tue, 10 Apr 2012 16:39:08 +0000 (09:39 -0700)]
Merge "Bump DX Java heap to 2GB."
Jean-Baptiste Queru [Tue, 10 Apr 2012 15:21:21 +0000 (08:21 -0700)]
Bump DX Java heap to 2GB.
Change-Id: I240a24f9bb8511fea8f420f76b4541018ae79a0c
The Android Automerger [Tue, 10 Apr 2012 14:12:32 +0000 (07:12 -0700)]
JRN10
The Android Automerger [Tue, 10 Apr 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
Kenny Root [Mon, 9 Apr 2012 22:12:58 +0000 (15:12 -0700)]
Merge "resolved conflicts for merge of
a86fcc29 to master"
Kenny Root [Sun, 8 Apr 2012 17:42:34 +0000 (10:42 -0700)]
resolved conflicts for merge of
a86fcc29 to master
Change-Id: I3868c19bfd309b5b43b5642152a120931fe37315
Ying Wang [Mon, 9 Apr 2012 19:43:09 +0000 (12:43 -0700)]
Merge "Build system support to export include paths"
Nick Kralevich [Mon, 9 Apr 2012 19:30:12 +0000 (12:30 -0700)]
Merge "ARM: compile everything with relro / bind_now."
Doug Zongker [Mon, 9 Apr 2012 19:28:14 +0000 (12:28 -0700)]
Merge "fix broken OTAs; format() is called with wrong # of args"
Doug Zongker [Mon, 9 Apr 2012 19:27:43 +0000 (12:27 -0700)]
fix broken OTAs; format() is called with wrong # of args
Change-Id: Id95d345158b36f149c12342d6cd1f03f2875b110
Ying Wang [Mon, 9 Apr 2012 19:16:23 +0000 (12:16 -0700)]
Fix deps for notice generation.
With "foo bar : req", the build command will be run separately for foo
and bar.
Instead with "foo : bar" and "bar : req", the build command will be run
only once to produce both targets.
Also running the same build command concurrently may lead to build race
condition.
Change-Id: I8af2817546a7e2697a553c9320bd10f6bd4f20a2
Nick Kralevich [Tue, 20 Mar 2012 18:35:24 +0000 (11:35 -0700)]
ARM: compile everything with relro / bind_now.
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.
See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html
Stop using the custom linker script, which inhibits
relro / bind_now support.
Change-Id: Iaebfbbb492299004f9da92b649985b6cd67d8c97
The Android Automerger [Mon, 9 Apr 2012 14:13:34 +0000 (07:13 -0700)]
JRN09
The Android Automerger [Mon, 9 Apr 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
Kenny Root [Sat, 7 Apr 2012 01:07:44 +0000 (18:07 -0700)]
am
026e219f: am
b22f6853: Merge changes I5a63fd61,I7c6f59fe
* commit '
026e219f780a1d257e78fe80419a10655dc615a8':
Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
Kenny Root [Sat, 7 Apr 2012 01:06:09 +0000 (18:06 -0700)]
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.
The Android Automerger [Fri, 6 Apr 2012 23:08:37 +0000 (16:08 -0700)]
JRN05E
Kenny Root [Fri, 6 Apr 2012 21:42:41 +0000 (14:42 -0700)]
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.
The Android Automerger [Fri, 6 Apr 2012 21:25:49 +0000 (14:25 -0700)]
JRN05D
Nick Sanders [Fri, 6 Apr 2012 21:11:10 +0000 (14:11 -0700)]
am
df49771a: Allow factory specific kernel commandline
* commit '
df49771a4a82a147e287190f872ab9d0e237a69f':
Allow factory specific kernel commandline
The Android Automerger [Fri, 6 Apr 2012 20:19:44 +0000 (13:19 -0700)]
JRN05C
Stephen Smalley [Thu, 9 Feb 2012 18:36:21 +0000 (13:36 -0500)]
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
Stephen Smalley [Fri, 13 Jan 2012 13:12:31 +0000 (08:12 -0500)]
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
Iliyan Malchev [Thu, 5 Apr 2012 23:11:15 +0000 (16:11 -0700)]
init.vbox_x86.rc: mount data & cache partitions from /dev/sdb
Change-Id: Ifa14f0be875848297883d2ee66372a355a4174e6
Signed-off-by: Iliyan Malchev <malchev@google.com>
Nick Sanders [Fri, 6 Apr 2012 01:30:02 +0000 (18:30 -0700)]
Allow factory specific kernel commandline
* BOARD_KERNEL_CMDLINE_FACTORY_BOOT can be set to
add kernel commandline items to the factory ramdisk,
such as fiq_debugger.console_enable=Y
Change-Id: Iee4060b96eaeecc517975c56342fd5445b1feabf
Signed-off-by: Nick Sanders <nsanders@google.com>
Eino-Ville Talvala [Fri, 6 Apr 2012 00:09:18 +0000 (17:09 -0700)]
Add new camera system include path to pathmap.
Change-Id: Ia4200dbffa90397a8a48d00139647c45646af734
The Android Automerger [Fri, 6 Apr 2012 00:08:47 +0000 (17:08 -0700)]
JRN05B take two
The Android Automerger [Thu, 5 Apr 2012 22:58:54 +0000 (15:58 -0700)]
JRN05B
The Android Automerger [Thu, 5 Apr 2012 14:12:21 +0000 (07:12 -0700)]
JRN05
The Android Automerger [Thu, 5 Apr 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
The Android Automerger [Thu, 5 Apr 2012 05:17:45 +0000 (22:17 -0700)]
JRN04C
Iliyan Malchev [Wed, 4 Apr 2012 22:57:20 +0000 (15:57 -0700)]
Merge "vbox_x86: update init.vbox_x86.rc, remove custom init.rc"
The Android Automerger [Wed, 4 Apr 2012 22:52:02 +0000 (15:52 -0700)]
JRN04B
Iliyan Malchev [Tue, 3 Apr 2012 20:06:15 +0000 (13:06 -0700)]
vbox_x86: update init.vbox_x86.rc, remove custom init.rc
-- remove local copy of init.rc (start using system/core/rootdir/init.rc)
-- sync init.vbox_x86.rc with init.goldfish.rc (at SHA
a503456526359767ffb383a06835308f62172dde)
-- Make the following changes:
a) add mount calls
b) remove call to init.goldfish.sh
c) enable service netcfg
-- inherit frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk
Change-Id: Ic5f6b2da32dc79de85f3d7b93dffb483e480e098
Signed-off-by: Iliyan Malchev <malchev@google.com>
Roman Nurik [Wed, 4 Apr 2012 21:56:35 +0000 (14:56 -0700)]
am
31fc69c2: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
31fc69c218a6fb46c43a650cc0530e12853066bb':
Dima Zavin [Wed, 4 Apr 2012 19:17:17 +0000 (12:17 -0700)]
Merge "target/product: have the sdk product pull in the apns"
Roman Nurik [Wed, 4 Apr 2012 18:02:35 +0000 (11:02 -0700)]
am
67af236d: am
c403055b: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
67af236dc582e6350a3bf06ce78d5b21791b1a0a':
Roman Nurik [Wed, 4 Apr 2012 18:00:33 +0000 (11:00 -0700)]
am
5b250fbc: am
dceeaac8: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
5b250fbc433ff9143bf5717f636b0cbb8187bd35':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:58:50 +0000 (10:58 -0700)]
am
c403055b: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
c403055b10331e717fbe2420f4b92ce99e30e3f2':
Roman Nurik [Wed, 4 Apr 2012 17:58:16 +0000 (10:58 -0700)]
am
dceeaac8: am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
dceeaac8bf6e4b71885a1468a32ffad1324d0022':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:55:53 +0000 (10:55 -0700)]
am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
51c9e67ec01d37bb67881ef06b7f38d4da36e945':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:55:47 +0000 (10:55 -0700)]
am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
51c9e67ec01d37bb67881ef06b7f38d4da36e945':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:55:35 +0000 (10:55 -0700)]
am
51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '
51c9e67ec01d37bb67881ef06b7f38d4da36e945':
docs: Android Design: v3 update (CSS changes)
Roman Nurik [Wed, 4 Apr 2012 17:53:51 +0000 (10:53 -0700)]
Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
Stephen Hines [Wed, 4 Apr 2012 15:02:49 +0000 (08:02 -0700)]
Merge "Add support for building with AddressSanitizer."
Stephen Hines [Wed, 4 Apr 2012 15:02:43 +0000 (08:02 -0700)]
Merge "Include Clang headers from ".../include" directory."
The Android Automerger [Wed, 4 Apr 2012 14:13:00 +0000 (07:13 -0700)]
JRN04
The Android Automerger [Wed, 4 Apr 2012 13:59:38 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
Dima Zavin [Wed, 4 Apr 2012 03:19:20 +0000 (20:19 -0700)]
target/product: have the sdk product pull in the apns
Bug:
6274210
Change-Id: I23c76975312a7fb60926853cdbde8065ae8b5f76
Signed-off-by: Dima Zavin <dima@android.com>
Scott Main [Wed, 4 Apr 2012 01:11:22 +0000 (18:11 -0700)]
am
ae9784cc: am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
ae9784cc50286542b406d14623d0ac059b994532':
Eric Laurent [Thu, 22 Mar 2012 18:17:24 +0000 (11:17 -0700)]
added audio_policy.conf file
Change-Id: Icde73ce66208972914324d64927fef816aa68ca6
The Android Automerger [Tue, 3 Apr 2012 22:34:24 +0000 (15:34 -0700)]
JRN03C
The Android Automerger [Tue, 3 Apr 2012 22:32:02 +0000 (15:32 -0700)]
JRN03B
Scott Main [Tue, 3 Apr 2012 21:10:19 +0000 (14:10 -0700)]
am
b114e228: am
4221fdbd: am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
b114e228a685cbc41f29d6d1b9c0925aff062b96':
Scott Main [Tue, 3 Apr 2012 21:10:18 +0000 (14:10 -0700)]
am
ad921800: am
0af1d53e: am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
ad92180046266eb0cbf0ea76b769e68caef5e778':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
Scott Main [Tue, 3 Apr 2012 21:07:59 +0000 (14:07 -0700)]
am
4221fdbd: am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
4221fdbde9c240cdae20d837867d7fd0a5977273':
Scott Main [Tue, 3 Apr 2012 21:06:28 +0000 (14:06 -0700)]
am
0af1d53e: am
1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
* commit '
0af1d53ef2db4c1e72b675e9868610e1d6b11236':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
Scott Main [Tue, 3 Apr 2012 21:02:40 +0000 (14:02 -0700)]
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.
Scott Main [Tue, 3 Apr 2012 21:00:25 +0000 (14:00 -0700)]
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.
Scott Main [Tue, 3 Apr 2012 21:00:18 +0000 (14:00 -0700)]
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.
Scott Main [Tue, 3 Apr 2012 20:26:25 +0000 (13:26 -0700)]
docs: revert the change that made "new" tags stick on the first line
and thus allow them to wrap.
Change-Id: Id6b68e38a11f4fb314a0408c78bf7e2b543c8d00
Tor Norbye [Tue, 3 Apr 2012 19:42:28 +0000 (12:42 -0700)]
Merge "Revert "Update versions of the Eclipse prebuilt libraries""
Tor Norbye [Tue, 3 Apr 2012 18:14:16 +0000 (11:14 -0700)]
Revert "Update versions of the Eclipse prebuilt libraries"
This reverts commit
94c85043c18a62dd3fc53a4f15faa9b08aeccc52.
Mike Lockwood [Tue, 3 Apr 2012 17:09:34 +0000 (10:09 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
Ying Wang [Tue, 3 Apr 2012 16:27:28 +0000 (09:27 -0700)]
Merge "Support to run DroidDoc in unbundled builds."
Tor Norbye [Tue, 3 Apr 2012 14:56:32 +0000 (07:56 -0700)]
Merge "Update versions of the Eclipse prebuilt libraries"
Evgeniy Stepanov [Fri, 30 Mar 2012 08:15:12 +0000 (12:15 +0400)]
Add support for building with AddressSanitizer.
Change-Id: I559d21bbeb9f869f51e48ce18247ceaf766768b4
Evgeniy Stepanov [Fri, 30 Mar 2012 08:18:52 +0000 (12:18 +0400)]
Include Clang headers from ".../include" directory.
Do it with -isystem instead of -I.
Change-Id: I70fd55772e59a35f0b5a56816d61120f4921f4a4
The Android Automerger [Tue, 3 Apr 2012 10:39:36 +0000 (03:39 -0700)]
JRN03
The Android Automerger [Tue, 3 Apr 2012 10:28:02 +0000 (03:28 -0700)]
merge in jb-release history after reset to master
Ying Wang [Tue, 3 Apr 2012 01:21:36 +0000 (18:21 -0700)]
Support to run DroidDoc in unbundled builds.
Change-Id: Ia5ace10ed75c451e346e289f0c534ad619abdb65
The Android Automerger [Mon, 2 Apr 2012 21:48:10 +0000 (14:48 -0700)]
JRN02D
Narayan Kamath [Mon, 2 Apr 2012 17:19:31 +0000 (18:19 +0100)]
Changes to C++ protocol buffer compilation.
Generate C++ code for all .proto files before attempting
to compile them. This takes care of the case where generated
.pb.cc files include other header / c++ files due to proto
imports in the original .proto files.
Change-Id: I26513842618fd31f0b33a3f10df2a5e556094515
Ying Wang [Mon, 2 Apr 2012 16:17:56 +0000 (09:17 -0700)]
Merge "Support to build pdk and pdk fusion."
Ying Wang [Mon, 2 Apr 2012 16:11:47 +0000 (09:11 -0700)]
Merge "Generate platfrom.zip for build goal "platform"."
The Android Automerger [Mon, 2 Apr 2012 14:11:31 +0000 (07:11 -0700)]
JRN02
The Android Automerger [Mon, 2 Apr 2012 13:59:38 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
Colin Cross [Mon, 2 Apr 2012 00:54:04 +0000 (17:54 -0700)]
Merge "Remove base_intermediates from LOCAL_C_INCLUDES"
Colin Cross [Sat, 31 Mar 2012 02:31:00 +0000 (19:31 -0700)]
Remove base_intermediates from LOCAL_C_INCLUDES
base_intermediates is not used anywhere in the main build system,
and should not be part of LOCAL_C_INCLUDES. It is used by
external/webkit/Android.mk as a local variable, which causes
the libwebcore_intermediates directory to be added to the include
path for every module.
Change-Id: Iddeee880add4b6f694a15d1900c588e1c547b9df
Ying Wang [Sat, 31 Mar 2012 01:08:07 +0000 (18:08 -0700)]
Support to build pdk and pdk fusion.
Bug:
6241618
Change-Id: I08f74019631e9e132c15cdb2916bbafb052f9aa6
Daniel Berlin [Fri, 30 Mar 2012 23:48:50 +0000 (16:48 -0700)]
Merge "Moving notice file generation to a python script (it was getting fairly complicated in bash), update HTML output to have a table of contents, and fix typos/bugs in notice file CSS"