Elliott Hughes
c9310266dc
Merge "Fix various bugs in the check-symbols script."
2015-05-11 20:28:57 +00:00
Elliott Hughes
ec738d9494
Fix various bugs in the check-symbols script.
...
It had bitrotted away during the last release cycle.
Change-Id: I20f0a3b409af4530b81f26299bef9de01530c9fd
2015-05-11 12:10:40 -07:00
Yabin Cui
473d96c0a8
Merge "Fix timer flaky test in lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev
2015-05-09 00:07:45 +00:00
Andres Morales
e5c9a8e4cf
am 75f2dfca: Merge "remove rootdir build.prop"
...
* commit '75f2dfca653dd57b6f65bf898ec4f45d87d18926':
remove rootdir build.prop
2015-05-08 22:30:17 +00:00
Andres Morales
75f2dfca65
Merge "remove rootdir build.prop"
2015-05-08 22:13:44 +00:00
Andres Morales
4e8cda641a
remove rootdir build.prop
...
merge with default.prop
Change-Id: I6cff4527dec2b31bdde42ec26c42ef2782f8deb4
2015-05-08 22:13:15 +00:00
Dmitriy Ivanov
7eb944edee
am f7009f45: Switch libc/libcstdc++/libm to hash-style=both
...
* commit 'f7009f450e596dc76352da7ceefc8caeeb74ff14':
Switch libc/libcstdc++/libm to hash-style=both
2015-05-08 21:36:45 +00:00
Dmitriy Ivanov
1a31d128b9
am 267f39bf: Merge "Switch libc/libcstdc++/libm to hash-style=both"
...
* commit '267f39bf63044efe734c82c66f25f9b275a63c0b':
Switch libc/libcstdc++/libm to hash-style=both
2015-05-08 21:33:57 +00:00
Dmitriy Ivanov
267f39bf63
Merge "Switch libc/libcstdc++/libm to hash-style=both"
2015-05-08 21:07:09 +00:00
Yabin Cui
5c0996a969
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
2015-05-08 13:12:01 -07:00
Dmitriy Ivanov
f7009f450e
Switch libc/libcstdc++/libm to hash-style=both
...
Bug: http://b/19059885
Change-Id: Ie42703d91f291fd689a1cf9c35bcab5c487b9a84
(cherry picked from commit 88e777d6f46709abebab88421e8c4ea7a9e3d9c4)
2015-05-08 12:17:21 -07:00
Dmitriy Ivanov
88e777d6f4
Switch libc/libcstdc++/libm to hash-style=both
...
Bug: http://b/19059885
Change-Id: Ie42703d91f291fd689a1cf9c35bcab5c487b9a84
2015-05-08 12:06:20 -07:00
Dan Albert
e16e0e75e2
am 11fc3f47: Merge "Apply same URL workaround to clean build."
...
* commit '11fc3f47afa6c9566875df02f880dc317cb94437':
Apply same URL workaround to clean build.
2015-05-08 17:36:58 +00:00
Dan Albert
d9d0207d56
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."
2015-05-08 17:24:10 +00:00
Dan Albert
11fc3f47af
Merge "Apply same URL workaround to clean build."
2015-05-08 17:15:31 +00:00
Dan Albert
5040aa4c39
Merge changes from topic 'blobs' into mnc-dev
...
* changes:
Revert "Fix volantis boot."
Revert "Fix clang build."
Revert "Try again to fix clang build."
2015-05-08 17:01:29 +00:00
Dan Albert
8ffddd1725
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."
2015-05-08 16:54:37 +00:00
Andres Morales
bc79ee1d45
am 271f0514: Merge "remove rootdir build.prop" into mnc-dev
...
* commit '271f05148258bfb539099d02856d884aade86ae4':
remove rootdir build.prop
2015-05-08 16:40:43 +00:00
Dmitriy Ivanov
d950830406
am f41ed6e5: Add definitions of Elf32_Sxword and ELFXX_R_INFO
...
* commit 'f41ed6e5490864e625c6c3d05d86e3c490602cad':
Add definitions of Elf32_Sxword and ELFXX_R_INFO
2015-05-08 16:40:12 +00:00
Dan Albert
6b27e6e8e0
Revert "Fix volantis boot."
...
Bug: http://b/20065774
This reverts commit 76e1cbca75e9fdaf7a7943f2c58e65433b283f4a.
(cherry picked from commit 7c2c01d681d7f2faa256a263996a35ac3edc94b3)
2015-05-08 09:36:03 -07:00
Dan Albert
20db140181
Revert "Fix clang build."
...
Bug: http://b/20065774
This reverts commit 0975a5d9d29019e764dc0ab2ddc75759bebffb9b.
(cherry picked from commit 6f0d7005f9bc6d293e5cfcd60c13a6af0ffa99fc)
2015-05-08 09:35:54 -07:00
Dan Albert
6accf55bf3
Revert "Try again to fix clang build."
...
Bug: http://b/20065774
This reverts commit dffd3c58389103d6ee712fac6544217c00c1f315.
Change-Id: I5dd095ff4ab133baa2afcbd4c79fbee55d05c459
(cherry picked from commit f920f821e27c845d2de54c1c92c3ab74587ed31a)
2015-05-08 09:35:48 -07:00
Dan Albert
a924d4ba26
Merge changes from topic 'volantis-blobs'
...
* changes:
Revert "Fix volantis boot."
Revert "Fix clang build."
Revert "Try again to fix clang build."
2015-05-08 16:35:13 +00:00
Andres Morales
271f051482
Merge "remove rootdir build.prop" into mnc-dev
2015-05-08 15:00:42 +00:00
Dmitriy Ivanov
d7a6c3d2ae
am 7d6b8db2: Merge "Add definitions of Elf32_Sxword and ELFXX_R_INFO"
...
* commit '7d6b8db28ea4607dbefc25a4f799c4fd1bcc7869':
Add definitions of Elf32_Sxword and ELFXX_R_INFO
2015-05-08 07:08:27 +00:00
Dmitriy Ivanov
f41ed6e549
Add definitions of Elf32_Sxword and ELFXX_R_INFO
...
Bug: http://b/17056684
Change-Id: If35302245ac3ab40d1c80fb2b04620778c114f87
(cherry picked from commit ce16a53d393512336f30c21a244afd70b7d57cf6)
2015-05-07 23:49:40 -07:00
Dmitriy Ivanov
7d6b8db28e
Merge "Add definitions of Elf32_Sxword and ELFXX_R_INFO"
2015-05-08 06:49:05 +00:00
Dmitriy Ivanov
ce16a53d39
Add definitions of Elf32_Sxword and ELFXX_R_INFO
...
Bug: http://b/17056684
Change-Id: If35302245ac3ab40d1c80fb2b04620778c114f87
2015-05-07 23:10:16 -07:00
Yabin Cui
86af743d96
am f9eeea6d: Merge "Remove pthread_detach_no_leak test."
...
* commit 'f9eeea6d6531b0dea837027c7e1f47bec837f311':
Remove pthread_detach_no_leak test.
2015-05-08 01:59:26 +00:00
Yabin Cui
f9eeea6d65
Merge "Remove pthread_detach_no_leak test."
2015-05-08 01:36:30 +00:00
Yabin Cui
2957cc5f10
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
2015-05-07 16:53:25 -07:00
Dan Albert
ded34ce94f
Apply same URL workaround to clean build.
...
Change-Id: I63e63f6ffb879f49e36ee2d09821fc6fc47952c8
2015-05-07 16:33:42 -07:00
Andres Morales
d3cea8725f
remove rootdir build.prop
...
merge with default.prop
Change-Id: I6cff4527dec2b31bdde42ec26c42ef2782f8deb4
2015-05-07 15:15:46 -07:00
Dan Albert
7c2c01d681
Revert "Fix volantis boot."
...
Bug: http://b/20065774
This reverts commit 76e1cbca75e9fdaf7a7943f2c58e65433b283f4a.
2015-05-07 15:12:24 -07:00
Dan Albert
6f0d7005f9
Revert "Fix clang build."
...
Bug: http://b/20065774
This reverts commit 0975a5d9d29019e764dc0ab2ddc75759bebffb9b.
2015-05-07 15:12:16 -07:00
Dan Albert
f920f821e2
Revert "Try again to fix clang build."
...
Bug: http://b/20065774
This reverts commit dffd3c58389103d6ee712fac6544217c00c1f315.
Change-Id: I5dd095ff4ab133baa2afcbd4c79fbee55d05c459
2015-05-07 15:11:48 -07:00
Dmitriy Ivanov
d48c8ace18
am dc10b077: Merge "Properly align init/fini_arrays for crtend.o"
...
* commit 'dc10b077ea52baaa1b7be42eb5d2ba05a8a8c860':
Properly align init/fini_arrays for crtend.o
2015-05-07 20:21:53 +00:00
Dmitriy Ivanov
174bbdbf9e
am af7e806c: Properly align init/fini_arrays for crtend.o
...
* commit 'af7e806cec7088d5d8e9898c13aaa1bbdc07a082':
Properly align init/fini_arrays for crtend.o
2015-05-07 20:21:48 +00:00
Dmitriy Ivanov
af7e806cec
Properly align init/fini_arrays for crtend.o
...
Also remove them from crtend_so.o
Bug: http://b/20532404
Change-Id: I56a0f80c4b3a83cf11d28bbf17791ff4ce10c5d2
(cherry picked from commit e543c7612e97c4c0f11143b8fcd2fff46364f936)
2015-05-07 12:56:15 -07:00
Dmitriy Ivanov
dc10b077ea
Merge "Properly align init/fini_arrays for crtend.o"
2015-05-07 19:55:25 +00:00
Dmitriy Ivanov
cf8231e7a8
am b3c01d05: Use realpath for log and error messages
...
* commit 'b3c01d05387e8576edcb0df1ad80a326d1d3a418':
Use realpath for log and error messages
2015-05-07 19:11:31 +00:00
Dmitriy Ivanov
e543c7612e
Properly align init/fini_arrays for crtend.o
...
Also remove them from crtend_so.o
Bug: http://b/20532404
Change-Id: I56a0f80c4b3a83cf11d28bbf17791ff4ce10c5d2
2015-05-07 11:57:53 -07:00
Dmitriy Ivanov
3ab5146c03
am 9c189418: Merge "Use realpath for log and error messages"
...
* commit '9c1894186cb33391732a6c33bd08e14d7b43cc89':
Use realpath for log and error messages
2015-05-07 18:27:19 +00:00
Dmitriy Ivanov
b3c01d0538
Use realpath for log and error messages
...
Bug: http://b/20885931
Change-Id: Ida8ab7982ca75fa73da13c4cb10a6b2e53bc2c8e
(cherry picked from commit 3edb9182ff2fddfa2d835aab0cad151616f2eac5)
2015-05-07 11:04:28 -07:00
Dmitriy Ivanov
9c1894186c
Merge "Use realpath for log and error messages"
2015-05-07 17:55:39 +00:00
Dmitriy Ivanov
3edb9182ff
Use realpath for log and error messages
...
Bug: http://b/20885931
Change-Id: Ida8ab7982ca75fa73da13c4cb10a6b2e53bc2c8e
2015-05-07 10:48:00 -07:00
Dmitriy Ivanov
15eabcc295
am fff06e62: Merge "Move pthread_atfork_dlclose test out of static lib"
...
* commit 'fff06e624db96f1d876627fa0a122cdf65f41698':
Move pthread_atfork_dlclose test out of static lib
2015-05-07 16:15:44 +00:00
Dmitriy Ivanov
597fd464de
am c95a9e9d: Merge "VersionTracker: Ignore libraries without soname"
...
* commit 'c95a9e9dad126108a0106844f4d572d4cd4ae103':
VersionTracker: Ignore libraries without soname
2015-05-07 09:00:10 +00:00
Dmitriy Ivanov
4c95c08bca
am a60fd09e: Move pthread_atfork_dlclose test out of static lib
...
* commit 'a60fd09e2692e17c8bfa210d3cb64b490aea4c9d':
Move pthread_atfork_dlclose test out of static lib
2015-05-07 05:27:54 +00:00
Dmitriy Ivanov
a60fd09e26
Move pthread_atfork_dlclose test out of static lib
...
Bug: http://b/20858755
Change-Id: I0d84e8b43dc33902d75af18db6b7c8e0b619d718
(cherry picked from commit 5624a6a1e52ff959b0f88765d38f190700422773)
2015-05-06 16:47:54 -07:00