Dmitriy Ivanov
cd588f847f
Merge "Add constant for zip separator"
2015-07-16 15:59:16 +00:00
Dmitriy Ivanov
730ed9dfec
Add constant for zip separator
...
Change-Id: I1dcbb15ac612fc28e922eb3de8148fcaebbc0820
2015-07-16 04:52:06 -07:00
Evgenii Stepanov
fb186d55e8
am b3140904: Merge "Replace spaces with tabs in a Makefile."
...
* commit 'b31409040f1766d92e76e72bbdc1b346f4bb9d8e':
Replace spaces with tabs in a Makefile.
2015-07-15 23:58:44 +00:00
Evgenii Stepanov
beaf565cd4
am b3140904: Merge "Replace spaces with tabs in a Makefile."
...
* commit 'b31409040f1766d92e76e72bbdc1b346f4bb9d8e':
Replace spaces with tabs in a Makefile.
2015-07-15 23:57:15 +00:00
Evgenii Stepanov
b31409040f
Merge "Replace spaces with tabs in a Makefile."
2015-07-15 23:22:39 +00:00
Evgenii Stepanov
d11c3e5c3a
Replace spaces with tabs in a Makefile.
...
Sorry, I undertested my previous change and these guys somehow sneaked in.
This only affects SANITIZE_TARGET builds.
Change-Id: Id6986d89fa3d4965339f7b6fe973e9db73b380da
2015-07-15 16:19:59 -07:00
Evgenii Stepanov
760345a959
am e9774a52: Merge "A special linker for ASan executables."
...
* commit 'e9774a5227749035dc55357ae3a34edaf545c3b3':
A special linker for ASan executables.
2015-07-15 17:51:04 +00:00
Evgenii Stepanov
43a783714f
am e9774a52: Merge "A special linker for ASan executables."
...
* commit 'e9774a5227749035dc55357ae3a34edaf545c3b3':
A special linker for ASan executables.
2015-07-15 17:50:49 +00:00
Evgenii Stepanov
e9774a5227
Merge "A special linker for ASan executables."
2015-07-15 17:24:20 +00:00
Evgenii Stepanov
d640b225ec
A special linker for ASan executables.
...
Setup a /system/bin/linker_asan as a symlink to "linker".
Read the linker name from PT_INTERP, and if it is linker_asan,
switch default library lookup paths to the ASan set, which
starts with the path to the instrumented libraries
(/data/lib), followed by /system/lib as a fallback.
This ensures that ASan binaries prefer ASan libraries, when
available. This approach is way better then RPATH/RUNPATH and even
better than LD_LIBRARY_PATH:
- RUNPATH is per-DSO, while default paths are global.
- LD_LIBRARY_PATH is overwritten by android_update_LD_LIBRARY_PATH.
- neither RUNPATH nor LD_LIBRARY_PATH appear in
android_get_LD_LIBRARY_PATH which is used to build java.lang.path.
Having ASan libraries in java.lang.path is a good thing.
Bug: 22355945
Change-Id: I1d2791fbf5740618f18f71a3ae3d873714669d3f
2015-07-14 16:12:27 -07:00
Yabin Cui
a89821abe3
am 60a11dcb: Merge "Add test for an Android kernel bug about prctl."
...
* commit '60a11dcb44992f610e696fc246c70731012080dd':
Add test for an Android kernel bug about prctl.
2015-07-14 22:52:49 +00:00
Christopher Ferris
bf8809782e
am a8d82f12: Merge "Update to v3.18.18 kernel headers."
...
* commit 'a8d82f126d1830ebee99e2622d08489a844e3e62':
Update to v3.18.18 kernel headers.
2015-07-14 22:52:40 +00:00
Christopher Ferris
7236112561
am 5e3dc45a: Merge "Do not hold hash table lock while backtracing."
...
* commit '5e3dc45a16c63b716bc4b7bed2f5752b41a5d5d5':
Do not hold hash table lock while backtracing.
2015-07-14 21:30:11 +00:00
Yabin Cui
2f54a44110
am 60a11dcb: Merge "Add test for an Android kernel bug about prctl."
...
* commit '60a11dcb44992f610e696fc246c70731012080dd':
Add test for an Android kernel bug about prctl.
2015-07-14 20:27:23 +00:00
Christopher Ferris
3b9900d346
am a8d82f12: Merge "Update to v3.18.18 kernel headers."
...
* commit 'a8d82f126d1830ebee99e2622d08489a844e3e62':
Update to v3.18.18 kernel headers.
2015-07-14 20:27:06 +00:00
Christopher Ferris
653f4b1504
am 43d35c35: Merge "Do not hold hash table lock while backtracing." into mnc-dev
...
* commit '43d35c356e2fbe0b022cef52445e93053c4ddbfd':
Do not hold hash table lock while backtracing.
2015-07-14 17:15:51 +00:00
Yabin Cui
60a11dcb44
Merge "Add test for an Android kernel bug about prctl."
2015-07-14 02:48:45 +00:00
Yabin Cui
91ce715af1
Add test for an Android kernel bug about prctl.
...
Bug: 20017123
Change-Id: I8c109a06999a8bffcc8e8298b04ee637bb67d878
2015-07-13 19:15:38 -07:00
Christopher Ferris
a8d82f126d
Merge "Update to v3.18.18 kernel headers."
2015-07-14 01:29:46 +00:00
Christopher Ferris
dda4fd4644
Update to v3.18.18 kernel headers.
...
Change-Id: I0a0f423bda89500ad8e13a80582f05ec8bc756ea
2015-07-13 17:21:18 -07:00
Christopher Ferris
287cf2664f
am 5e3dc45a: Merge "Do not hold hash table lock while backtracing."
...
* commit '5e3dc45a16c63b716bc4b7bed2f5752b41a5d5d5':
Do not hold hash table lock while backtracing.
2015-07-13 20:53:02 +00:00
Christopher Ferris
5e3dc45a16
Merge "Do not hold hash table lock while backtracing."
2015-07-13 20:27:38 +00:00
Christopher Ferris
6db9c199a8
am 43d35c35: Merge "Do not hold hash table lock while backtracing." into mnc-dev
...
* commit '43d35c356e2fbe0b022cef52445e93053c4ddbfd':
Do not hold hash table lock while backtracing.
2015-07-13 20:25:57 +00:00
Christopher Ferris
3a40a0000a
Do not hold hash table lock while backtracing.
...
There is a deadlock if holding the hash table lock while trying to do
a backtrace. Change the code so that the hash table lock is only held
while actually modifying either g_hash_table, or while modifying an
entry from g_hash_table.
Bug: 22423683
(cherry picked from commit 9fee99b06013787054a312449b94115038e2ad7c)
Change-Id: I72173bfe6f824ceaceea625c24e7851b87467135
2015-07-13 13:18:31 -07:00
Christopher Ferris
43d35c356e
Merge "Do not hold hash table lock while backtracing." into mnc-dev
2015-07-13 20:15:30 +00:00
Christopher Ferris
9fee99b060
Do not hold hash table lock while backtracing.
...
There is a deadlock if holding the hash table lock while trying to do
a backtrace. Change the code so that the hash table lock is only held
while actually modifying either g_hash_table, or while modifying an
entry from g_hash_table.
Bug: 22423683
Change-Id: I604ea56f940f22e99da41ea4dcdf97bedaac268d
2015-07-13 12:17:50 -07:00
Elliott Hughes
45baf0f384
am 147a50d0: Merge "Prevent user-defined basename_r from breaking basename(3)."
...
* commit '147a50d06e1183e3f39f4f6d0fa28748b33d4aa9':
Prevent user-defined basename_r from breaking basename(3).
2015-07-11 07:25:20 +00:00
Elliott Hughes
acf2b7bea6
am 147a50d0: Merge "Prevent user-defined basename_r from breaking basename(3)."
...
* commit '147a50d06e1183e3f39f4f6d0fa28748b33d4aa9':
Prevent user-defined basename_r from breaking basename(3).
2015-07-11 07:23:37 +00:00
Elliott Hughes
147a50d06e
Merge "Prevent user-defined basename_r from breaking basename(3)."
2015-07-11 07:03:54 +00:00
Elliott Hughes
a20a35fdda
Prevent user-defined basename_r from breaking basename(3).
...
LP64 is immune because basename_r is hidden there, but on LP32 a basename_r
defined in the executable breaks basename because its call to basename_r
will resolve to that one rather than the one in libc.
Bug: http://b/22415484
Change-Id: Ied3ca7ad3fb0e744eb705fc924743f893b4ad490
2015-07-10 23:58:59 -07:00
Neil Fuller
c64ed22e9b
am 64c82544: Merge "Update timezone data to 2015e" into mnc-dev
...
* commit '64c825441637b379be56a04622089e8e9b4b0da4':
Update timezone data to 2015e
2015-07-10 17:00:49 +00:00
Neil Fuller
533efc20b7
am 64c82544: Merge "Update timezone data to 2015e" into mnc-dev
...
* commit '64c825441637b379be56a04622089e8e9b4b0da4':
Update timezone data to 2015e
2015-07-10 10:35:23 +00:00
Neil Fuller
64c8254416
Merge "Update timezone data to 2015e" into mnc-dev
2015-07-10 09:47:55 +00:00
Dmitriy Ivanov
db996ae74c
am a5bb841d: Fix memory-leak on soinfo_free()
...
* commit 'a5bb841df799e10e7d0ae3202b097da8a1c23507':
Fix memory-leak on soinfo_free()
2015-07-10 01:44:15 +00:00
Dmitriy Ivanov
538a4d7029
am a5bb841d: Fix memory-leak on soinfo_free()
...
* commit 'a5bb841df799e10e7d0ae3202b097da8a1c23507':
Fix memory-leak on soinfo_free()
2015-07-10 00:59:25 +00:00
Dmitriy Ivanov
a5bb841df7
Fix memory-leak on soinfo_free()
...
Bug: http://b/22290728
Change-Id: I00747056db2cd3ff8b33936278464daed7236536
(cherry picked from commit 609f11b31ecedc4e9f2a1f6017b60b1f51b15c22)
2015-07-09 17:03:37 -07:00
Dmitriy Ivanov
9d4402a95c
am 880a2933: Merge "Fix memory-leak on soinfo_free()"
...
* commit '880a293390b64da806a072f4ace2c2784b340876':
Fix memory-leak on soinfo_free()
2015-07-09 23:54:12 +00:00
Dmitriy Ivanov
7974b83443
am 880a2933: Merge "Fix memory-leak on soinfo_free()"
...
* commit '880a293390b64da806a072f4ace2c2784b340876':
Fix memory-leak on soinfo_free()
2015-07-09 23:53:33 +00:00
Dmitriy Ivanov
880a293390
Merge "Fix memory-leak on soinfo_free()"
2015-07-09 23:32:19 +00:00
Pirama Arumuga Nainar
a13ece0d6c
am d1e10d7d: Merge "Use delete[] to de-allocate pointers from new[]"
...
* commit 'd1e10d7d168a8461d9eb47e48802ea11d8bd0640':
Use delete[] to de-allocate pointers from new[]
2015-07-09 23:06:07 +00:00
Pirama Arumuga Nainar
fcd017148b
am d1e10d7d: Merge "Use delete[] to de-allocate pointers from new[]"
...
* commit 'd1e10d7d168a8461d9eb47e48802ea11d8bd0640':
Use delete[] to de-allocate pointers from new[]
2015-07-09 23:04:30 +00:00
Pirama Arumuga Nainar
d1e10d7d16
Merge "Use delete[] to de-allocate pointers from new[]"
2015-07-09 22:40:51 +00:00
Pirama Arumuga Nainar
4d44675283
Use delete[] to de-allocate pointers from new[]
...
Upstream clang has a new diagnostic, '-Wmismatched-new-delete' to
generate a warning (that becomes an error with -Werror) when delete is
used to deallocate pointers created with 'new[]'. This patch fixes
'delete's that trigger this warning/error.
Change-Id: Id7b6f6c2df3e860e576de55e2f61f3d2be3a3986
2015-07-09 10:15:15 -07:00
Dmitriy Ivanov
609f11b31e
Fix memory-leak on soinfo_free()
...
Bug: http://b/22290728
Change-Id: I00747056db2cd3ff8b33936278464daed7236536
2015-07-08 15:26:46 -07:00
Daniel Erat
818295c3f7
am c6f25641: Merge "libc: Add sys/fcntl.h for compatibility."
...
* commit 'c6f25641eb874cd15f92759beff1ad67cfd8228b':
libc: Add sys/fcntl.h for compatibility.
2015-07-08 21:45:39 +00:00
Daniel Erat
16d78688b4
am c6f25641: Merge "libc: Add sys/fcntl.h for compatibility."
...
* commit 'c6f25641eb874cd15f92759beff1ad67cfd8228b':
libc: Add sys/fcntl.h for compatibility.
2015-07-08 21:44:59 +00:00
Daniel Erat
c6f25641eb
Merge "libc: Add sys/fcntl.h for compatibility."
2015-07-08 21:15:23 +00:00
Daniel Erat
e55151472b
libc: Add sys/fcntl.h for compatibility.
...
Add a /usr/include/sys/fcntl.h file that includes <fcntl.h>.
Change-Id: Ie34bf7519607c5aae1fbea7c7dca249c9b7801cc
2015-07-08 15:07:17 -06:00
Evgenii Stepanov
c9bd26e96b
am 33ef6c20: Merge "Respect caller DT_RUNPATH in dlopen()."
...
* commit '33ef6c20f2ddf19b29ed3a4e50139fa391b1a3d4':
Respect caller DT_RUNPATH in dlopen().
2015-07-08 20:16:59 +00:00
Evgenii Stepanov
b4f5d6d894
am 33ef6c20: Merge "Respect caller DT_RUNPATH in dlopen()."
...
* commit '33ef6c20f2ddf19b29ed3a4e50139fa391b1a3d4':
Respect caller DT_RUNPATH in dlopen().
2015-07-08 20:16:35 +00:00