Elliott Hughes
ebd4fc9328
resolved conflicts for merge of 3ff027e5 to mnc-dev-plus-aosp
...
Change-Id: I2ed217729d8f0d60f9e8e21735bb0a070b6a813f
2015-05-13 08:39:55 -07:00
Elliott Hughes
5a9ab18d94
am 8a330cad: Merge "Simplify three copyright headers."
...
* commit '8a330cad8db512f5119251f55ac7bf606c552ed0':
Simplify three copyright headers.
2015-05-13 15:22:09 +00:00
Dmitriy Ivanov
e598be94de
am 4bac6ea4: Improved dlsym tests and fixes to linker
...
* commit '4bac6ea463a8f20793f5c1425965729ded1419fe':
Improved dlsym tests and fixes to linker
2015-05-12 21:09:22 +00:00
Dmitriy Ivanov
4bac6ea463
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 697bd9fd38 )
2015-05-12 13:49:13 -07:00
Elliott Hughes
898685ffd2
am 9cde1dc0: Update NOTICE files (the second time today).
...
* commit '9cde1dc007c0965c7fd2a63d759e80627ee88f0f':
Update NOTICE files (the second time today).
2015-05-12 18:10:50 +00:00
Elliott Hughes
fe20ea1547
am dd57029e: Simplify three copyright headers.
...
* commit 'dd57029ed1dfc9cd3116d3797c40d92d5310594e':
Simplify three copyright headers.
2015-05-12 17:54:48 +00:00
Elliott Hughes
e38f97ade7
am 97139e6a: Merge "Update NOTICE files." into mnc-dev
...
* commit '97139e6adc255460a1b12e3ccc7b425d11e05eb1':
Update NOTICE files.
2015-05-12 17:54:47 +00:00
Elliott Hughes
9cde1dc007
Update NOTICE files (the second time today).
...
Change-Id: Ifb031d29ee697ee0682bd651e0081493e8016e67
(cherry picked from commit f58ac87182 )
2015-05-12 10:52:52 -07:00
Elliott Hughes
3ff027e550
Merge "Update NOTICE files."
2015-05-12 17:43:46 +00:00
Elliott Hughes
dd57029ed1
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 c69ace87ec )
2015-05-12 10:34:22 -07:00
Elliott Hughes
7e54c762fc
Update NOTICE files.
...
(cherry-pick of f0bd92db8966b04062fda0986dacf80891e1a378.)
Change-Id: I4e170118abf452dd87ffe79d343ba1e2b53955de
2015-05-12 10:33:20 -07:00
Elliott Hughes
97139e6adc
Merge "Update NOTICE files." into mnc-dev
2015-05-12 17:29:25 +00:00
Elliott Hughes
8a330cad8d
Merge "Simplify three copyright headers."
2015-05-12 17:27:04 +00:00
Elliott Hughes
c69ace87ec
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
2015-05-12 10:10:01 -07:00
Elliott Hughes
f0bd92db89
Update NOTICE files.
...
Change-Id: I4e170118abf452dd87ffe79d343ba1e2b53955de
2015-05-12 10:09:01 -07:00
Chih-Hung Hsieh
2e956c1a26
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.
2015-05-12 04:50:28 +00:00
Chih-Hung Hsieh
972d7fe63a
Merge "Use unified syntax to compile with both llvm and gcc."
2015-05-12 04:31:10 +00:00
Chih-Hung Hsieh
33f33515b5
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
2015-05-11 17:15:03 -07:00
Elliott Hughes
06d3a9c7dd
am c9310266: Merge "Fix various bugs in the check-symbols script."
...
* commit 'c9310266dcdd65e4c5a55ab85d2f9e67a52750bf':
Fix various bugs in the check-symbols script.
2015-05-11 20:47:29 +00:00
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
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
Dmitriy Ivanov
f7009f450e
Switch libc/libcstdc++/libm to hash-style=both
...
Bug: http://b/19059885
Change-Id: Ie42703d91f291fd689a1cf9c35bcab5c487b9a84
(cherry picked from commit 88e777d6f4 )
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 76e1cbca75 .
(cherry picked from commit 7c2c01d681 )
2015-05-08 09:36:03 -07:00
Dan Albert
20db140181
Revert "Fix clang build."
...
Bug: http://b/20065774
This reverts commit 0975a5d9d2 .
(cherry picked from commit 6f0d7005f9 )
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 dffd3c5838 .
Change-Id: I5dd095ff4ab133baa2afcbd4c79fbee55d05c459
(cherry picked from commit f920f821e2 )
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 ce16a53d39 )
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