Commit Graph

9694 Commits

Author SHA1 Message Date
Elliott Hughes e7110ac09b am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."
* commit 'b122da648dd1a7860776bc90b219ffa8c215faa6':
  Fix libcutils/dlmalloc_stubs.c build breakage.
2014-06-04 04:06:03 +00:00
Elliott Hughes b122da648d Merge "Fix libcutils/dlmalloc_stubs.c build breakage." 2014-06-04 03:50:33 +00:00
Elliott Hughes 7f0ef73e70 Fix libcutils/dlmalloc_stubs.c build breakage.
Change-Id: I344c410c100ce13c7a88063bf5354ad61c50094b
2014-06-03 20:48:44 -07:00
Mathieu Chartier 39526f7740 am 04511126: am d586e356: Merge "Fix build."
* commit '04511126a6e127705abce84735a3fe4eb48d882c':
  Fix build.
2014-06-04 01:42:00 +00:00
Mathieu Chartier 04511126a6 am d586e356: Merge "Fix build."
* commit 'd586e356526b77d3d64d4d247cd8f8e0871824d5':
  Fix build.
2014-06-04 01:39:29 +00:00
Mathieu Chartier d586e35652 Merge "Fix build." 2014-06-04 01:17:07 +00:00
Mathieu Chartier e942d1f9ea Fix build.
Change-Id: I7b0cf6a248c74f1a06e0b5d51a5be13124ced6a0
2014-06-03 18:12:29 -07:00
Christopher Ferris 82cc77e8ed am 2e389193: am a8a7f001: Merge "Fix x86 and x86_64 builds."
* commit '2e389193b01adb2d8f75e6c4038caaab4334b3ab':
  Fix x86 and x86_64 builds.
2014-06-04 00:38:48 +00:00
Christopher Ferris 2e389193b0 am a8a7f001: Merge "Fix x86 and x86_64 builds."
* commit 'a8a7f001f142a77a2c406455ace4a8c00e692111':
  Fix x86 and x86_64 builds.
2014-06-04 00:33:18 +00:00
Eric Laurent 2624df514a Merge "add definitions for sound trigger" 2014-06-04 00:22:29 +00:00
Christopher Ferris a8a7f001f1 Merge "Fix x86 and x86_64 builds." 2014-06-04 00:17:54 +00:00
Christopher Ferris 3520086e3d Fix x86 and x86_64 builds.
Change-Id: I1ee9117843aff2abe4067f288b8496d4bfc78c9e
2014-06-03 17:13:37 -07:00
Elliott Hughes 6a0e5ba424 am a005445a: am ddde05f3: Merge "[MIPS64] Build debuggerd for mips64"
* commit 'a005445a7a0901675bbd04395a9eb699639aea9e':
  [MIPS64] Build debuggerd for mips64
2014-06-04 00:12:08 +00:00
Mathieu Chartier 53363f4fa0 am 5a8335c3: am ed30b7ea: Merge "Fix build."
* commit '5a8335c3185ec329bf43b1edc733aef38ce76c36':
  Fix build.
2014-06-04 00:11:52 +00:00
Elliott Hughes 3c9f410e16 am 0d31d487: am d3b61d18: Merge "Clean up the debuggerd makefile."
* commit '0d31d4877ca451c9e15a0651ab2b4827556afeff':
  Clean up the debuggerd makefile.
2014-06-04 00:11:51 +00:00
Duane Sand f1d63bdf00 [MIPS64] Use generic cpu-independent libpixelflinger for mips64
For now, use generic C code instead of generated mips instructions,
in the same manner as used on x86 and x86_64 targets.

Change-Id: If3607484e0a446a755c62c030b3069d46ab5beb2
2014-06-03 16:53:12 -07:00
Elliott Hughes a005445a7a am ddde05f3: Merge "[MIPS64] Build debuggerd for mips64"
* commit 'ddde05f3eec76513ae5d973a1c5d69494349f082':
  [MIPS64] Build debuggerd for mips64
