Jesse Hall
ca8079fd05
am 9ef98912: am 5a9d721b: am 10b13131: am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
...
* commit '9ef989128059ce840178b8f19cde1183d32d9cee':
init.trace.rc: fix race condition with class_start core
2014-10-02 21:35:37 +00:00
Jesse Hall
9ef9891280
am 5a9d721b: am 10b13131: am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
...
* commit '5a9d721baece3144ec3b9f43715d1c112d90b3d6':
init.trace.rc: fix race condition with class_start core
2014-10-02 21:24:37 +00:00
Jesse Hall
5a9d721bae
am 10b13131: am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
...
* commit '10b131314d461d5fd94aeff0565942e04d03e16b':
init.trace.rc: fix race condition with class_start core
2014-10-02 21:09:35 +00:00
Jesse Hall
10b131314d
am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
...
* commit 'c263e671dfbc5d968275f6c088f05c21d1528325':
init.trace.rc: fix race condition with class_start core
2014-10-02 21:01:58 +00:00
Jesse Hall
c263e671df
Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
2014-10-02 20:56:29 +00:00
Stephen Hines
f39f24df24
am 0d8b1bdc: am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
...
* commit '0d8b1bdcce553a60fb9112ca403c00ad9d8842a5':
Fix windows-specific error without messing up Makefile flags.
2014-10-02 13:53:01 +00:00
Stephen Hines
f1ee5cd0ad
am 4c4fa1a5: am 541a7804: am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
...
* commit '4c4fa1a57fcf7aaf174655532b19b813a7f43ad3':
Fix build breakage for missing -Wcpp option on old GCC versions.
2014-10-02 13:53:00 +00:00
Dmitriy Ivanov
217cc74a38
am 66f19b01: am 2ae2dd0d: Merge "Add -std=gnu++11 to test cflags" into lmp-mr1-dev
...
* commit '66f19b01a0e57d46e52019abac445be31cd6c60f':
Add -std=gnu++11 to test cflags
2014-10-02 13:53:00 +00:00
Stephen Hines
82921192f4
am f9d61a00: am 4acabfee: am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
...
* commit 'f9d61a007426f47337f9842930b15c2160281c58':
Remove obsolete reference to ddk; Fixes for -Werror
2014-10-02 13:52:59 +00:00
Stephen Hines
0d8b1bdcce
am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
...
* commit 'a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c':
Fix windows-specific error without messing up Makefile flags.
2014-10-02 13:38:33 +00:00
Stephen Hines
4c4fa1a57f
am 541a7804: am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
...
* commit '541a780454ca5299a96a5d9bae1fcb650a0c0659':
Fix build breakage for missing -Wcpp option on old GCC versions.
2014-10-02 13:38:25 +00:00
Dmitriy Ivanov
66f19b01a0
am 2ae2dd0d: Merge "Add -std=gnu++11 to test cflags" into lmp-mr1-dev
...
* commit '2ae2dd0db8a7f217b5785e20cefc7c51e0e50b5f':
Add -std=gnu++11 to test cflags
2014-10-02 13:38:12 +00:00
Stephen Hines
f9d61a0074
am 4acabfee: am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
...
* commit '4acabfee9e00962be02d06a6771da2e7ade20859':
Remove obsolete reference to ddk; Fixes for -Werror
2014-10-02 13:37:26 +00:00
Calin Juravle
4e68726fb5
am 8e0b41de: am 3684c836: am 00851a53: Use initUnchangeableSystemProperty for initializing os.arch.
...
* commit '8e0b41de6f5d9ae7f207e347c078f209e828cc60':
Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-02 12:53:53 +00:00
Calin Juravle
8e0b41de6f
am 3684c836: am 00851a53: Use initUnchangeableSystemProperty for initializing os.arch.
...
* commit '3684c83687e449f2440d9267e0e54fbbfac87a1d':
Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-02 12:40:42 +00:00
Stephen Hines
a866e5a8eb
am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
...
* commit '6cf1193bcff2c2f1a43abeeac1ad2b33e422182e':
Fix windows-specific error without messing up Makefile flags.
2014-10-02 00:59:36 +00:00
Stephen Hines
6cf1193bcf
am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
...
* commit '2f431a8d5a1c2029af470a7336751a555131ee51':
Fix windows-specific error without messing up Makefile flags.
2014-10-02 00:53:26 +00:00
Stephen Hines
2f431a8d5a
Fix windows-specific error without messing up Makefile flags.
...
Bug: 14416410
The proper fix for the error/warning we encountered is to move winsock2.h
in front of windows.h.
Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
2014-10-01 17:37:06 -07:00
Stephen Hines
541a780454
am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
...
* commit '490f03d560e873ad73f964815ca109381efec147':
Fix build breakage for missing -Wcpp option on old GCC versions.
2014-10-02 00:36:09 +00:00
Stephen Hines
490f03d560
am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
...
* commit '3ea87c33a1c6e940322f5436cf0dd70a0bdadd75':
Fix build breakage for missing -Wcpp option on old GCC versions.
2014-10-02 00:27:50 +00:00
Stephen Hines
3ea87c33a1
Fix build breakage for missing -Wcpp option on old GCC versions.
...
Bug: 14416410
Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
2014-10-01 17:16:37 -07:00
Dmitriy Ivanov
2ae2dd0db8
Merge "Add -std=gnu++11 to test cflags" into lmp-mr1-dev
2014-10-01 23:56:36 +00:00
Dmitriy Ivanov
8386725771
Add -std=gnu++11 to test cflags
...
(cherry picked from commit 5f68087efe )
Change-Id: I6fc0d3673391654aa72e1e6bd98f4a8469c79868
2014-10-01 16:40:41 -07:00
Stephen Hines
4acabfee9e
am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
...
* commit '64f44b8444dabd69cf391d42e10d44e8e926a79d':
Remove obsolete reference to ddk; Fixes for -Werror
2014-10-01 23:04:55 +00:00
Stephen Hines
64f44b8444
Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
2014-10-01 22:53:51 +00:00
Calin Juravle
3684c83687
am 00851a53: Use initUnchangeableSystemProperty for initializing os.arch.
...
* commit '00851a53bebe16dd2a0460245505461f40a7a307':
Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-01 19:53:54 +00:00
Fred Fettinger
331a939bf8
init.trace.rc: fix race condition with class_start core
...
The systrace permissions from init.trace.rc and the "class_start core"
which launches surfaceflinger are both in an "on boot" section. However,
the init.trace.rc commands are parsed after all commands in init.rc.
This means that "class_start core" is executed before the chmod command
which allows processes to write to trace_marker. If any services
execute their first trace command before the chmod occurs, then that
service won't be able to write traces until the service is restarted.
To fix this, run all of the init.trace.rc commands in the "early-boot"
section to ensure they are completed first.
Bug: 17612265
Change-Id: Ibf544762173d5ba98272c66ef485d8eab7d70bf3
2014-10-01 12:29:29 -07:00
Calin Juravle
00851a53be
Use initUnchangeableSystemProperty for initializing os.arch.
...
Bug: 17713104
Change-Id: Ic847579981efcd2fd0526c994d786ee8b7a8a316
2014-10-01 18:57:59 +01:00
Brian Carlstrom
8ebc04d762
am bde43986: am 5a0f0e97: am 479ce0c1: Merge "Fix mac build for nativebridge tests." into lmp-dev
...
* commit 'bde43986851a69e3f1d2a70e22e3e5c4135b36c6':
Fix mac build for nativebridge tests.
2014-10-01 02:14:13 +00:00
Vince Harron
3dbb5fbe02
am ada485e3: am 0edbf89e: am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev
...
* commit 'ada485e38c5c9944c173bcb569c6841c2fb6d5f0':
fix for adbd pinning CPU
2014-10-01 02:14:12 +00:00
Brian Carlstrom
bde4398685
am 5a0f0e97: am 479ce0c1: Merge "Fix mac build for nativebridge tests." into lmp-dev
...
* commit '5a0f0e97109b1558df0bc04940525f477f4db356':
Fix mac build for nativebridge tests.
2014-10-01 01:43:34 +00:00
Vince Harron
ada485e38c
am 0edbf89e: am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev
...
* commit '0edbf89e687802d4c92fb8b81af1a0715017aa8f':
fix for adbd pinning CPU
2014-10-01 01:43:33 +00:00
Brian Carlstrom
5a0f0e9710
am 479ce0c1: Merge "Fix mac build for nativebridge tests." into lmp-dev
...
* commit '479ce0c1f3d9ecbaf7947651a5e00828ec522f15':
Fix mac build for nativebridge tests.
2014-10-01 00:52:55 +00:00
Vince Harron
0edbf89e68
am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev
...
* commit 'c75dac394e3fcd9760841a820d8a0c93dd0c276e':
fix for adbd pinning CPU
2014-10-01 00:52:28 +00:00
Mark Salyzyn
3394aaaa62
am fbc08e54: am 2f207af8: am 7391575a: logd: in nonblocking read, sched_yield() synchronization
...
* commit 'fbc08e54dfcf86297fdc3b15ca287dd65ec1d487':
logd: in nonblocking read, sched_yield() synchronization
2014-09-30 18:47:01 +00:00
jgu21
86ebb4d1c9
am c8080944: am 2d83ca4c: (-s ours) am b3facbfd: LibNativeBridge: Add early init & env setup
...
* commit 'c8080944780daf4448fa1f744b37fb08da1db410':
LibNativeBridge: Add early init & env setup
2014-09-30 18:47:00 +00:00
Mark Salyzyn
fbc08e54df
am 2f207af8: am 7391575a: logd: in nonblocking read, sched_yield() synchronization
...
* commit '2f207af86993aade2e3fbe68e0174901b526fc92':
logd: in nonblocking read, sched_yield() synchronization
2014-09-30 18:42:37 +00:00
jgu21
c808094478
am 2d83ca4c: (-s ours) am b3facbfd: LibNativeBridge: Add early init & env setup
...
* commit '2d83ca4cc1f2a3f59086906fae3e419151f11068':
LibNativeBridge: Add early init & env setup
2014-09-30 18:42:37 +00:00
Mark Salyzyn
2f207af869
am 7391575a: logd: in nonblocking read, sched_yield() synchronization
...
* commit '7391575afdd6c27bf444dcde7a140f1b17629b8c':
logd: in nonblocking read, sched_yield() synchronization
2014-09-30 16:31:51 +00:00
Andrew Hsieh
b75d6f1429
Remove obsolete reference to ddk; Fixes for -Werror
...
Bug: 14416410
1. The new mingw-w64 toolchain x86_64-w64-mingw32-4.8 has ddk
in x86_64-w64-mingw32/include/ddk
2. Add -Wno-error=cpp to suppress a warning that turns into error
thanks to -Werror:
Please include winsock2.h before windows.h
3. Cast GetLastError() return type DWORD to "int"
4. Include direct.h for _mkdir
5. Include stdint.h for uint8_t on Windows
Change-Id: I4bec0587f6573692f08c760da6c98ae551b8b5eb
2014-09-30 02:24:07 -07:00
Brian Carlstrom
479ce0c1f3
Merge "Fix mac build for nativebridge tests." into lmp-dev
2014-09-30 04:19:54 +00:00
Vince Harron
c75dac394e
Merge "fix for adbd pinning CPU" into lmp-dev
2014-09-30 03:01:07 +00:00
Mark Salyzyn
f25ce3cf60
am ed3b0f8c: am c4133a6e: am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization"
...
* commit 'ed3b0f8c9da87fef400c12040044998be0582543':
logd: in nonblocking read, sched_yield() synchronization
2014-09-29 22:26:44 +00:00
Andreas Gampe
3432fe1c37
am 0c3436e0: am f0699c11: am 68c19686: Merge "Fix mac build for nativebridge tests."
...
* commit '0c3436e069254b11af13c4da87a72cdc343e4c7f':
Fix mac build for nativebridge tests.
2014-09-29 22:26:43 +00:00
Mark Salyzyn
ed3b0f8c9d
am c4133a6e: am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization"
...
* commit 'c4133a6e28e586f598e5c92f2b9e769178d92b3f':
logd: in nonblocking read, sched_yield() synchronization
2014-09-29 22:17:09 +00:00
Andreas Gampe
0c3436e069
am f0699c11: am 68c19686: Merge "Fix mac build for nativebridge tests."
...
* commit 'f0699c11debade875e87efad27d37ddf6fa83ed6':
Fix mac build for nativebridge tests.
2014-09-29 22:17:08 +00:00
Mark Salyzyn
c4133a6e28
am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization"
...
* commit 'fc1357cffbbe999c8d4065b89ce0435f35243a82':
logd: in nonblocking read, sched_yield() synchronization
2014-09-29 20:48:05 +00:00
Andreas Gampe
f0699c11de
am 68c19686: Merge "Fix mac build for nativebridge tests."
...
* commit '68c19686e8f9b5a88e3b2729a453d03516be79f1':
Fix mac build for nativebridge tests.
2014-09-29 20:48:04 +00:00
Mark Salyzyn
74903503f9
am 547a21ac: am 9c970bd9: am aa68f3e9: Merge "logd: auditd: report facility LOG_AUTH"
...
* commit '547a21acd39529bdd1c7c03ce993bb23ec679f10':
logd: auditd: report facility LOG_AUTH
2014-09-29 20:47:42 +00:00
Ruchi Kandoi
aa1a6caf54
am aaaf9b11: am bdf11c76: healthd: Add callback for screen_on to the healthdHAL
...
* commit 'aaaf9b110b2ad08ffeb67768cdec56bd517e26dd':
healthd: Add callback for screen_on to the healthdHAL
2014-09-29 19:44:24 +00:00