Commit Graph

7246 Commits

Author SHA1 Message Date
Rom Lemarchand
f9c9266c75 Omit ramdisk from boot.img if building without ramdisk
Change-Id: I1940e3fd5f05dec555db04a556ed1fac58b2c15b
2015-04-08 15:11:47 -07: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
Colin Cross
9d59f41776 Change the default multilib for host libraries to "both"
Change host library builds to build for both architectures to
match device builds, removing the need for LOCAL_MULTILIB := both
in all the art library makefiles.

Change-Id: I2689f67c66f5055f93941f40b3e825127f693eca
2015-04-08 18:09:52 +00:00
Ying Wang
8a0d53e7f5 Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Bug: 20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
2015-04-08 09:54:34 -07:00
Ying Wang
e3b60664ea Merge "Consolidate the nanopb-c and regular protobuf build rules." 2015-04-08 16:22:17 +00:00
Sami Tolvanen
8b3f08bc7b Separate boot and recovery image signing from dm-verity
Allow dm-verity to be enabled without boot and recovery images being
signed. This makes it possible to enable only dm-verity to detect
corruption without confusing bootloaders that do not understand signed
images.

Bug: 19985143
Change-Id: Ie52c6ff595faa7a5c1f1bc1b37f6899c4d0c7001
2015-04-08 12:30:16 +01:00
Yohann Roussel
d191667006 Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
This is a temporrary workaround allowing to ignore outdated options
given by the build server that may cause OutOfMemoryError when
running Jack server.

Change-Id: I1b6b956de09faaeee1bf6a25c2a63124b69e2645
2015-04-07 23:43:36 +02:00
Yohann Roussel
abee3a9f41 Don't call Jack directly, use the script instead
Change-Id: Ic9d4aa3cb543ab748423f4ea0d060544a4ea44e6
2015-04-07 23:42:53 +02:00
Ying Wang
faeb693174 Consolidate the nanopb-c and regular protobuf build rules.
Bug: 20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
2015-04-07 12:49:50 -07:00
Ying Wang
11e923a0e5 am ea517854: am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."
* commit 'ea5178545bf939fb65f77cd54eba9f274512638b':
  Convert bc depfiles to .P files.
2015-04-04 01:49:47 +00: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
Rom Lemarchand
c5b06258f0 Merge "Add the new audio include path on the list of default includes" 2015-04-04 01:13:51 +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
2beb83dd62 am 5432d355: am 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."
* commit '5432d3551d70d0cd3abe4bfb47cb9276477a419a':
  There's no such thing as _THREAD_SAFE.
2015-04-03 22:44:06 +00: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
Rom Lemarchand
93dda7cd8c Add the new audio include path on the list of default includes
Change-Id: If40ba57cb97f86802c2872772672a380afc4d947
2015-04-03 15:09:11 -07: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
11c84463ea am aa1bd146: am d9ac3e9a: am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."
* commit 'aa1bd1462dc019b6096e92e4888b577522139b52':
  Remove HAVE_PRINTF_ZD.
2015-04-03 20:58:27 +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
7f131dbe07 am 6f4befa0: am 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY."
* commit '6f4befa0535749b55c5c5a859611fe855c26e369':
  Remove HAVE_STRLCPY.
2015-04-03 20:24:24 +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
301bd9341f am a840faef: am c35e7902: am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."
* commit 'a840faef517a196e235a197992e8feb9f13c27b7':
  Move the inclusion of depfile to where it's generated.
2015-04-03 17:39:56 +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
6494a6ef8f am 0216641e: am 6fe4ab94: am 58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"
* commit '0216641e04e3eae6f3b7d50108e632b249c15f1c':
  Don't fail build of otatools if there are no device certificates
2015-04-03 17:07:37 +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
b70c42079a am 5c11bd52: am 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
* commit '5c11bd52db5d0887196895f321bf723ca1d206c7':
  Use PRIVATE_ALL_OBJECTS
2015-04-03 14:52:55 +00:00
Elliott Hughes
3101e61f5e resolved conflicts for merge of e04e91b1 to master
Change-Id: I537065b0810ea8525401778824c4810c5e7ef433
2015-04-03 07:43:46 -07: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
e183b84e11 am 4a284ac3: am da885b90: am 71d4c95f: Merge "Fix typo."
* commit '4a284ac3e04a2af8031b6ef5471db22687e5a2db':
  Fix typo.
2015-04-02 20:27:50 +00:00
Ying Wang
4a284ac3e0 am da885b90: am 71d4c95f: Merge "Fix typo."
* commit 'da885b90e4c47a0e29597da185ec95a7e4e3a73c':
  Fix typo.
2015-04-02 20:07:52 +00:00