2014-06-03 23:44:13 +00:00
Elliott Hughes ddde05f3ee Merge "[MIPS64] Build debuggerd for mips64" 2014-06-03 23:26:33 +00:00
Duane Sand a80b759857 [MIPS64] Build debuggerd for mips64
Change-Id: I361e9668baa218fc01e723c2df1a34ca6329cf47
2014-06-03 16:24:57 -07:00
Mathieu Chartier 5a8335c318 am ed30b7ea: Merge "Fix build."
* commit 'ed30b7ea75532a5b2963acb8bae23e73493a851b':
  Fix build.
2014-06-03 22:48:05 +00:00
Elliott Hughes 0d31d4877c am d3b61d18: Merge "Clean up the debuggerd makefile."
* commit 'd3b61d184ecffc4ac69e8573fcb00cc295a0d550':
  Clean up the debuggerd makefile.
2014-06-03 22:48:05 +00:00
Mathieu Chartier ed30b7ea75 Merge "Fix build." 2014-06-03 22:35:23 +00:00
Elliott Hughes d3b61d184e Merge "Clean up the debuggerd makefile." 2014-06-03 22:34:28 +00:00
Mathieu Chartier 0b9674f241 Fix build.
Change-Id: I6bafe6221e1ce7e4b04269df90996ab08b050e93
2014-06-03 15:32:10 -07:00
Elliott Hughes 8c597684b1 Clean up the debuggerd makefile.
In particular, turn on -Wunused, which is globally off by default
thanks to build/core/config.mk.

Change-Id: Iba3ee1c0726f43eced972a53959f0e1cd97190c9
2014-06-03 15:12:07 -07:00
Eric Laurent 5894b4bfaa add definitions for sound trigger
Add header file sound_trigger.h containing
base definitions and data types for sound
trigger native service and HAL.

Change-Id: Ie357d8c3909d0e1afda230523aded2d8699c69f1
2014-06-03 14:48:41 -07:00
Mathieu Chartier 520a893b1a am b85c2494: am 03b87b49: Merge "Make host ashmem_create_region seed only once."
* commit 'b85c2494df1e1003b3101e36b29faace3a51dc3f':
  Make host ashmem_create_region seed only once.
2014-06-03 20:54:51 +00:00
Mathieu Chartier b85c2494df am 03b87b49: Merge "Make host ashmem_create_region seed only once."
* commit '03b87b49fae82a6304ab69b10426701c4f82c7e9':
  Make host ashmem_create_region seed only once.
2014-06-03 20:48:37 +00:00
Mathieu Chartier 03b87b49fa Merge "Make host ashmem_create_region seed only once." 2014-06-03 19:02:35 +00:00
Mathieu Chartier 1104ae8cfc Make host ashmem_create_region seed only once.
Not seeding this each call should help reduce collisions when multiple
threads are calling ashmem_create_region. Also cleaned up code by
deleting gotos, and making formatting consistent.

Bug: 15394258
Change-Id: Iafdaea57b2317e0eb7c40d7b5595c523814fd88c
2014-06-03 11:47:58 -07:00
Jean-Michel Trivi 76a77c7ade Merge "Define audio attributes type in system audio header" 2014-06-03 17:40:47 +00:00
Mark Salyzyn 5f7189b68e am a9fc6a52: am b0b343d0: Merge "liblog: test: Send bionc\'s fatal logging to the crash log"
* commit 'a9fc6a52b9d0f891b6cff3d9df92f89a81f8f002':
  liblog: test: Send bionc's fatal logging to the crash log
2014-06-03 17:32:57 +00:00
Mark Salyzyn a9fc6a52b9 am b0b343d0: Merge "liblog: test: Send bionc\'s fatal logging to the crash log"
* commit 'b0b343d0864556816d89af61f7418130cea047d0':
  liblog: test: Send bionc's fatal logging to the crash log
2014-06-03 17:29:32 +00:00
Mark Salyzyn b0b343d086 Merge "liblog: test: Send bionc's fatal logging to the crash log" 2014-06-03 17:12:31 +00:00
Nick Kralevich d69f6b6f7a am 38fd5650: am 82015d4f: Merge "Only allow disabling SELinux on userdebug / eng builds"
* commit '38fd5650ea03b1f47ead2a12a655298ef2f70a91':
  Only allow disabling SELinux on userdebug / eng builds
