Ying Wang
52dd7cc0bd
Merge "Fix 64-bit host build."
2014-05-06 18:40:34 +00:00
Ying Wang
3403010186
Fix 64-bit host build.
...
Bug: 13751317
Change-Id: I8ba4fc9918fba0975eb61ec37a8a16b02acfa864
2014-05-06 11:39:31 -07:00
Greg Hackmann
7a5e2bd062
adb: replace utimes() with utime()
...
Fix the win_sdk host build by replacing utimes() with utime(). utime()
is functionally equivalent to utimes() when dealing with non-fractional
second timestamps, and is supported by the Windows CRT.
(The Windows CRT uses the nonstandard name _utime(), but mingw creates
aliases to the POSIX names.)
Change-Id: I513c6c5de05376c34cbb0894a94259acba8ae6f1
2014-05-06 08:48:18 -07:00
JP Abgrall
0e99868070
am c2adf35c: am 6d9ae28e: am 8e26b252: Merge "Fastboot: fix fastboot timeout issue of Windows host side"
...
* commit 'c2adf35c3d87622929dde3e06b0a7c9643e47dd5':
Fastboot: fix fastboot timeout issue of Windows host side
2014-05-06 02:34:36 +00:00
JP Abgrall
c2adf35c3d
am 6d9ae28e: am 8e26b252: Merge "Fastboot: fix fastboot timeout issue of Windows host side"
...
* commit '6d9ae28ed4ea917e3c6db12228b2b06d02489c11':
Fastboot: fix fastboot timeout issue of Windows host side
2014-05-06 02:31:00 +00:00
JP Abgrall
6d9ae28ed4
am 8e26b252: Merge "Fastboot: fix fastboot timeout issue of Windows host side"
...
* commit '8e26b2522267658ef996631a3a43818c1baf6fc3':
Fastboot: fix fastboot timeout issue of Windows host side
2014-05-06 02:27:42 +00:00
JP Abgrall
8e26b25222
Merge "Fastboot: fix fastboot timeout issue of Windows host side"
2014-05-06 02:24:19 +00:00
Christopher Ferris
8a1469083d
am 0fd6750e: am fdadb420: am b52a48af: Merge "Log stack even if tombstone cannot be created."
...
* commit '0fd6750ed3116d29cc49cc721fbbd38b3033aa0f':
Log stack even if tombstone cannot be created.
2014-05-05 23:37:12 +00:00
Christopher Ferris
0fd6750ed3
am fdadb420: am b52a48af: Merge "Log stack even if tombstone cannot be created."
...
* commit 'fdadb420afa3419058a3be46dc797f017e7290de':
Log stack even if tombstone cannot be created.
2014-05-05 23:12:42 +00:00
Christopher Ferris
fdadb420af
am b52a48af: Merge "Log stack even if tombstone cannot be created."
...
* commit 'b52a48affc77232047a599afa3e567c0a8c01b69':
Log stack even if tombstone cannot be created.
2014-05-05 23:08:34 +00:00
Christopher Ferris
b52a48affc
Merge "Log stack even if tombstone cannot be created."
2014-05-05 23:05:28 +00:00
Elliott Hughes
7cc73694fa
am b389440c: am 54c90a14: am 752115dd: Merge "Add Silvermont architecture cache sizes"
...
* commit 'b389440c8bdc06fc6d3fdaad6acb8f9c124e40a7':
Add Silvermont architecture cache sizes
2014-05-05 22:07:02 +00:00
Elliott Hughes
b389440c8b
am 54c90a14: am 752115dd: Merge "Add Silvermont architecture cache sizes"
...
* commit '54c90a1415a5dd1bd81e3994ff586adb5cda56b2':
Add Silvermont architecture cache sizes
2014-05-05 22:03:22 +00:00
Elliott Hughes
54c90a1415
am 752115dd: Merge "Add Silvermont architecture cache sizes"
...
* commit '752115dda7cb52dd2576c6fa3197f238f89cfcdb':
Add Silvermont architecture cache sizes
2014-05-05 22:01:55 +00:00
Christopher Ferris
c5bb49a138
Log stack even if tombstone cannot be created.
...
Bug: 14498701
Change-Id: I62c271bef2f73166eeb91d3fa3ce1e1b724a081f
2014-05-05 15:01:14 -07:00
Elliott Hughes
752115dda7
Merge "Add Silvermont architecture cache sizes"
2014-05-05 21:59:53 +00:00
Mark Salyzyn
e6fff56f2e
am 027e4e77: am 74088995: am f2c0f328: Merge "libcutils: win_sdk build issues"
...
* commit '027e4e77c26652948f43ac07ca8a738c469d39f0':
libcutils: win_sdk build issues
2014-05-05 19:38:45 +00:00
Mark Salyzyn
027e4e77c2
am 74088995: am f2c0f328: Merge "libcutils: win_sdk build issues"
...
* commit '740889959f3da4c0ef61fe23f7c14af3390eb534':
libcutils: win_sdk build issues
2014-05-05 19:35:06 +00:00
Mark Salyzyn
740889959f
am f2c0f328: Merge "libcutils: win_sdk build issues"
...
* commit 'f2c0f32887a46c11e350465c5a2db1e3d9edec1e':
libcutils: win_sdk build issues
2014-05-05 19:32:51 +00:00
Mark Salyzyn
f2c0f32887
Merge "libcutils: win_sdk build issues"
2014-05-05 19:30:47 +00:00
Mark Salyzyn
60299dfd6a
adb: turn on -Werror
...
- Deal with some -Wunused issues
Change-Id: Idfd1a114e68ae637978b52fde5144d0dca0ec79f
2014-05-05 10:30:06 -07:00
Mark Salyzyn
c9303f3175
netcfg: turn on -Werror
...
- resolve unused variable reference
Change-Id: If725a1cb0ee645c6e379c9ce21ab8c40bc4cd554
2014-05-05 10:30:05 -07:00
Mark Salyzyn
cc209517e4
mkbootimg: turn on -Werror
...
- Deal with signedness issues
Change-Id: I61211165eb4ce0fa9a2edeebb3f97fb0ffc62d34
2014-05-05 10:30:04 -07:00
Mark Salyzyn
1c00d46b25
gpttool: turn on -Werror
...
- Deal with some -Wunused issues
Change-Id: If9a05ccbda862bbd401df0f5d5a1837abedd9b83
2014-05-05 10:30:04 -07:00
Mark Salyzyn
02a7c3a7c3
libcutils: win_sdk build issues
...
Change-Id: Ic431166f686aebfd0ee00ad3224b95237ff7a0de
2014-05-05 10:29:56 -07:00
Colin Cross
999bc211dd
am edb76333: am e6950362: am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"
...
* commit 'edb763331128101871f4a5b29fee3d60ee5a4bee':
mkbootimg: fix padding calculation for 2ndstage loader
2014-05-03 18:44:34 +00:00
Colin Cross
edb7633311
am e6950362: am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"
...
* commit 'e6950362ac8b82770a4ca8e974b560803ae62057':
mkbootimg: fix padding calculation for 2ndstage loader
2014-05-03 18:43:07 +00:00
Colin Cross
e6950362ac
am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"
...
* commit '8ec42bb203d48e917d8da4d925378b448416d09e':
mkbootimg: fix padding calculation for 2ndstage loader
2014-05-03 18:41:19 +00:00
Colin Cross
8ec42bb203
Merge "mkbootimg: fix padding calculation for 2ndstage loader"
2014-05-03 18:39:15 +00:00
JP Abgrall
d2e4281204
am d96f05d2: am a7bf5bd1: am 3c049bbe: Merge "init: add \'enable <service>\' to negate "service <service>... disabled""
...
* commit 'd96f05d2a7881dbb18fc86b765a67066560b7a1a':
init: add 'enable <service>' to negate "service <service>... disabled"
2014-05-03 09:06:53 +00:00
JP Abgrall
d96f05d2a7
am a7bf5bd1: am 3c049bbe: Merge "init: add \'enable <service>\' to negate "service <service>... disabled""
...
* commit 'a7bf5bd104276f9c593a7e97116f08044ad176a8':
init: add 'enable <service>' to negate "service <service>... disabled"
2014-05-03 08:55:36 +00:00
JP Abgrall
a7bf5bd104
am 3c049bbe: Merge "init: add \'enable <service>\' to negate "service <service>... disabled""
...
* commit '3c049bbe993f92af653e055e0c3241c0b7bdeb52':
init: add 'enable <service>' to negate "service <service>... disabled"
2014-05-03 07:42:52 +00:00
JP Abgrall
3c049bbe99
Merge "init: add 'enable <service>' to negate "service <service>... disabled""
2014-05-03 07:40:29 +00:00
JP Abgrall
3beec7e55f
init: add 'enable <service>' to negate "service <service>... disabled"
...
enable <servicename>
Turns a disabled service into an enabled one as if the service did not
specify disabled in the rc file.
It will also start the service if needed.
Bug: 14472973
Change-Id: Id0b49cc687a2bc74f6f92e066c617724cc94908d
Signed-off-by: JP Abgrall <jpa@google.com>
2014-05-03 00:14:59 -07:00
Mark Salyzyn
6988e0e87f
am 593f2040: am 174f30b1: am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"
...
* commit '593f2040a0c393a3ae68ffbc63be07a8db21d1f8':
logd: build breakage in git_master-nova @ 1151709
2014-05-02 23:03:44 +00:00
Mark Salyzyn
593f2040a0
am 174f30b1: am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"
...
* commit '174f30b170693054abec89178e3ac7096a3cc06f':
logd: build breakage in git_master-nova @ 1151709
2014-05-02 22:58:16 +00:00
Mark Salyzyn
174f30b170
am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"
...
* commit 'dc57f4d93ad2c8dbf2ea1b031328e12fa2fac401':
logd: build breakage in git_master-nova @ 1151709
2014-05-02 22:54:58 +00:00
Mark Salyzyn
dc57f4d93a
Merge "logd: build breakage in git_master-nova @ 1151709"
2014-05-02 22:52:26 +00:00
Mark Salyzyn
6e2c0f7010
logd: build breakage in git_master-nova @ 1151709
...
Change-Id: Ic7920d1b0930155c20a896720a79af62f8acacc1
2014-05-02 15:47:24 -07:00
Mark Salyzyn
955ebf70b7
am 65fd5412: am fd5231d7: am ccae68e4: Merge "liblog: logcat: Move library print test into gTest"
...
* commit '65fd5412d7fe053cb28f8e39e7753d86c333be22':
liblog: logcat: Move library print test into gTest
2014-05-02 22:18:47 +00:00
Mark Salyzyn
988573b68d
am befbfb94: am dd910526: am 6c37d59e: Merge "logd: turn on -Werror"
...
* commit 'befbfb94bea6a775f40d11f2c0c58ce74035b82c':
logd: turn on -Werror
2014-05-02 22:18:46 +00:00
Mark Salyzyn
22b47f321d
am 21852477: am 15704b1b: am d9bb6770: Merge "logd: 64-bit compile issue"
...
* commit '218524778a02ef53a74dcdbd17923441c3d90305':
logd: 64-bit compile issue
2014-05-02 22:18:23 +00:00
Mark Salyzyn
e49a116657
am d007b59f: am 44bec3ad: am 6f3f7d71: Merge "debuggerd: turn on -Werror"
...
* commit 'd007b59ffa7800fa12e80fa3a070d6e6fe477ae0':
debuggerd: turn on -Werror
2014-05-02 22:18:21 +00:00
Mark Salyzyn
68ba4f1c18
am 3c742c99: am 92c58474: am afa10292: Merge "logcat: turn on -Werror"
...
* commit '3c742c9995ed4bf95ff5bfcfb373c1e94326b190':
logcat: turn on -Werror
2014-05-02 22:18:14 +00:00
Mark Salyzyn
6490814836
am 7669f1c8: am 2e92fe36: am 39f2ec2f: Merge "logwrapper: turn on -Werror"
...
* commit '7669f1c8c447b4c66a6ad05c71bec27ff5ff3853':
logwrapper: turn on -Werror
2014-05-02 22:18:13 +00:00
Mark Salyzyn
c413e151de
am b3eefcaa: am ce98dc70: am 1e10b661: Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"
...
* commit 'b3eefcaa934986f72a3daddf6ad86e276d14d476':
libcutils: Mac build pulls in __unused from sys/cdefs.h
2014-05-02 22:17:57 +00:00
Mark Salyzyn
65fd5412d7
am fd5231d7: am ccae68e4: Merge "liblog: logcat: Move library print test into gTest"
...
* commit 'fd5231d7809ce3f84d6fa554d105d5cd658714df':
liblog: logcat: Move library print test into gTest
2014-05-02 22:02:13 +00:00
Mark Salyzyn
befbfb94be
am dd910526: am 6c37d59e: Merge "logd: turn on -Werror"
...
* commit 'dd91052639b8c38d9fd6f3632fa4cc4243bdeeeb':
logd: turn on -Werror
2014-05-02 22:02:12 +00:00
Mark Salyzyn
fd5231d780
am ccae68e4: Merge "liblog: logcat: Move library print test into gTest"
...
* commit 'ccae68e47857170843934c38839c3f0323c65027':
liblog: logcat: Move library print test into gTest
2014-05-02 22:00:13 +00:00
Mark Salyzyn
dd91052639
am 6c37d59e: Merge "logd: turn on -Werror"
...
* commit '6c37d59eac5684990612258808a8d6d487e53c07':
logd: turn on -Werror
2014-05-02 22:00:12 +00:00