The Android Open Source Project
d9c2de10d9
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I753a2c0b3bfb42c526b954e58d8874daf31420ed
2012-08-07 11:02:30 -07:00
The Android Automerger
eeb321c54e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:33:32 -07:00
The Android Open Source Project
fa844eff32
am 45193df5
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '45193df53aebb0764853aa21541e6f6ab73b9b9f':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
When compiling with clang, don't "fortify_source" the strlen.
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 13:35:38 -07:00
The Android Open Source Project
45193df53a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If9b215d19d88c3f1793013adc8cb81c8c890faa0
2012-08-06 13:34:18 -07:00
The Android Open Source Project
31096ceb79
am 1466b1aa
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1466b1aad294138fc1e189c6fdce5eb7a2d06a42':
Update msm_camera.h to version that supports instance handle based lookup
2012-08-06 13:19:43 -07:00
The Android Open Source Project
1466b1aad2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I801dd8874ff1b1b61858cac3bf716906825b214d
2012-08-06 13:17:46 -07:00
Shih-wei Liao
f4497e15b7
When compiling with clang, don't "fortify_source" the strlcpy and
...
strlcat.
Change-Id: I91f58322f28e425ab9d22b51c23fcd6b772ede97
2012-08-06 13:17:05 -07:00
Shih-wei Liao
a72246d67e
When compiling with clang, don't "fortify_source" the strlen.
...
At this point, FORTIFY_SOURCE and clang are just plain incompatible.
Need to solve the underlying incompatibility first.
Change-Id: I3366477d19461e1ec93b1c30e0c7e8145b391b9b
2012-08-06 13:16:56 -07:00
Shih-wei Liao
5fec211f60
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
...
This reverts commit 4f1f149c37
.
2012-08-06 13:16:48 -07:00
Shih-wei Liao
6f2e8f9878
am 25ef2bbf
: am 3b4c9db2
: am df523880
: am e2731d98
: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit '25ef2bbf01bf6f8e934a07bd1304cba35ae5a38e':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:12:30 -07:00
Shih-wei Liao
25ef2bbf01
am 3b4c9db2
: am df523880
: am e2731d98
: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit '3b4c9db2561233fb81ac0c42b3976deb2e648df0':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:10:41 -07:00
Shih-wei Liao
3b4c9db256
am df523880
: am e2731d98
: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit 'df523880b59604ef36e212cb7ba30d663eeea179':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:09:35 -07:00
Shih-wei Liao
df523880b5
am e2731d98
: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit 'e2731d98c1f0cd32d94b34cc4ee77148d6d52647':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:08:40 -07:00
Shih-wei Liao
e2731d98c1
Merge "When compiling with clang, don't "fortify_source" the strlcpy and strlcat."
2012-08-06 11:02:19 -07:00
Shih-wei Liao
d600617645
When compiling with clang, don't "fortify_source" the strlcpy and
...
strlcat.
Change-Id: I91f58322f28e425ab9d22b51c23fcd6b772ede97
2012-08-06 10:57:37 -07:00
Shih-wei Liao
dec42d9112
am 42bfbd1e
: am 6ff66601
: am ce4a5cd5
: am 8173d767
: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit '42bfbd1e617b7430fd5c62cb9162ab5c79655e3d':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:23:24 -07:00
Shih-wei Liao
839c4f1eb6
am ed33635d
: am cddedade
: am 924fd920
: am 601a49d3
: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit 'ed33635da7d8cfc6f5c61c5d7ab9bc42ab5b3916':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:23:23 -07:00
Shih-wei Liao
42bfbd1e61
am 6ff66601
: am ce4a5cd5
: am 8173d767
: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit '6ff66601a47d7b74544310e4a5535d572e23d68e':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:20:48 -07:00
Shih-wei Liao
ed33635da7
am cddedade
: am 924fd920
: am 601a49d3
: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit 'cddedade5b1138d5ddafe5b084923f21bba75526':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:20:47 -07:00
Shih-wei Liao
6ff66601a4
am ce4a5cd5
: am 8173d767
: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit 'ce4a5cd5f3ee09fbc8dea7ffdfcd4fd097f8ed34':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:18:21 -07:00
Shih-wei Liao
cddedade5b
am 924fd920
: am 601a49d3
: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit '924fd920137135729483d0beacea20d5a0552c15':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:18:20 -07:00
Shih-wei Liao
ce4a5cd5f3
am 8173d767
: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit '8173d76740cafc2ceb49d2fddf1ceabfaa823236':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:17:09 -07:00
Shih-wei Liao
924fd92013
am 601a49d3
: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit '601a49d39829005803670088da02179e61719551':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:17:08 -07:00
Shih-wei Liao
8173d76740
Merge "Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute""
2012-08-06 10:05:15 -07:00
Shih-wei Liao
601a49d398
Merge "When compiling with clang, don't "fortify_source" the strlen."
2012-08-06 10:04:22 -07:00
Shih-wei Liao
9a3d53fad0
When compiling with clang, don't "fortify_source" the strlen.
...
At this point, FORTIFY_SOURCE and clang are just plain incompatible.
Need to solve the underlying incompatibility first.
Change-Id: I3366477d19461e1ec93b1c30e0c7e8145b391b9b
2012-08-06 09:50:56 -07:00
Elliott Hughes
b11eaaed35
am a870ded2
: am eaac1e5a
: am 94ce1356
: am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit 'a870ded21ac2e8b792ddc1fe1c5d71c421f0d8a1':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:09:25 -07:00
Elliott Hughes
a870ded21a
am eaac1e5a
: am 94ce1356
: am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit 'eaac1e5a1c62a9dc9edd3a858a367bbb16194272':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:08:05 -07:00
Elliott Hughes
eaac1e5a1c
am 94ce1356
: am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit '94ce135693a73ac09116dabc0f2440604bba5c87':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:06:27 -07:00
Elliott Hughes
94ce135693
am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit '7c92b6ca409f514e7ff67ac8c10d73ce92ff38d2':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:04:33 -07:00
Elliott Hughes
7c92b6ca40
Merge "Remove an awkward #include that is no longer upstream."
2012-08-06 07:57:59 -07:00
The Android Automerger
7bf1c31cac
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-06 06:27:31 -07:00
Shih-wei Liao
2b7f68c03d
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
...
This reverts commit 4f1f149c37
.
2012-08-03 17:44:08 -07:00
Elliott Hughes
15b3aef581
am 8ccbc90a
: am 4bac8f68
: am 7e81ee04
: am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '8ccbc90a3b6071dff015bff284b0a11d95a00349':
Remove yet more SH4 cruft.
2012-08-03 15:17:14 -07:00
Elliott Hughes
8ccbc90a3b
am 4bac8f68
: am 7e81ee04
: am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '4bac8f689efd8f10850e60c52c206b20e4a90fd7':
Remove yet more SH4 cruft.
2012-08-03 15:14:16 -07:00
Elliott Hughes
4bac8f689e
am 7e81ee04
: am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '7e81ee04532e9c26f90d73061d9a53f09e2c3fa1':
Remove yet more SH4 cruft.
2012-08-03 15:12:39 -07:00
Elliott Hughes
7e81ee0453
am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '1c861728e5c8dda7589e6595f4850d77ec21a236':
Remove yet more SH4 cruft.
2012-08-03 15:09:55 -07:00
Elliott Hughes
1c861728e5
Merge "Remove yet more SH4 cruft."
2012-08-03 15:05:15 -07:00
Ajay Dudani
5f0701c9fa
Update msm_camera.h to version that supports instance handle based lookup
...
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
2012-08-03 15:02:07 -07:00
Elliott Hughes
bbf094fdf5
Remove yet more SH4 cruft.
...
Surely this is the last piece?
Change-Id: I4bd43afb102334ec34d0e14a65c2b319826473d7
2012-08-03 14:58:18 -07:00
Elliott Hughes
031226a9fd
am 9f8c7daf
: am c9dbebe3
: am f5385754
: am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit '9f8c7daf402738beda56868692e62a90e095481d':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:34:57 -07:00
Elliott Hughes
9f8c7daf40
am c9dbebe3
: am f5385754
: am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'c9dbebe344d2f6a4623a67d1c005bcb6137642c4':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:33:20 -07:00
Elliott Hughes
c9dbebe344
am f5385754
: am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'f5385754e29dcb093cb9445c40b69e45bd71d685':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:29:45 -07:00
Elliott Hughes
f5385754e2
am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'aea5f00df4704a618331e16473b552e54bed269b':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:27:08 -07:00
Elliott Hughes
aea5f00df4
Merge "bionic: modify syscall to use 6 registers to pass parameter."
2012-08-03 13:55:56 -07:00
Jin Wei
c164f2a969
bionic: modify syscall to use 6 registers to pass parameter.
...
Kernel allows to use 6 registers(exclude eax) to pass parameter.
But in syscall's implementation, it only uses five registers.
It will lead to error when 6 parameters passed.
Change-Id: I92d663194e6334c3847f0c0c257ca3b9dee0edef
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 30838
2012-08-03 13:54:29 -07:00
Elliott Hughes
7478b0bfa6
am 58234e78
: am 48955d24
: am c6f15ecf
: am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit '58234e788be30a16e6ba745adc21cbfd6d9828ec':
Upgrade to tzdata2012e.
2012-08-03 13:41:39 -07:00
Elliott Hughes
58234e788b
am 48955d24
: am c6f15ecf
: am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit '48955d24b9f3e8c15028a6dbb54e2e96fd41780a':
Upgrade to tzdata2012e.
2012-08-03 13:39:38 -07:00
Elliott Hughes
48955d24b9
am c6f15ecf
: am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit 'c6f15ecf76842801db653d58a262c7d342be2a93':
Upgrade to tzdata2012e.
2012-08-03 13:33:15 -07:00
Elliott Hughes
c6f15ecf76
am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit '1510795fec5aa8b8700a08200f37f6e57dea8d04':
Upgrade to tzdata2012e.
2012-08-03 13:30:44 -07:00