2014-06-03 16:43:10 +00:00
Nick Kralevich 38fd5650ea am 82015d4f: Merge "Only allow disabling SELinux on userdebug / eng builds"
* commit '82015d4f127219700992f8800118fd9c388e3c99':
  Only allow disabling SELinux on userdebug / eng builds
2014-06-03 16:39:51 +00:00
Mark Salyzyn 90aa3d59a5 liblog: test: Send bionc's fatal logging to the crash log
Bug: 14159417
Change-Id: Ia2e29ce03d4e2b02919c62be091da37ce4082647
2014-06-03 09:29:11 -07:00
Nick Kralevich 82015d4f12 Merge "Only allow disabling SELinux on userdebug / eng builds" 2014-06-03 16:17:52 +00:00
Jean-Michel Trivi 0d580e83dd Define audio attributes type in system audio header
Change-Id: Iac2030a1e4a6827676e6c5f9b408f1e768207f00
2014-06-03 15:47:17 +00:00
Narayan Kamath 8f4ac8e1d3 am 7cf8e1cb: am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present."
* commit '7cf8e1cb88c44963ccb2128113d8a804d85645b9':
  Skip the "--abi" flag on "adb install" if present.
2014-06-03 13:58:44 +00:00
Narayan Kamath 7cf8e1cb88 am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present."
* commit '4e26c95a6363da4885bb9178c9d42c273b357043':
  Skip the "--abi" flag on "adb install" if present.
2014-06-03 13:29:03 +00:00
Narayan Kamath 4e26c95a63 Merge "Skip the "--abi" flag on "adb install" if present." 2014-06-03 09:58:24 +00:00
Nick Kralevich f3c85b2488 Only allow disabling SELinux on userdebug / eng builds
Only parse and honor the kernel command line on userdebug
or eng builds. On user builds, assume that selinux is always enabled
and enforcing.

Change-Id: I71c66e4365bdf2f226800634126a38b716d96599
2014-06-02 20:56:04 -07:00
JP Abgrall 9e18975bac am c99dd0c5: am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
* commit 'c99dd0c58d2a7572740599f81b5a20ddb18dbf9e':
  libcutils: fix rw FS remount check issue
2014-06-03 01:12:15 +00:00
JP Abgrall c99dd0c58d am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
* commit '676f7d509d683921335ccddc2f267a73eb5c60c6':
  libcutils: fix rw FS remount check issue
2014-06-03 01:09:07 +00:00
JP Abgrall 676f7d509d am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"
* commit 'fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7':
  libcutils: fix rw FS remount check issue
2014-06-03 01:05:33 +00:00
JP Abgrall fc85a7a848 Merge "libcutils: fix rw FS remount check issue" 2014-06-03 01:01:36 +00:00
Hong-Mei Li 88f7683d9c libcutils: fix rw FS remount check issue
In some condition, some of FS would set disable_roll_forward option.
In this case, when we do power off or reboot, the power down progress
would stuck at android_reboot for 360 sec.
The reason is, remount_ro_done function check key word "rw" to determine
whether all the read-write FS has been remounted as read-only FS.
Unfortunately, it takes disable_roll_forward as a rw flag too by
mistake, so the check would always fail, until reach 360 sec threshold.

The patch would match "rw," from mount options, this can avoid the issue
successfully.

Change-Id: I409f9dc88c9ee5cf049615ea9dcccaf195b6bc5a
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2014-06-02 22:45:37 -07:00
Mark Salyzyn 5bed803664 libutils: turn on -Werror
- Deal with some -Wunused issues
- Override PRI macros (windows)
- Revert use of PRI macros on off64_t (linux)
- Deal with a gnu++11 complaince issue

Change-Id: Ie66751293bd84477a5a6dfd8a57e700a16e36964
2014-06-02 15:57:50 -07:00
Dave Allison b311ca9ee8 Add LD_PRELOAD for libsigchain.so to the environment
To remove the need to modify the bionic dynamic linker, add the
signal chaining library as a preload in the environment.  This
will be picked up by the dynamic linker and will override
sigaction and sigprocmask to allow for signal chaining.

Change-Id: I6e2d0628b009bd01e0ed9aed0b311871b9c8363a
2014-06-02 15:54:28 -07:00