Nick Kralevich
ac14f9710b
am 801411da
: am 6d08a0d3
: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
...
* commit '801411daca44a46338d8fa5e9015b85d94ecb471':
AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
2015-04-09 00:31:57 +00:00
Ying Wang
133415d551
am 4acabe0f
: resolved conflicts for merge of f5b9830b
to stage-aosp-master
...
* commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3':
Better way to package up the otatools-package.
2015-04-09 00:31:56 +00:00
Nick Kralevich
6d08a0d3fc
Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
2015-04-08 22:50:03 +00:00
Ying Wang
c45a47b5f3
Better way to package up the otatools-package.
...
With this, you can easily add more executables, jars or shared libraries
to the package. Also now it automatically takes care of
32-bit-v.s.-64-bit library issue.
Change-Id: I5afe00fadc978d0da229b192eca1a4b1c149764e
2015-04-08 12:40:37 -07:00
Nick Kralevich
9b44afb452
AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
...
Some programs (cough sqlite cough) do an improper check to see if
HAVE_MALLOC_H is defined. Instead of defining it with no value,
define it with a value so those checks pass.
Needed for bug: 20099586
Change-Id: I4c293b2c1b5f4caad85ffc1fc34ac385bab23f5c
2015-04-08 12:21:54 -07:00
Ying Wang
ea5178545b
am aacc8bb4
: am 18ecae31
: Merge "Convert bc depfiles to .P files."
...
* commit 'aacc8bb4efb993e1d5ae539aa154c60d84a926dc':
Convert bc depfiles to .P files.
2015-04-04 01:29:29 +00:00
Ying Wang
aacc8bb4ef
am 18ecae31
: Merge "Convert bc depfiles to .P files."
...
* commit '18ecae31e62365d658406ff33a93358beeb87553':
Convert bc depfiles to .P files.
2015-04-04 01:19:52 +00:00
Ying Wang
18ecae31e6
Merge "Convert bc depfiles to .P files."
2015-04-04 01:09:55 +00:00
Ying Wang
b931956076
Convert bc depfiles to .P files.
...
So you don't need clean step when a header file gets moved or deleted.
Change-Id: Iec0d63b89ba17c4ef0ad75f4a52b6759f2bff58a
2015-04-03 16:55:09 -07:00
Elliott Hughes
5432d3551d
am 7616909b
: am 519751a8
: Merge "There\'s no such thing as _THREAD_SAFE."
...
* commit '7616909b5e24289eb7caecb4708f0c69a09a26f9':
There's no such thing as _THREAD_SAFE.
2015-04-03 22:23:06 +00:00
Elliott Hughes
7616909b5e
am 519751a8
: Merge "There\'s no such thing as _THREAD_SAFE."
...
* commit '519751a88217e6fdc3b86979ffaf61ff03d92312':
There's no such thing as _THREAD_SAFE.
2015-04-03 22:05:32 +00:00
Elliott Hughes
98ff711a5d
There's no such thing as _THREAD_SAFE.
...
At least, as far as I can tell from the internet and from grep in /usr/include
on a Mac.
Change-Id: I7f39bb2013db88e59f604e4491344d0d342e5f0b
2015-04-03 13:41:10 -07:00
Elliott Hughes
aa1bd1462d
am d9ac3e9a
: am 97bcf915
: Merge "Remove HAVE_PRINTF_ZD."
...
* commit 'd9ac3e9ad6079cf402e5c6895d54e0b3e3e2c455':
Remove HAVE_PRINTF_ZD.
2015-04-03 20:40:54 +00:00
Elliott Hughes
d9ac3e9ad6
am 97bcf915
: Merge "Remove HAVE_PRINTF_ZD."
...
* commit '97bcf915ad005a4baeb981ed8da09ab219973b1f':
Remove HAVE_PRINTF_ZD.
2015-04-03 20:30:45 +00:00
Elliott Hughes
8a11491bc9
Remove HAVE_PRINTF_ZD.
...
Change-Id: Ie7677e4816ad886c13a8ac869e7c7342082a350f
2015-04-03 13:05:53 -07:00
Elliott Hughes
6f4befa053
am 5d375b92
: am dbaee628
: Merge "Remove HAVE_STRLCPY."
...
* commit '5d375b92fcedd9db052eb0ed3834361002e7699f':
Remove HAVE_STRLCPY.
2015-04-03 19:59:00 +00:00
Elliott Hughes
5d375b92fc
am dbaee628
: Merge "Remove HAVE_STRLCPY."
...
* commit 'dbaee628ec6a8215b59db66dac86846e6481263a':
Remove HAVE_STRLCPY.
2015-04-03 19:48:11 +00:00
Elliott Hughes
dbaee628ec
Merge "Remove HAVE_STRLCPY."
2015-04-03 19:42:06 +00:00
Ying Wang
a840faef51
am c35e7902
: am 555b7770
: Merge "Move the inclusion of depfile to where it\'s generated."
...
* commit 'c35e7902679caf85d4295eca423b5df3dccaf79d':
Move the inclusion of depfile to where it's generated.
2015-04-03 17:15:06 +00:00
Ying Wang
c35e790267
am 555b7770
: Merge "Move the inclusion of depfile to where it\'s generated."
...
* commit '555b7770fef6024ac6fe4e580f8a8d1663ceb001':
Move the inclusion of depfile to where it's generated.
2015-04-03 17:04:29 +00:00
Ying Wang
555b7770fe
Merge "Move the inclusion of depfile to where it's generated."
2015-04-03 16:55:44 +00:00
Ying Wang
cddece6f8f
Move the inclusion of depfile to where it's generated.
...
Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38
2015-04-03 09:53:41 -07:00
Ying Wang
0216641e04
am 6fe4ab94
: am 58912c87
: Merge "Don\'t fail build of otatools if there are no device certificates"
...
* commit '6fe4ab94878c7fd96ca41ac93c0684ba86e10a45':
Don't fail build of otatools if there are no device certificates
2015-04-03 16:14:37 +00:00
Ying Wang
6fe4ab9487
am 58912c87
: Merge "Don\'t fail build of otatools if there are no device certificates"
...
* commit '58912c874bff05e3e76ccc7b7907f628ed010bf5':
Don't fail build of otatools if there are no device certificates
2015-04-03 16:04:43 +00:00
Ying Wang
58912c874b
Merge "Don't fail build of otatools if there are no device certificates"
2015-04-03 15:57:57 +00:00
Ying Wang
5c11bd52db
am 20fa9a8e
: am 62003acd
: Merge "Use PRIVATE_ALL_OBJECTS"
...
* commit '20fa9a8e65cd84cabc563f87839706d9f7308a8f':
Use PRIVATE_ALL_OBJECTS
2015-04-03 01:19:10 +00:00
Ying Wang
20fa9a8e65
am 62003acd
: Merge "Use PRIVATE_ALL_OBJECTS"
...
* commit '62003acdcc2ecdc13ce2a9880c35147d2070e865':
Use PRIVATE_ALL_OBJECTS
2015-04-03 01:11:22 +00:00
Ying Wang
62003acdcc
Merge "Use PRIVATE_ALL_OBJECTS"
2015-04-03 01:03:50 +00:00
Ying Wang
854607ec49
Use PRIVATE_ALL_OBJECTS
...
Instead of the dirty $(filter) call.
Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005
2015-04-02 18:02:33 -07:00
Elliott Hughes
8f06d8afb8
Remove HAVE_STRLCPY.
...
Change-Id: I27864a9075183de5bd83569d53a00fc2f53c96df
2015-04-02 16:43:52 -07:00
Chih-Hung Hsieh
e04e91b1fb
am ead61626
: am ced6159b
: Merge "Filter out gcc flags that are not recognized by clang."
...
* commit 'ead6162694de41e3fa611be1cd1d615b31c2919c':
Filter out gcc flags that are not recognized by clang.
2015-04-02 22:35:34 +00:00
Chih-Hung Hsieh
ead6162694
am ced6159b
: Merge "Filter out gcc flags that are not recognized by clang."
...
* commit 'ced6159b7e5551fcd3f64c21b7807c7555f80f73':
Filter out gcc flags that are not recognized by clang.
2015-04-02 22:28:30 +00:00
Chih-Hung Hsieh
9205bc1da6
Filter out gcc flags that are not recognized by clang.
...
Change-Id: I04e95fc3b0cb2825bf90a55916f89d25fa9fc475
2015-04-02 14:42:20 -07:00
Ying Wang
4a284ac3e0
am da885b90
: am 71d4c95f
: Merge "Fix typo."
...
* commit 'da885b90e4c47a0e29597da185ec95a7e4e3a73c':
Fix typo.
2015-04-02 20:07:52 +00:00
Ying Wang
da885b90e4
am 71d4c95f
: Merge "Fix typo."
...
* commit '71d4c95f83018199b8e79d0800dd2eca80b9f728':
Fix typo.
2015-04-02 19:57:49 +00:00
Ying Wang
71d4c95f83
Merge "Fix typo."
2015-04-02 19:49:13 +00:00
Ying Wang
36b039a2d6
Fix typo.
...
Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
2015-04-02 12:48:32 -07:00
Dan Albert
8f7338d9b1
am dc8d7092
: am 0064c51e
: Merge "Use prebuilt libclang_rt.profile."
...
* commit 'dc8d7092db0b2d5754931ae130da5b1790a7d670':
Use prebuilt libclang_rt.profile.
2015-04-02 18:25:35 +00:00
Dan Albert
dc8d7092db
am 0064c51e
: Merge "Use prebuilt libclang_rt.profile."
...
* commit '0064c51efee452daae110eac99b1321c00652c17':
Use prebuilt libclang_rt.profile.
2015-04-02 18:14:48 +00:00
Claes Elgemark
ed1158e01f
Don't fail build of otatools if there are no device certificates
...
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-04-02 17:38:29 +00:00
Dan Albert
343ed674e3
Use prebuilt libclang_rt.profile.
...
Bug: 17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
2015-04-01 19:03:22 -07:00
Stephen Hines
95212b900b
am 31f35975
: am 9a98c47c
: Merge "Don\'t warn on definition of possibly reserved identifiers."
...
* commit '31f35975178e00c1178433bbbdefa0e27bee9750':
Don't warn on definition of possibly reserved identifiers.
2015-04-01 19:09:58 +00:00
Stephen Hines
31f3597517
am 9a98c47c
: Merge "Don\'t warn on definition of possibly reserved identifiers."
...
* commit '9a98c47c64446e0c46f1d24f3d6526d177b62e14':
Don't warn on definition of possibly reserved identifiers.
2015-04-01 18:59:07 +00:00
Stephen Hines
9a98c47c64
Merge "Don't warn on definition of possibly reserved identifiers."
2015-04-01 18:50:29 +00:00
Neil Fuller
080d2f32ad
am 2e4c6762
: am 2ff6a3bb
: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
...
* commit '2e4c67624c7f7d071d93d734cda024acea759582':
Add explicit dependency on tzdata_updates_intermediates for CTS
2015-04-01 18:05:28 +00:00
Neil Fuller
2e4c67624c
am 2ff6a3bb
: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
...
* commit '2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539':
Add explicit dependency on tzdata_updates_intermediates for CTS
2015-04-01 17:54:44 +00:00
Neil Fuller
2ff6a3bbdf
Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
2015-04-01 17:43:54 +00:00
Tao Bao
93d4658417
am ae26f5b0
: am 53602955
: Merge "Add support to sign bootable images with vboot_signer"
...
* commit 'ae26f5b002de956d495c4019b365040490ff18dd':
Add support to sign bootable images with vboot_signer
2015-04-01 17:15:29 +00:00
Tao Bao
ae26f5b002
am 53602955
: Merge "Add support to sign bootable images with vboot_signer"
...
* commit '536029551d31d8084c444063349291781ee43ae1':
Add support to sign bootable images with vboot_signer
2015-04-01 17:05:36 +00:00
Neil Fuller
391d4e9c75
Add explicit dependency on tzdata_updates_intermediates for CTS
...
The build was working on AOSP, but fails downstream when using
Jack because the javalib.jar file needed by CTS is not being
built by default there.
Change-Id: I8dd836b33a4e1bae5af623db3822de99e9b05cf0
2015-04-01 18:02:46 +01:00