Ying Wang
d9509e970c
resolved conflicts for merge of 133415d5
to master
...
Change-Id: Iba6c1dd40e7a4c8058e7100f03296c8f72a2c949
2015-04-08 18:08:46 -07: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
Ying Wang
4acabe0fd8
resolved conflicts for merge of f5b9830b
to stage-aosp-master
...
Change-Id: I2eaab6ce59ee2dd89b89259f409bfff6180c89d3
2015-04-08 16:21:58 -07:00
Rom Lemarchand
324784ab85
Merge "Omit ramdisk from boot.img if building without ramdisk"
2015-04-08 22:27:03 +00:00
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
f5b9830bc9
Merge "Better way to package up the otatools-package."
2015-04-08 20:53:45 +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
Joseph Wen
e1c8bdf8d8
Merge "Add StatementService to the build"
2015-04-08 18:47:07 +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
Joseph Wen
3a260d6860
Add StatementService to the build
...
- this is related to IntentFilter auto verification in Framework
Change-Id: I83d1c4bcc7be7992509348098cc320e38efea862
2015-04-08 10:55:27 -04:00
Yohann Roussel
a510428ead
Merge changes from topic 'jack-server'
...
* changes:
Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
Don't call Jack directly, use the script instead
2015-04-08 13:20:48 +00: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
Mark Salyzyn
4605be6c9e
am e2925213
: am bf2474fb
: am 011a50e4
: Merge changes I75d472ed,I6d681071
...
* commit 'e2925213a73033451cd30dae620a0ce1abbc3a24':
fs_get_stats: add logging
fs_config: add logging
2015-04-07 17:20:33 +00:00
Mark Salyzyn
e2925213a7
am bf2474fb
: am 011a50e4
: Merge changes I75d472ed,I6d681071
...
* commit 'bf2474fba4dc446b4b580f4122d172e011c24ba1':
fs_get_stats: add logging
fs_config: add logging
2015-04-07 16:58:02 +00:00
Mark Salyzyn
bf2474fba4
am 011a50e4
: Merge changes I75d472ed,I6d681071
...
* commit '011a50e4e1cc7371d8fbd0ea08002241fe54a675':
fs_get_stats: add logging
fs_config: add logging
2015-04-07 16:47:54 +00:00
Mark Salyzyn
011a50e4e1
Merge changes I75d472ed,I6d681071
...
* changes:
fs_get_stats: add logging
fs_config: add logging
2015-04-07 16:40:06 +00:00
Mark Salyzyn
27ac7a9c1a
fs_get_stats: add logging
...
libcutils fs_config has the right to add Android logging
Bug: 19908228
Change-Id: I75d472ed142e32959cec78bf7babbf39d2b66cd2
2015-04-07 09:19:27 -07:00
Mark Salyzyn
5f478fe3c5
fs_config: add logging
...
libcutils fs_config has the right to add Android logging
Bug: 19908228
Change-Id: I6d68107156962a6fec357ab99d23960c6852b026
2015-04-07 09:18:30 -07:00
Roozbeh Pournader
622b9ee784
Remove Lohit fonts from the build.
...
There are no remaining fonts to be built from Lohit. They are all
replaced by Noto.
Change-Id: I694e48cec194735c176083e4f4b7491a1079f74c
2015-04-06 12:43:04 -07:00
Ying Wang
55c838f115
am 0b584f2b
: am f994458b
: am b4b996a8
: Merge "Include vendorsetup scripts in order"
...
* commit '0b584f2b394051684e2506cc7304b583df29bca6':
Include vendorsetup scripts in order
2015-04-04 21:40:06 +00:00
Ying Wang
0b584f2b39
am f994458b
: am b4b996a8
: Merge "Include vendorsetup scripts in order"
...
* commit 'f994458babc78670263085b027bfaa34ff0bc52a':
Include vendorsetup scripts in order
2015-04-04 21:20:52 +00:00
Ying Wang
f994458bab
am b4b996a8
: Merge "Include vendorsetup scripts in order"
...
* commit 'b4b996a8ee26553e29f7610f97041753ddff3e68':
Include vendorsetup scripts in order
2015-04-04 21:10:43 +00:00
Ying Wang
b4b996a8ee
Merge "Include vendorsetup scripts in order"
2015-04-04 21:03:33 +00: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
519751a882
Merge "There's no such thing as _THREAD_SAFE."
2015-04-03 21:55:06 +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
97bcf915ad
Merge "Remove HAVE_PRINTF_ZD."
2015-04-03 20:16:25 +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