OSDN Git Service
Yabin Cui [Wed, 20 May 2015 22:12:31 +0000 (22:12 +0000)]
am
c15a9352: am
fd20a8c2: resolved conflicts for merge of
473d96c0 to lmp-mr1-ub-dev
* commit '
c15a935202319a41ee0be94afcdbde1d07568ec8':
Fix timer flaky test in lollipop-mr1-cts-dev.
Yabin Cui [Wed, 20 May 2015 21:48:09 +0000 (21:48 +0000)]
am
fd20a8c2: resolved conflicts for merge of
473d96c0 to lmp-mr1-ub-dev
* commit '
fd20a8c2d669b3f2d63e2d33a32b90d1b7f17b82':
Fix timer flaky test in lollipop-mr1-cts-dev.
Yabin Cui [Wed, 20 May 2015 20:36:56 +0000 (13:36 -0700)]
resolved conflicts for merge of
473d96c0 to lmp-mr1-ub-dev
Change-Id: I48269218b152054d527d9257d40490b54205140f
Yabin Cui [Mon, 18 May 2015 21:10:25 +0000 (21:10 +0000)]
am
7490c5c5: Hide rt_sigqueueinfo.
* commit '
7490c5c5944391e99bc6c3564bce03d3cd4a39e0':
Hide rt_sigqueueinfo.
Yabin Cui [Mon, 18 May 2015 20:46:23 +0000 (20:46 +0000)]
am
c02bdc76: Merge "Hide rt_sigqueueinfo."
* commit '
c02bdc76a21f6149c7867982e66ab16982e01c1b':
Hide rt_sigqueueinfo.
Yabin Cui [Mon, 18 May 2015 18:19:11 +0000 (11:19 -0700)]
Hide rt_sigqueueinfo.
Bug:
19358804
Change-Id: I38a53ad64c81d0eefdd1d24599e769fd8a477a56
(cherry picked from commit
40a8f214a5264efe5feaaffd55cea67fb87d097b)
Yabin Cui [Mon, 18 May 2015 20:29:41 +0000 (20:29 +0000)]
Merge "Hide rt_sigqueueinfo."
Yabin Cui [Mon, 18 May 2015 18:19:11 +0000 (11:19 -0700)]
Hide rt_sigqueueinfo.
Bug:
19358804
Change-Id: I38a53ad64c81d0eefdd1d24599e769fd8a477a56
Yabin Cui [Mon, 18 May 2015 17:56:14 +0000 (17:56 +0000)]
am
2b5c2285: Remove pthread_detach_no_leak test.
* commit '
2b5c2285c0679190b90b954d5e71f7ee8698adba':
Remove pthread_detach_no_leak test.
Yabin Cui [Thu, 7 May 2015 23:53:25 +0000 (16:53 -0700)]
Remove pthread_detach_no_leak test.
This test has lost its purpose as we are using mmap/munmap for pthread_internal_t. And it is a flaky test.
Bug:
21205574
Bug:
20860440
Change-Id: I7cbb6bc3fd8a2ca430415beab5ee27a856ce4ea7
(cherry picked from commit
2957cc5f1043adf0b9c0f1cdfff2d408952e40f5)
Dmitriy Ivanov [Sat, 16 May 2015 17:19:01 +0000 (17:19 +0000)]
am
8557eeb0: Merge "Apply work around b/
19059885 to x86" into mnc-dev
* commit '
8557eeb0add011ff37edc86f50f423ce681eeb2b':
Apply work around b/
19059885 to x86
Dmitriy Ivanov [Sat, 16 May 2015 17:12:03 +0000 (17:12 +0000)]
am
a42b5bcd: Merge "Apply work around b/
19059885 to x86"
* commit '
a42b5bcd896daa83b479e7964c0fa8cf1abf5a1d':
Apply work around b/
19059885 to x86
Dmitriy Ivanov [Sat, 16 May 2015 16:57:15 +0000 (16:57 +0000)]
Merge "Apply work around b/
19059885 to x86" into mnc-dev
Dmitriy Ivanov [Sat, 16 May 2015 16:56:48 +0000 (16:56 +0000)]
Merge "Apply work around b/
19059885 to x86"
Dmitriy Ivanov [Sat, 16 May 2015 00:53:39 +0000 (17:53 -0700)]
Apply work around b/
19059885 to x86
Bug: http://b/
19059885
Bug: http://b/
21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465
(cherry picked from commit
69a5fb951d69689dedd83cb033ae3dcd0ef05b65)
Dmitriy Ivanov [Sat, 16 May 2015 00:53:39 +0000 (17:53 -0700)]
Apply work around b/
19059885 to x86
Bug: http://b/
19059885
Bug: http://b/
21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465
Chih-Hung Hsieh [Sat, 16 May 2015 00:21:18 +0000 (00:21 +0000)]
am
43850d19: Use unified syntax to compile with both llvm and gcc.
* commit '
43850d19f422d4850bebf765607e4f4d4b99df2e':
Use unified syntax to compile with both llvm and gcc.
Chih-Hung Hsieh [Sat, 16 May 2015 00:18:22 +0000 (17:18 -0700)]
resolved conflicts for merge of
22c21c6b to mnc-dev-plus-aosp
Change-Id: I8a3c79c441ec8d1002f20c9d55bffaa5efa01d14
Elliott Hughes [Fri, 15 May 2015 23:40:08 +0000 (23:40 +0000)]
am
fa7ba622: Don\'t use TEMP_FAILURE_RETRY on close in bionic.
* commit '
fa7ba6227f918dadca787a78ed3269bf86fd234d':
Don't use TEMP_FAILURE_RETRY on close in bionic.
Elliott Hughes [Fri, 15 May 2015 23:39:38 +0000 (23:39 +0000)]
am
882283e9: Merge "Don\'t use TEMP_FAILURE_RETRY on close in bionic."
* commit '
882283e9e2e64e596f1a244fa25d3586b2dea4da':
Don't use TEMP_FAILURE_RETRY on close in bionic.
Chih-Hung Hsieh [Mon, 11 May 2015 18:21:19 +0000 (11:21 -0700)]
Use unified syntax to compile with both llvm and gcc.
All arch-arm and arch-arm64 .S files were compiled
by gcc with and without this patch. The output object files
were identical. When compiled with llvm and this patch,
the output files were also identical to gcc's output.
BUG:
18061004
Change-Id: I458914d512ddf5496e4eb3d288bf032cd526d32b
(cherry picked from commit
33f33515b503b634d9fbc57dda7123ea9cf23fc6)
Chih-Hung Hsieh [Thu, 23 Apr 2015 21:27:10 +0000 (14:27 -0700)]
Fix opcode to compile with both gcc and llvm.
BUG:
17302991
Change-Id: I31febd9ad24312388068803ce247b295bd73b607
(cherry picked from commit
0a93df369cf3f44d40ca1f0cb4a58aeab42fb39c)
Elliott Hughes [Fri, 15 May 2015 23:20:07 +0000 (16:20 -0700)]
Don't use TEMP_FAILURE_RETRY on close in bionic.
Bug: http://b/
20501816
Change-Id: Id64b5109cc2b165fa0351b6edbb865a5e5058008
(cherry picked from commit
4e8ef698d0d76be3f8d75de32701e6e6327c1fbd)
Elliott Hughes [Fri, 15 May 2015 23:24:12 +0000 (23:24 +0000)]
Merge "Don't use TEMP_FAILURE_RETRY on close in bionic."
Elliott Hughes [Fri, 15 May 2015 23:20:07 +0000 (16:20 -0700)]
Don't use TEMP_FAILURE_RETRY on close in bionic.
Bug: http://b/
20501816
Change-Id: Id64b5109cc2b165fa0351b6edbb865a5e5058008
Dmitriy Ivanov [Fri, 15 May 2015 20:10:33 +0000 (20:10 +0000)]
am
ff407803: Remove -z global workaround for target x86
* commit '
ff407803dbbee26ab19c02aaece0e75c019534c4':
Remove -z global workaround for target x86
Dmitriy Ivanov [Fri, 15 May 2015 18:05:43 +0000 (18:05 +0000)]
am
1d52b8b0: Merge "Remove -z global workaround for target x86"
* commit '
1d52b8b07c327a6ef4936a7b9b08ddd4ee85002e':
Remove -z global workaround for target x86
Dmitriy Ivanov [Fri, 15 May 2015 04:28:21 +0000 (21:28 -0700)]
Remove -z global workaround for target x86
Change-Id: I08e75a1c7437c97e4af59316d2c14c7fa3f65e03
(cherry picked from commit
933332462d37dfa121fa691095cdce218a0139bf)
Dmitriy Ivanov [Fri, 15 May 2015 17:29:59 +0000 (17:29 +0000)]
Merge "Remove -z global workaround for target x86"
John Reck [Fri, 15 May 2015 16:57:03 +0000 (16:57 +0000)]
am
b00c23a8: Merge "Fix regression in crash reporting"
* commit '
b00c23a8dbc285673a4124797f8224f42082fd5a':
Fix regression in crash reporting
John Reck [Fri, 15 May 2015 16:37:57 +0000 (16:37 +0000)]
am
d7ad443c: Fix regression in crash reporting
* commit '
d7ad443cfd4e1315cdf45210bc94bb68e0564b8f':
Fix regression in crash reporting
John Reck [Fri, 15 May 2015 16:29:42 +0000 (16:29 +0000)]
Merge "Fix regression in crash reporting"
John Reck [Fri, 15 May 2015 14:47:17 +0000 (07:47 -0700)]
Fix regression in crash reporting
Bug:
19532651
Partial revert of
be0e43b77676338fd5e6a82c9cc2b6302d579de2
Change-Id: I99e220328aff985facb920ebcd84ac1a016759b5
(cherry picked from commit
d7ad443cfd4e1315cdf45210bc94bb68e0564b8f)
John Reck [Fri, 15 May 2015 14:47:17 +0000 (07:47 -0700)]
Fix regression in crash reporting
Bug:
19532651
Partial revert of
be0e43b77676338fd5e6a82c9cc2b6302d579de2
Change-Id: I99e220328aff985facb920ebcd84ac1a016759b5
Dmitriy Ivanov [Fri, 15 May 2015 04:28:21 +0000 (21:28 -0700)]
Remove -z global workaround for target x86
Change-Id: I08e75a1c7437c97e4af59316d2c14c7fa3f65e03
Spencer Low [Thu, 14 May 2015 01:45:59 +0000 (01:45 +0000)]
am
2a44cfbd: ScopedFd: Don\'t use TEMP_FAILURE_RETRY() with close()
* commit '
2a44cfbd7d64596795836e9ae6f6c642869d6d78':
ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()
Elliott Hughes [Thu, 14 May 2015 00:48:29 +0000 (00:48 +0000)]
am
0378d8f6: Merge "ScopedFd: Don\'t use TEMP_FAILURE_RETRY() with close()"
* commit '
0378d8f65126b2d94c731f2719a68773e370f615':
ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()
Spencer Low [Thu, 23 Apr 2015 01:06:51 +0000 (18:06 -0700)]
ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()
According to the comments in Posix_close(), TEMP_FAILURE_RETRY() should
not be used with close():
https://android.googlesource.com/platform/libcore/+/
462bdac45c10f43d88d8f07f6994e272a27c14a2%5E%21/#F12
Kill ScopedFd by simplifying the single caller.
Bug: http://b/
20501816
Change-Id: I248c40b8c2fc95f1938a6edfc245c81847fc44af
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
(cherry picked from commit
0346ad7a4fb6e253317577ee8b9cc79d958f4349)
Elliott Hughes [Thu, 14 May 2015 00:27:45 +0000 (00:27 +0000)]
Merge "ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()"
Elliott Hughes [Wed, 13 May 2015 21:26:55 +0000 (21:26 +0000)]
am
706eafc9: Merge "Fix unused result errors in bionic."
* commit '
706eafc9b05b2662e1bf139e678cbc784440cb58':
Fix unused result errors in bionic.
Elliott Hughes [Wed, 13 May 2015 21:09:41 +0000 (21:09 +0000)]
Merge "Fix unused result errors in bionic."
Spencer Low [Thu, 23 Apr 2015 01:06:51 +0000 (18:06 -0700)]
ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()
According to the comments in Posix_close(), TEMP_FAILURE_RETRY() should
not be used with close():
https://android.googlesource.com/platform/libcore/+/
462bdac45c10f43d88d8f07f6994e272a27c14a2%5E%21/#F12
Kill ScopedFd by simplifying the single caller.
Change-Id: I248c40b8c2fc95f1938a6edfc245c81847fc44af
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
Elliott Hughes [Wed, 13 May 2015 20:18:04 +0000 (13:18 -0700)]
Fix unused result errors in bionic.
This lets us use _FORTIFY_SOURCE=2 on the host.
Change-Id: I69f5ff9834bfd595aae6584104bee10c4d8a5eeb
Dmitriy Ivanov [Wed, 13 May 2015 15:52:28 +0000 (15:52 +0000)]
am
fe77d2d0: Merge "Improved dlsym tests and fixes to linker"
* commit '
fe77d2d0036306eec978eccf7b4db81fa424a2f3':
Improved dlsym tests and fixes to linker
Elliott Hughes [Wed, 13 May 2015 15:42:00 +0000 (15:42 +0000)]
am
d0763ba0: Merge "Update NOTICE files (the second time today)."
* commit '
d0763ba07693ec1d56f94e53e615eb4d7019eefa':
Update NOTICE files (the second time today).
Elliott Hughes [Wed, 13 May 2015 15:39:55 +0000 (08:39 -0700)]
resolved conflicts for merge of
3ff027e5 to mnc-dev-plus-aosp
Change-Id: I2ed217729d8f0d60f9e8e21735bb0a070b6a813f
Elliott Hughes [Wed, 13 May 2015 15:22:09 +0000 (15:22 +0000)]
am
8a330cad: Merge "Simplify three copyright headers."
* commit '
8a330cad8db512f5119251f55ac7bf606c552ed0':
Simplify three copyright headers.
Dmitriy Ivanov [Tue, 12 May 2015 21:09:22 +0000 (21:09 +0000)]
am
4bac6ea4: Improved dlsym tests and fixes to linker
* commit '
4bac6ea463a8f20793f5c1425965729ded1419fe':
Improved dlsym tests and fixes to linker
Dmitriy Ivanov [Tue, 12 May 2015 18:12:27 +0000 (11:12 -0700)]
Improved dlsym tests and fixes to linker
Answers the question: what if dependent library
was preloaded with RTLD_LOCAL flag.
Also add test for RTLD_NEXT within local_group.
Bug: http://b/
17512583
Change-Id: I79e081e68b3a8c0ed8980d4275a06515fea94ec9
(cherry picked from commit
697bd9fd38ab078a117ad9a5777cf286c467b9b9)
Dmitriy Ivanov [Tue, 12 May 2015 20:48:17 +0000 (20:48 +0000)]
Merge "Improved dlsym tests and fixes to linker"
Dmitriy Ivanov [Tue, 12 May 2015 18:12:27 +0000 (11:12 -0700)]
Improved dlsym tests and fixes to linker
Answers the question: what if dependent library
was preloaded with RTLD_LOCAL flag.
Also add test for RTLD_NEXT within local_group.
Bug: http://b/
17512583
Change-Id: I79e081e68b3a8c0ed8980d4275a06515fea94ec9
Elliott Hughes [Tue, 12 May 2015 18:10:50 +0000 (18:10 +0000)]
am
9cde1dc0: Update NOTICE files (the second time today).
* commit '
9cde1dc007c0965c7fd2a63d759e80627ee88f0f':
Update NOTICE files (the second time today).
Elliott Hughes [Tue, 12 May 2015 17:54:48 +0000 (17:54 +0000)]
am
dd57029e: Simplify three copyright headers.
* commit '
dd57029ed1dfc9cd3116d3797c40d92d5310594e':
Simplify three copyright headers.
Elliott Hughes [Tue, 12 May 2015 17:54:47 +0000 (17:54 +0000)]
am
97139e6a: Merge "Update NOTICE files." into mnc-dev
* commit '
97139e6adc255460a1b12e3ccc7b425d11e05eb1':
Update NOTICE files.
Elliott Hughes [Tue, 12 May 2015 17:44:37 +0000 (10:44 -0700)]
Update NOTICE files (the second time today).
Change-Id: Ifb031d29ee697ee0682bd651e0081493e8016e67
(cherry picked from commit
f58ac87182da214c7cdd697a4fa09aeb7b995305)
Elliott Hughes [Tue, 12 May 2015 17:47:04 +0000 (17:47 +0000)]
Merge "Update NOTICE files (the second time today)."
Elliott Hughes [Tue, 12 May 2015 17:44:37 +0000 (10:44 -0700)]
Update NOTICE files (the second time today).
Change-Id: Ifb031d29ee697ee0682bd651e0081493e8016e67
Elliott Hughes [Tue, 12 May 2015 17:43:45 +0000 (17:43 +0000)]
Merge "Update NOTICE files."
Elliott Hughes [Tue, 12 May 2015 17:10:01 +0000 (10:10 -0700)]
Simplify three copyright headers.
There's no reason to have multiple years in our own copyright headers,
and given the stupidity of our NOTICE file generation, it just creates
more junk.
Change-Id: I065a3811c2e2584e3b649a18ad9460286bc72b92
(cherry picked from commit
c69ace87ec110a91005bdf19dbafeb355f399c06)
Elliott Hughes [Tue, 12 May 2015 17:09:01 +0000 (10:09 -0700)]
Update NOTICE files.
(cherry-pick of
f0bd92db8966b04062fda0986dacf80891e1a378.)
Change-Id: I4e170118abf452dd87ffe79d343ba1e2b53955de
Elliott Hughes [Tue, 12 May 2015 17:29:10 +0000 (17:29 +0000)]
Merge "Update NOTICE files." into mnc-dev
Elliott Hughes [Tue, 12 May 2015 17:27:04 +0000 (17:27 +0000)]
Merge "Simplify three copyright headers."
Elliott Hughes [Tue, 12 May 2015 17:10:01 +0000 (10:10 -0700)]
Simplify three copyright headers.
There's no reason to have multiple years in our own copyright headers,
and given the stupidity of our NOTICE file generation, it just creates
more junk.
Change-Id: I065a3811c2e2584e3b649a18ad9460286bc72b92
Elliott Hughes [Tue, 12 May 2015 17:09:01 +0000 (10:09 -0700)]
Update NOTICE files.
Change-Id: I4e170118abf452dd87ffe79d343ba1e2b53955de
Chih-Hung Hsieh [Tue, 12 May 2015 04:50:28 +0000 (04:50 +0000)]
am
972d7fe6: Merge "Use unified syntax to compile with both llvm and gcc."
* commit '
972d7fe63a2e0636b070bec266479c27e0bb8c5f':
Use unified syntax to compile with both llvm and gcc.
Chih-Hung Hsieh [Tue, 12 May 2015 04:31:09 +0000 (04:31 +0000)]
Merge "Use unified syntax to compile with both llvm and gcc."
Chih-Hung Hsieh [Mon, 11 May 2015 18:21:19 +0000 (11:21 -0700)]
Use unified syntax to compile with both llvm and gcc.
All arch-arm and arch-arm64 .S files were compiled
by gcc with and without this patch. The output object files
were identical. When compiled with llvm and this patch,
the output files were also identical to gcc's output.
BUG:
18061004
Change-Id: I458914d512ddf5496e4eb3d288bf032cd526d32b
Elliott Hughes [Mon, 11 May 2015 20:47:29 +0000 (20:47 +0000)]
am
c9310266: Merge "Fix various bugs in the check-symbols script."
* commit '
c9310266dcdd65e4c5a55ab85d2f9e67a52750bf':
Fix various bugs in the check-symbols script.
Elliott Hughes [Mon, 11 May 2015 20:28:56 +0000 (20:28 +0000)]
Merge "Fix various bugs in the check-symbols script."
Elliott Hughes [Mon, 11 May 2015 19:10:40 +0000 (12:10 -0700)]
Fix various bugs in the check-symbols script.
It had bitrotted away during the last release cycle.
Change-Id: I20f0a3b409af4530b81f26299bef9de01530c9fd
Yabin Cui [Sat, 9 May 2015 00:07:45 +0000 (00:07 +0000)]
Merge "Fix timer flaky test in lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev
Andres Morales [Fri, 8 May 2015 22:30:17 +0000 (22:30 +0000)]
am
75f2dfca: Merge "remove rootdir build.prop"
* commit '
75f2dfca653dd57b6f65bf898ec4f45d87d18926':
remove rootdir build.prop
Andres Morales [Fri, 8 May 2015 22:13:43 +0000 (22:13 +0000)]
Merge "remove rootdir build.prop"
Andres Morales [Thu, 7 May 2015 22:15:46 +0000 (15:15 -0700)]
remove rootdir build.prop
merge with default.prop
Change-Id: I6cff4527dec2b31bdde42ec26c42ef2782f8deb4
Dmitriy Ivanov [Fri, 8 May 2015 21:36:45 +0000 (21:36 +0000)]
am
f7009f45: Switch libc/libcstdc++/libm to hash-style=both
* commit '
f7009f450e596dc76352da7ceefc8caeeb74ff14':
Switch libc/libcstdc++/libm to hash-style=both
Dmitriy Ivanov [Fri, 8 May 2015 21:33:57 +0000 (21:33 +0000)]
am
267f39bf: Merge "Switch libc/libcstdc++/libm to hash-style=both"
* commit '
267f39bf63044efe734c82c66f25f9b275a63c0b':
Switch libc/libcstdc++/libm to hash-style=both
Dmitriy Ivanov [Fri, 8 May 2015 21:07:08 +0000 (21:07 +0000)]
Merge "Switch libc/libcstdc++/libm to hash-style=both"
Yabin Cui [Fri, 8 May 2015 19:01:52 +0000 (12:01 -0700)]
Fix timer flaky test in lollipop-mr1-cts-dev.
It is partically cherry-pick from https://android-review.googlesource.com/#/c/123410/.
And as lollipop-mr1-cts-dev still uses stlport, <stdatomic.h> is used instead of <atomic>.
Bug:
20677618
Change-Id: I952a6fd074facc4227c955fecf3ecbfbbaec4193
Dmitriy Ivanov [Fri, 8 May 2015 19:05:47 +0000 (12:05 -0700)]
Switch libc/libcstdc++/libm to hash-style=both
Bug: http://b/
19059885
Change-Id: Ie42703d91f291fd689a1cf9c35bcab5c487b9a84
(cherry picked from commit
88e777d6f46709abebab88421e8c4ea7a9e3d9c4)
Dmitriy Ivanov [Fri, 8 May 2015 19:05:47 +0000 (12:05 -0700)]
Switch libc/libcstdc++/libm to hash-style=both
Bug: http://b/
19059885
Change-Id: Ie42703d91f291fd689a1cf9c35bcab5c487b9a84
Dan Albert [Fri, 8 May 2015 17:36:58 +0000 (17:36 +0000)]
am
11fc3f47: Merge "Apply same URL workaround to clean build."
* commit '
11fc3f47afa6c9566875df02f880dc317cb94437':
Apply same URL workaround to clean build.
Dan Albert [Fri, 8 May 2015 17:24:10 +0000 (17:24 +0000)]
am
5040aa4c: Merge changes from topic \'blobs\' into mnc-dev
* commit '
5040aa4c393b12ea12fde0fc757995559c0c8e5d':
Revert "Fix volantis boot."
Revert "Fix clang build."
Revert "Try again to fix clang build."
Dan Albert [Fri, 8 May 2015 17:15:31 +0000 (17:15 +0000)]
Merge "Apply same URL workaround to clean build."
Dan Albert [Fri, 8 May 2015 17:01:26 +0000 (17:01 +0000)]
Merge changes from topic 'blobs' into mnc-dev
* changes:
Revert "Fix volantis boot."
Revert "Fix clang build."
Revert "Try again to fix clang build."
Dan Albert [Fri, 8 May 2015 16:54:37 +0000 (16:54 +0000)]
am
a924d4ba: Merge changes from topic \'volantis-blobs\'
* commit '
a924d4ba2673246087b3b16e343e92ad67aefc71':
Revert "Fix volantis boot."
Revert "Fix clang build."
Revert "Try again to fix clang build."
Andres Morales [Fri, 8 May 2015 16:40:43 +0000 (16:40 +0000)]
am
271f0514: Merge "remove rootdir build.prop" into mnc-dev
* commit '
271f05148258bfb539099d02856d884aade86ae4':
remove rootdir build.prop
Dmitriy Ivanov [Fri, 8 May 2015 16:40:12 +0000 (16:40 +0000)]
am
f41ed6e5: Add definitions of Elf32_Sxword and ELFXX_R_INFO
* commit '
f41ed6e5490864e625c6c3d05d86e3c490602cad':
Add definitions of Elf32_Sxword and ELFXX_R_INFO
Dan Albert [Thu, 7 May 2015 22:12:24 +0000 (15:12 -0700)]
Revert "Fix volantis boot."
Bug: http://b/
20065774
This reverts commit
76e1cbca75e9fdaf7a7943f2c58e65433b283f4a.
(cherry picked from commit
7c2c01d681d7f2faa256a263996a35ac3edc94b3)
Dan Albert [Thu, 7 May 2015 22:12:16 +0000 (15:12 -0700)]
Revert "Fix clang build."
Bug: http://b/
20065774
This reverts commit
0975a5d9d29019e764dc0ab2ddc75759bebffb9b.
(cherry picked from commit
6f0d7005f9bc6d293e5cfcd60c13a6af0ffa99fc)
Dan Albert [Thu, 7 May 2015 22:11:41 +0000 (15:11 -0700)]
Revert "Try again to fix clang build."
Bug: http://b/
20065774
This reverts commit
dffd3c58389103d6ee712fac6544217c00c1f315.
Change-Id: I5dd095ff4ab133baa2afcbd4c79fbee55d05c459
(cherry picked from commit
f920f821e27c845d2de54c1c92c3ab74587ed31a)
Dan Albert [Fri, 8 May 2015 16:35:10 +0000 (16:35 +0000)]
Merge changes from topic 'volantis-blobs'
* changes:
Revert "Fix volantis boot."
Revert "Fix clang build."
Revert "Try again to fix clang build."
Andres Morales [Fri, 8 May 2015 15:00:41 +0000 (15:00 +0000)]
Merge "remove rootdir build.prop" into mnc-dev
Dmitriy Ivanov [Fri, 8 May 2015 07:08:27 +0000 (07:08 +0000)]
am
7d6b8db2: Merge "Add definitions of Elf32_Sxword and ELFXX_R_INFO"
* commit '
7d6b8db28ea4607dbefc25a4f799c4fd1bcc7869':
Add definitions of Elf32_Sxword and ELFXX_R_INFO
Dmitriy Ivanov [Fri, 8 May 2015 05:58:00 +0000 (22:58 -0700)]
Add definitions of Elf32_Sxword and ELFXX_R_INFO
Bug: http://b/
17056684
Change-Id: If35302245ac3ab40d1c80fb2b04620778c114f87
(cherry picked from commit
ce16a53d393512336f30c21a244afd70b7d57cf6)
Dmitriy Ivanov [Fri, 8 May 2015 06:49:05 +0000 (06:49 +0000)]
Merge "Add definitions of Elf32_Sxword and ELFXX_R_INFO"
Dmitriy Ivanov [Fri, 8 May 2015 05:58:00 +0000 (22:58 -0700)]
Add definitions of Elf32_Sxword and ELFXX_R_INFO
Bug: http://b/
17056684
Change-Id: If35302245ac3ab40d1c80fb2b04620778c114f87
Yabin Cui [Fri, 8 May 2015 01:59:26 +0000 (01:59 +0000)]
am
f9eeea6d: Merge "Remove pthread_detach_no_leak test."
* commit '
f9eeea6d6531b0dea837027c7e1f47bec837f311':
Remove pthread_detach_no_leak test.
Yabin Cui [Fri, 8 May 2015 01:36:29 +0000 (01:36 +0000)]
Merge "Remove pthread_detach_no_leak test."
Yabin Cui [Thu, 7 May 2015 23:53:25 +0000 (16:53 -0700)]
Remove pthread_detach_no_leak test.
This test has lost its purpose as we are using mmap/munmap for pthread_internal_t. And it is a flaky test.
Bug:
20860440
Change-Id: I7cbb6bc3fd8a2ca430415beab5ee27a856ce4ea7
Dan Albert [Thu, 7 May 2015 23:33:42 +0000 (16:33 -0700)]
Apply same URL workaround to clean build.
Change-Id: I63e63f6ffb879f49e36ee2d09821fc6fc47952c8
OSDN Git Service
