Elliott Hughes
f0f052f28d
am 2facd5b5
: am 417fd233
: Merge "Fix perf_event_open syscall for x86 and mips"
...
* commit '2facd5b5ef3e52b11590b4de01e17f6923a85aee':
Fix perf_event_open syscall for x86 and mips
2012-10-11 10:43:49 -07:00
Elliott Hughes
2facd5b5ef
am 417fd233
: Merge "Fix perf_event_open syscall for x86 and mips"
...
* commit '417fd2334a694cf6a831b81cd672b4ca31ff2f54':
Fix perf_event_open syscall for x86 and mips
2012-10-11 10:42:00 -07:00
Elliott Hughes
417fd2334a
Merge "Fix perf_event_open syscall for x86 and mips"
2012-10-11 10:26:00 -07:00
Shuo Gao
4e75c4b2d7
Fix perf_event_open syscall for x86 and mips
...
perf_event_open syscall has a different syscall number for
the 3 supported architectures: arm, x86 and mips. Currenlty
only the arm syscall number is defined for all architectures.
Tracing tools like perf will not work on other architectures
than arm.
Add the different values for perf_event_open on x86 and mips
and run gensyscalls.py to update generated headers.
Change-Id: I2ed78bd42c0e5df8dbc51d784be49cccda5fab30
Author: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
2012-10-11 10:24:51 -07:00
The Android Automerger
b5f1e03079
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:18:46 -07:00
The Android Open Source Project
3622c73cfc
am d1844d4b
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'd1844d4b30a0f75ed0c30c923bea7c718ba53034':
2012-10-11 05:59:18 -07:00
The Android Open Source Project
d1844d4b30
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I8ceb7a33ab427c2d3e884e8b71064ecbc531fd1e
2012-10-11 05:56:36 -07:00
The Android Automerger
7cc2dec82e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 14:06:19 -07:00
Ying Wang
9ab8851756
am 06201227
: am ecbded40
: am 2c287e95
: Set up the private variables.
...
* commit '0620122763502e4ec6f9939c009faaf5a890ad08':
Set up the private variables.
2012-10-10 13:54:48 -07:00
Ying Wang
0620122763
am ecbded40
: am 2c287e95
: Set up the private variables.
...
* commit 'ecbded40ff1278ddb155d3e1a5d137285f18629f':
Set up the private variables.
2012-10-10 13:52:59 -07:00
Ying Wang
ecbded40ff
am 2c287e95
: Set up the private variables.
...
* commit '2c287e9510ec1d379b3cd779651b595dafb6a2ff':
Set up the private variables.
2012-10-10 13:51:30 -07:00
Ying Wang
2c287e9510
Set up the private variables.
...
Now we use private variables in transform-o-to-executable to support
build executables against the NDK.
Cherry-picked from master.
Bug: 7170098
Change-Id: Ic8f1d36a116fce24f3ea6a3ff5e9bfab6cafee99
2012-10-10 10:25:13 -07:00
Elliott Hughes
c41e2216f4
am 4c3d7a86
: am 1ceb9824
: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
...
* commit '4c3d7a86bb568e0b3fa5c9e24d32fa1ee9404b2e':
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
2012-10-09 18:29:25 -07:00
Elliott Hughes
4c3d7a86bb
am 1ceb9824
: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
...
* commit '1ceb9824ab39501e98300bc87f7984ee6b455ce8':
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
2012-10-09 18:27:11 -07:00
Elliott Hughes
1ceb9824ab
Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
2012-10-09 18:14:37 -07:00
Elliott Hughes
5a16e92eb5
am c7f654df
: am b83cad79
: Merge "Fix two comment typos."
...
* commit 'c7f654dffea47a80ba566cd05f9212c8c7359a67':
Fix two comment typos.
2012-10-09 17:39:51 -07:00
Elliott Hughes
c7f654dffe
am b83cad79
: Merge "Fix two comment typos."
...
* commit 'b83cad79838f780779bd129da9ed4662b741bd31':
Fix two comment typos.
2012-10-09 17:38:01 -07:00
Elliott Hughes
b83cad7983
Merge "Fix two comment typos."
2012-10-09 17:23:38 -07:00
Elliott Hughes
e5d5f7f0d8
Fix two comment typos.
...
Change-Id: Icb2d6f7fa97ef5a4409a7606875e416cfab0a4b3
2012-10-09 17:23:09 -07:00
Elliott Hughes
156da96621
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
...
The getcwd(3) bug was found by valgrind.
Bug: 7291287
Change-Id: I59f3bff1c1392a408b905934eebcd5d894d37492
2012-10-09 17:17:24 -07:00
Ying Wang
ed0570bf0c
am a55f0a10
: am b04598a6
: Set up the private variables.
...
* commit 'a55f0a1007423837ff8dc26336a1976469439def':
Set up the private variables.
2012-10-08 16:21:46 -07:00
Ying Wang
a55f0a1007
am b04598a6
: Set up the private variables.
...
* commit 'b04598a63c3f0df597f6186beea3adafc665ef56':
Set up the private variables.
2012-10-08 14:21:38 -07:00
Ying Wang
b04598a63c
Set up the private variables.
...
Now we use private variables in transform-o-to-executable to support
build executables against the NDK.
Bug: 7170098
Change-Id: I6e505b33001b76f4b11fcbbb1d35392c4ddf4c70
2012-10-08 14:12:56 -07:00
Elliott Hughes
1cae8da8e7
am 7e785323
: am 9a7366e8
: am fa7e2586
: Merge "Test flags before using "info""
...
* commit '7e7853230fcf141477d7332634858c08d8eec5b9':
Test flags before using "info"
2012-10-03 17:44:53 -07:00
Elliott Hughes
7e7853230f
am 9a7366e8
: am fa7e2586
: Merge "Test flags before using "info""
...
* commit '9a7366e8943990619c494548050aa906f1971332':
Test flags before using "info"
2012-10-03 17:42:35 -07:00
Elliott Hughes
9a7366e894
am fa7e2586
: Merge "Test flags before using "info""
...
* commit 'fa7e2586176711896e6c0b94c7b811f7cbe29907':
Test flags before using "info"
2012-10-03 17:41:08 -07:00
Elliott Hughes
fa7e258617
Merge "Test flags before using "info""
2012-10-03 17:27:51 -07:00
Andy McFadden
1db6f2db49
Test flags before using "info"
...
Our debugger signal catcher expects to receive three args, but if
somebody cleared SA_SIGINFO we only get one, and bad things happen
when we try to use the second one. Test to see if SA_SIGINFO is
still set before we try to use the argument.
(cherry-pick of f84bc8d6f6368f1c846124a8168761ee8cc589c0.)
Bug: 7272866
Change-Id: I69a65c25e833aea70acb78f9ba40ed93308583e6
2012-10-03 17:20:06 -07:00
The Android Open Source Project
c34bdc957c
am ae8000f3
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'ae8000f368926478b7a1e0a56a3d3ee53c2c4a01':
2012-10-03 07:36:22 -07:00
The Android Open Source Project
ae8000f368
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I80b71067d1e628d18a19d94219fcfa1000133abf
2012-10-03 07:33:03 -07:00
The Android Automerger
956092e07c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 06:59:12 -07:00
Naseer Ahmed
2d5d80985e
am 9c389255
: am 6b1ba118
: am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '9c3892558f68ec8791283844e2d7d7326bcd3574':
bionic: update processed msm_mdp.h
2012-10-03 01:05:02 -07:00
Naseer Ahmed
9c3892558f
am 6b1ba118
: am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '6b1ba1184a5e0884686b63da837a85f8c861d1fc':
bionic: update processed msm_mdp.h
2012-10-03 01:03:04 -07:00
Naseer Ahmed
6b1ba1184a
am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '3ef4fecd30c22f3c17c1dadfce4527e858b42e7e':
bionic: update processed msm_mdp.h
2012-10-03 00:57:49 -07:00
Naseer Ahmed
3ef4fecd30
bionic: update processed msm_mdp.h
...
-- Has display commit ioctl
Bug: 7274951
Change-Id: If2d47edf3ada418e8c61a2acc7b79fb3422f3473
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 23:37:34 -07:00
Andy McFadden
399f54c133
am 51c7167d
: am 7c67e4e4
: am 98957db5
: Merge "Test flags before using "info"" into jb-mr1-dev
...
* commit '51c7167d2245286e3458ffb06b0b5068d8f04e1b':
Test flags before using "info"
2012-10-02 15:28:17 -07:00
Andy McFadden
51c7167d22
am 7c67e4e4
: am 98957db5
: Merge "Test flags before using "info"" into jb-mr1-dev
...
* commit '7c67e4e423f7608c50a1fc7c355d87593cfdbcca':
Test flags before using "info"
2012-10-02 15:27:09 -07:00
Andy McFadden
7c67e4e423
am 98957db5
: Merge "Test flags before using "info"" into jb-mr1-dev
...
* commit '98957db5536e93724c2e9e6bd19d5063f9d4dc2c':
Test flags before using "info"
2012-10-02 15:24:25 -07:00
Andy McFadden
98957db553
Merge "Test flags before using "info"" into jb-mr1-dev
2012-10-02 15:23:20 -07:00
Andreas Huber
ae554abd41
am 3a0aa5e0
: am cafbc940
: am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit '3a0aa5e0a01c26278438513a73bc0150d5fc215c':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:44:32 -07:00
Andreas Huber
3a0aa5e0a0
am cafbc940
: am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit 'cafbc9404310828ecddc55a1eed5fc897008b1f3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:42:35 -07:00
Andreas Huber
cafbc94043
am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit '2e0452cbd1f5b981fbadb4021198d2c27ec1cde3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:40:02 -07:00
Andreas Huber
2e0452cbd1
bionic: update processed msm_vidc_enc.h
...
Updated kernel headers to support a video encoder ioctl to preprend each IDR
frame with SPS/PPS.
related-to-bug: 7245308
Change-Id: I7244c521690d69a905deb19940a04fd4f2e06935
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 14:34:03 -07:00
Andy McFadden
f84bc8d6f6
Test flags before using "info"
...
Our debugger signal catcher expects to receive three args, but if
somebody cleared SA_SIGINFO we only get one, and bad things happen
when we try to use the second one. Test to see if SA_SIGINFO is
still set before we try to use the argument.
Bug: 7272866
Change-Id: If682a2262fe8a575f3802fb0c60a53eea3082456
2012-10-02 14:30:41 -07:00
Elliott Hughes
f0a9cd7847
am 92e6de6f
: am b95ad82f
: am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit '92e6de6f940fee6362dd306ad77c6d7bfa56e4cb':
Fix MIPS build.
2012-10-02 11:34:14 -07:00
Elliott Hughes
92e6de6f94
am b95ad82f
: am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit 'b95ad82f7d175a4f79eb0cbf6caedf0653603590':
Fix MIPS build.
2012-10-02 11:33:03 -07:00
Elliott Hughes
b95ad82f7d
am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit '95a2a7f325330830d6227aa683948b325e38e653':
Fix MIPS build.
2012-10-02 11:31:30 -07:00
Elliott Hughes
95a2a7f325
Merge "Fix MIPS build."
2012-10-02 11:22:33 -07:00
Elliott Hughes
857fed50cb
Fix MIPS build.
...
ARM and x86 have custom memcpy implementations, but MIPS relies on the generic
one, which I recently moved.
Change-Id: I9e49243f63b27a4123f2c6623d6286ec82d333c7
2012-10-02 11:20:07 -07:00
Elliott Hughes
6cdf8dd025
am 80a29832
: am 90172541
: am b98204a9
: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit '80a298327299aa28b564941f90818911023ae544':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:28:31 -07:00