Commit graph

8601 commits

Author SHA1 Message Date
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
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