Commit Graph

8530 Commits

Author SHA1 Message Date
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
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
Ying Wang
4534d8135a Merge the NOTICE files when doing pdk fusion build.
Bug: 6297249
Change-Id: I693ab15e5a2eacda3c8b9d2ce36469ea177ae178
2012-04-10 10:02:02 -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
Evgeniy Stepanov
f50f4c5299 More Clang tweaks to the build system.
Adds arm_neon.h to the include path when building with Clang.
Filters out 3 additional compiler flags when building with Clang.
Filters out unsupported flags from TARGET_(arm|thumb)_CFLAGS, as well.

Change-Id: I5e23a95356e0b10c31c9aa3cb4905f6a674709e4
2012-04-10 16:33:37 +04:00
Kenny Root
883a122808 Merge "resolved conflicts for merge of a86fcc29 to master" 2012-04-09 15:12:58 -07:00
Kenny Root
f32dc71e49 resolved conflicts for merge of a86fcc29 to master
Change-Id: I3868c19bfd309b5b43b5642152a120931fe37315
2012-04-09 14:59:04 -07:00
Ying Wang
4394aaef7e Merge "Build system support to export include paths" 2012-04-09 12:43:09 -07:00
Nick Kralevich
1747c60790 Merge "ARM: compile everything with relro / bind_now." 2012-04-09 12:30:12 -07:00
Doug Zongker
28514d1b2b Merge "fix broken OTAs; format() is called with wrong # of args" 2012-04-09 12:28:14 -07:00
Doug Zongker
df2056e29e fix broken OTAs; format() is called with wrong # of args
Change-Id: Id95d345158b36f149c12342d6cd1f03f2875b110
2012-04-09 12:27:43 -07:00
Ying Wang
c4625abc5d 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
2012-04-09 12:16:23 -07:00
Nick Kralevich
020e4919e8 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
2012-04-09 12:04:32 -07:00
Kenny Root
a86fcc2980 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.
2012-04-06 18:07:44 -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
Nick Sanders
135c3af45a am df49771a: Allow factory specific kernel commandline
* commit 'df49771a4a82a147e287190f872ab9d0e237a69f':
  Allow factory specific kernel commandline
2012-04-06 14:11:10 -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
Iliyan Malchev
277e68b3af init.vbox_x86.rc: mount data & cache partitions from /dev/sdb
Change-Id: Ifa14f0be875848297883d2ee66372a355a4174e6
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-06 11:04:53 -07:00
Nick Sanders
df49771a4a 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>
2012-04-05 19:55:51 -07:00
Eino-Ville Talvala
11d3c4421f Add new camera system include path to pathmap.
Change-Id: Ia4200dbffa90397a8a48d00139647c45646af734
2012-04-05 17:09:18 -07:00
The Android Automerger
a399ee40fe IMM76H 2012-04-05 15:48:38 -07:00
Iliyan Malchev
b162d31162 Merge "vbox_x86: update init.vbox_x86.rc, remove custom init.rc" 2012-04-04 15:57:20 -07:00
Iliyan Malchev
ce7d34ca2c 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>
2012-04-04 15:33:21 -07:00
Roman Nurik
7f97a687de am 31fc69c2: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '31fc69c218a6fb46c43a650cc0530e12853066bb':
2012-04-04 14:56:35 -07:00
Dima Zavin
ce4d5d367e Merge "target/product: have the sdk product pull in the apns" 2012-04-04 12:17:17 -07:00
Roman Nurik
72b0105774 am 67af236d: am c403055b: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit '67af236dc582e6350a3bf06ce78d5b21791b1a0a':
2012-04-04 11:02:35 -07:00
Roman Nurik
4321c8177b 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)
2012-04-04 11:00:33 -07:00
Roman Nurik
67af236dc5 am c403055b: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit 'c403055b10331e717fbe2420f4b92ce99e30e3f2':
2012-04-04 10:58:50 -07:00
Roman Nurik
5b250fbc43 am dceeaac8: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1
* commit 'dceeaac8bf6e4b71885a1468a32ffad1324d0022':
  docs: Android Design: v3 update (CSS changes)
2012-04-04 10:58:16 -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
31fc69c218 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:47 -07:00
Roman Nurik
dceeaac8bf 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:35 -07:00
Roman Nurik
51c9e67ec0 Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1 2012-04-04 10:53:51 -07:00
Stephen Hines
eebcef64ec Merge "Add support for building with AddressSanitizer." 2012-04-04 08:02:49 -07:00
Stephen Hines
7b29683411 Merge "Include Clang headers from ".../include" directory." 2012-04-04 08:02:43 -07:00
Dima Zavin
b520df4874 target/product: have the sdk product pull in the apns
Bug: 6274210
Change-Id: I23c76975312a7fb60926853cdbde8065ae8b5f76
Signed-off-by: Dima Zavin <dima@android.com>
2012-04-03 20:20:14 -07:00