Commit graph

11091 commits

Author SHA1 Message Date
Chih-Hung Hsieh
16b8bc53eb am 2aaccfe5: am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."
* commit '2aaccfe59097e4f6b2edcfe3c9f59d1d9f52f424':
  Add -no-integrated-as at local level.
2014-10-06 23:58:23 +00:00
Chih-Hung Hsieh
2aaccfe590 am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."
* commit 'ad0ff1d99cd00ce53f667b27e53f44e802315a36':
  Add -no-integrated-as at local level.
2014-10-06 22:37:06 +00:00
Chih-Hung Hsieh
ad0ff1d99c am 4fceda2b: Merge "Add -no-integrated-as at local level."
* commit '4fceda2b53dd2b7537bb65cb6ee0d61bee5ab66c':
  Add -no-integrated-as at local level.
2014-10-06 22:31:26 +00:00
Chih-Hung Hsieh
4fceda2b53 Merge "Add -no-integrated-as at local level." 2014-10-06 22:02:06 +00:00
Chih-Hung Hsieh
60c57dad4e Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level.

BUG: 17820427
Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
2014-10-06 13:33:25 -07:00
Mike Lockwood
157e3a4b22 am 6ee5d62a: am 67479c97: am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
* commit '6ee5d62ac00fa00d7b86072a7f19d58582a05d18':
  Add bootanimation to audio group so it can play boot sound
2014-10-06 19:48:28 +00:00
Mike Lockwood
6ee5d62ac0 am 67479c97: am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
* commit '67479c9771d2ce1b39fe5d074fac9f40a220f231':
  Add bootanimation to audio group so it can play boot sound
2014-10-06 19:44:18 +00:00
Mike Lockwood
67479c9771 am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
* commit '24e3e831199e1279b3a12b0ccfeb00e06d4f4fd5':
  Add bootanimation to audio group so it can play boot sound
2014-10-06 19:28:40 +00:00
Mike Lockwood
24e3e83119 am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
* commit '7569b7b39f4f12cc4e87525113c82dae65c0b250':
  Add bootanimation to audio group so it can play boot sound
2014-10-06 19:17:05 +00:00
Mike Lockwood
7569b7b39f Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev 2014-10-06 18:40:46 +00:00
Elliott Hughes
16632a9d0d am ddf510d4: am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message."
* commit 'ddf510d47884b5a4a2192392a85f50c345d5ad7d':
  Fix a typo in ioctl usage message.
2014-10-06 17:26:06 +00:00
Elliott Hughes
ddf510d478 am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message."
* commit '85cac2abd416120646b0fe058aac812ca517d71b':
  Fix a typo in ioctl usage message.
2014-10-06 17:20:55 +00:00
Elliott Hughes
85cac2abd4 am b1dd4af7: Merge "Fix a typo in ioctl usage message."
* commit 'b1dd4af7c41dc0d73f9431ec7adabc342e13434e':
  Fix a typo in ioctl usage message.
2014-10-06 17:16:04 +00:00
Elliott Hughes
b1dd4af7c4 Merge "Fix a typo in ioctl usage message." 2014-10-06 17:12:01 +00:00
Elliott Hughes
a0d61ba3e9 Fix a typo in ioctl usage message.
Change-Id: I850dd9995a8ad6cb1f606cca2f57d7dbba2f40ed
2014-10-06 10:09:25 -07:00
Hans Boehm
fd409aa8d8 am 054627df: am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '054627df6bdd1ab70942c9c5033e9e5d3d82666a':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:37:33 +00:00
Hans Boehm
054627df6b am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:09:19 +00:00
Hans Boehm
072877af48 am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '41198eea42b7a6f1d4222abd7a5fec965d11b238':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 01:36:18 +00:00
Hans Boehm
41198eea42 Merge "Revert "Rewrite atomic.h to use stdatomic.h."" 2014-10-04 01:31:49 +00:00
Hans Boehm
2789faabfa Revert "Rewrite atomic.h to use stdatomic.h."
This reverts commit cb344d4640.

Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm
aabb0a1577 am 2ac8207e: am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit '2ac8207e505ff645c8fe9416da689f12dd73f68e':
  Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:42:39 +00:00
Hans Boehm
2ac8207e50 am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
  Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:30 +00:00
Hans Boehm
f5204549fa am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit '028928fe3ca42b7aab55cb49f2784caeec025a12':
  Rewrite atomic.h to use stdatomic.h.
2014-10-03 23:59:04 +00:00
Hans Boehm
028928fe3c Merge "Rewrite atomic.h to use stdatomic.h." 2014-10-03 23:47:36 +00:00
Calin Juravle
15f9c192cb am d8e13839: am 2124b521: am c6083626: Merge "Use initUnchangeableSystemProperty for initializing os.arch."
* commit 'd8e138396a97b0d05c08d31df38f2c6a2ff52e2e':
  Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-03 11:08:58 +00:00
Calin Juravle
d8e138396a am 2124b521: am c6083626: Merge "Use initUnchangeableSystemProperty for initializing os.arch."
* commit '2124b521e86ee778880eb42cd40c5820d625890e':
  Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-03 11:03:39 +00:00
Mike Lockwood
7e58899bcf Add bootanimation to audio group so it can play boot sound
Bug: 17674304

Change-Id: I5d31bc024fa36fedac2c0ba5c4a8b100937183ad
2014-10-02 16:22:43 -07:00
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
Calin Juravle
2124b521e8 am c6083626: Merge "Use initUnchangeableSystemProperty for initializing os.arch."
* commit 'c60836263e19ac15f674320e978caa577c042f12':
  Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-02 17:38:03 +00:00
Calin Juravle
c60836263e Merge "Use initUnchangeableSystemProperty for initializing os.arch." 2014-10-02 17:28:39 +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
Hans Boehm
cb344d4640 Rewrite atomic.h to use stdatomic.h.
Replace atomic-inl.h with a file that just includes atomic.h.
Remove platform specific implementations.

Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
2014-10-01 17:37:20 -07: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