OSDN Git Service

android-x86/system-extras.git
8 years agoMerge "fec: report correct ecc location for -E" am: 139871346e am: 8b94ede7a9
Sami Tolvanen [Thu, 19 Nov 2015 15:59:00 +0000 (15:59 +0000)]
Merge "fec: report correct ecc location for -E" am: 139871346e am: 8b94ede7a9
am: 9b0add7103

* commit '9b0add71038ac1708b48b818892628489637fe13':
  fec: report correct ecc location for -E

8 years agoMerge "fec: report correct ecc location for -E" am: 139871346e
Sami Tolvanen [Thu, 19 Nov 2015 15:53:44 +0000 (15:53 +0000)]
Merge "fec: report correct ecc location for -E" am: 139871346e
am: 8b94ede7a9

* commit '8b94ede7a9ff264f339620642acd7f5184f7856a':
  fec: report correct ecc location for -E

8 years agoMerge "fec: report correct ecc location for -E"
Sami Tolvanen [Thu, 19 Nov 2015 15:48:50 +0000 (15:48 +0000)]
Merge "fec: report correct ecc location for -E"
am: 139871346e

* commit '139871346e1b113f2d396fcc2e5b9ca20123d96f':
  fec: report correct ecc location for -E

8 years agoMerge "fec: report correct ecc location for -E"
Sami Tolvanen [Thu, 19 Nov 2015 15:39:53 +0000 (15:39 +0000)]
Merge "fec: report correct ecc location for -E"

8 years agoMerge "Alloc stress." am: 6978131b78 am: 5d84cc42b2
Riley Andrews [Thu, 19 Nov 2015 00:17:28 +0000 (00:17 +0000)]
Merge "Alloc stress." am: 6978131b78 am: 5d84cc42b2
am: 0fc4f1037c

* commit '0fc4f1037c23b76d46f92d8ceb0daf7e3b461dea':
  Alloc stress.

8 years agofec: report correct ecc location for -E
Sami Tolvanen [Wed, 18 Nov 2015 10:13:45 +0000 (10:13 +0000)]
fec: report correct ecc location for -E

Since the header is now at the end, no need to take that into account
when reporting metadata location.

Change-Id: I825b5ae9d35b3ca69dead37f246568b4700298a2

8 years agoMerge "Alloc stress." am: 6978131b78
Riley Andrews [Tue, 17 Nov 2015 22:27:53 +0000 (22:27 +0000)]
Merge "Alloc stress." am: 6978131b78
am: 5d84cc42b2

* commit '5d84cc42b20fd8133a1e642a4db37bd6b0fb8dd7':
  Alloc stress.

8 years agoMerge "Alloc stress."
Riley Andrews [Tue, 17 Nov 2015 22:22:15 +0000 (22:22 +0000)]
Merge "Alloc stress."
am: 6978131b78

* commit '6978131b781d16e6911fa51f68e101abe225de5c':
  Alloc stress.

8 years agoMerge "Alloc stress."
Riley Andrews [Tue, 17 Nov 2015 21:38:45 +0000 (21:38 +0000)]
Merge "Alloc stress."

8 years agoAlloc stress.
Riley Andrews [Fri, 13 Nov 2015 01:51:07 +0000 (17:51 -0800)]
Alloc stress.

Change-Id: Ib1b506ef43aea122a76dac80d1eaf819c81073b1

8 years agoMerge "Create convert_fbe breadcrumb file to support conversion to FBE"
Paul Lawrence [Fri, 13 Nov 2015 17:25:09 +0000 (17:25 +0000)]
Merge "Create convert_fbe breadcrumb file to support conversion to FBE"

8 years agoMerge "Fix a size specification bug for the bandwidth test." am: df6a677fac am: f5709...
Christopher Ferris [Thu, 12 Nov 2015 23:12:02 +0000 (23:12 +0000)]
Merge "Fix a size specification bug for the bandwidth test." am: df6a677fac am: f570959542
am: 25c8559aae

* commit '25c8559aae0e9b712cd8c1354c2b71b057267b32':
  Fix a size specification bug for the bandwidth test.

8 years agoMerge "Fix a size specification bug for the bandwidth test." am: df6a677fac
Christopher Ferris [Thu, 12 Nov 2015 21:09:21 +0000 (21:09 +0000)]
Merge "Fix a size specification bug for the bandwidth test." am: df6a677fac
am: f570959542

* commit 'f5709595428ba81c7190853edc4dc4771e72aa0d':
  Fix a size specification bug for the bandwidth test.

8 years agoMerge "Fix a size specification bug for the bandwidth test."
Christopher Ferris [Thu, 12 Nov 2015 21:05:10 +0000 (21:05 +0000)]
Merge "Fix a size specification bug for the bandwidth test."
am: df6a677fac

* commit 'df6a677fac4e74723de43c1ad8540c9bdd0d6ad4':
  Fix a size specification bug for the bandwidth test.

8 years agoMerge "Fix a size specification bug for the bandwidth test."
Christopher Ferris [Thu, 12 Nov 2015 21:00:53 +0000 (21:00 +0000)]
Merge "Fix a size specification bug for the bandwidth test."

8 years agoFix a size specification bug for the bandwidth test.
Ben Cheng [Tue, 10 Nov 2015 09:33:40 +0000 (17:33 +0800)]
Fix a size specification bug for the bandwidth test.

Change-Id: I38b5dc89edafd1768caa34158c2746c7ef35c31e
(cherry picked from commit fb829a48d844b9769c5a52d1bb4d40d51ff4b6bc)

8 years agoSpecial-case for credential encrypted system dir.
Jeff Sharkey [Wed, 11 Nov 2015 18:33:59 +0000 (10:33 -0800)]
Special-case for credential encrypted system dir.

Bug: 22358539
Change-Id: I85a3b9df6047fb716ba4f82583d53687c51bf590

8 years agoCreate convert_fbe breadcrumb file to support conversion to FBE
Paul Lawrence [Thu, 5 Nov 2015 21:37:43 +0000 (13:37 -0800)]
Create convert_fbe breadcrumb file to support conversion to FBE

Change-Id: I7d686819fe7966453ab40280a00afee89e3ecaba

8 years agoFix a size specification bug for the bandwidth test.
Ben Cheng [Tue, 10 Nov 2015 09:33:40 +0000 (17:33 +0800)]
Fix a size specification bug for the bandwidth test.

Change-Id: I38b5dc89edafd1768caa34158c2746c7ef35c31e

8 years agoMerge "Do not try and sanitize memtest." am: 442e95221f am: 302d5a8669
Christopher Ferris [Mon, 9 Nov 2015 21:12:19 +0000 (21:12 +0000)]
Merge "Do not try and sanitize memtest." am: 442e95221f am: 302d5a8669
am: f7fbe4b34f

* commit 'f7fbe4b34f2606631589655ef83c40d72fb79697':
  Do not try and sanitize memtest.

8 years agoMerge "Do not try and sanitize memtest." am: 442e95221f
Christopher Ferris [Mon, 9 Nov 2015 21:10:35 +0000 (21:10 +0000)]
Merge "Do not try and sanitize memtest." am: 442e95221f
am: 302d5a8669

* commit '302d5a8669d55701e8e754e2deed4c2b9133d247':
  Do not try and sanitize memtest.

8 years agoMerge "Do not try and sanitize memtest."
Christopher Ferris [Mon, 9 Nov 2015 21:08:51 +0000 (21:08 +0000)]
Merge "Do not try and sanitize memtest."
am: 442e95221f

* commit '442e95221fb7fa4e98dab788b0382140843e32a1':
  Do not try and sanitize memtest.

8 years agoMerge "Do not try and sanitize memtest."
Christopher Ferris [Mon, 9 Nov 2015 21:06:47 +0000 (21:06 +0000)]
Merge "Do not try and sanitize memtest."

8 years agoDo not try and sanitize memtest.
Christopher Ferris [Mon, 9 Nov 2015 21:03:52 +0000 (13:03 -0800)]
Do not try and sanitize memtest.

Bug: 25592757
Change-Id: I944bdabd7026251d903f9e3441859401fdcb872f

8 years agoMerge "Use packets.py instead of old multinetwork_test.Packets" am: e883d56794 am...
Erik Kline [Mon, 9 Nov 2015 08:23:59 +0000 (08:23 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets" am: e883d56794 am: 8b753f8021
am: 77cd8b2da6

* commit '77cd8b2da6469c302c24cc0369f9923834cb6a41':
  Use packets.py instead of old multinetwork_test.Packets

8 years agoMerge "Use packets.py instead of old multinetwork_test.Packets" am: e883d56794
Erik Kline [Mon, 9 Nov 2015 08:22:20 +0000 (08:22 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets" am: e883d56794
am: 8b753f8021

* commit '8b753f80219a639f0c9a9b571f9b6f86ae5ec00a':
  Use packets.py instead of old multinetwork_test.Packets

8 years agoMerge "Use packets.py instead of old multinetwork_test.Packets"
Erik Kline [Mon, 9 Nov 2015 08:20:38 +0000 (08:20 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets"
am: e883d56794

* commit 'e883d56794a07c09eb889e8a1bd51a963c3fc7b2':
  Use packets.py instead of old multinetwork_test.Packets

8 years agoMerge "Use packets.py instead of old multinetwork_test.Packets"
Erik Kline [Mon, 9 Nov 2015 08:19:26 +0000 (08:19 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets"

8 years agoUse packets.py instead of old multinetwork_test.Packets
Erik Kline [Mon, 9 Nov 2015 07:29:00 +0000 (16:29 +0900)]
Use packets.py instead of old multinetwork_test.Packets

Change-Id: I39a36569a2df5b2a2a5b2bb323944864b284df0a

8 years agoMerge "Pass more information to the attribute parsing functions." am: 7a280cb2f7...
Lorenzo Colitti [Mon, 9 Nov 2015 06:57:46 +0000 (06:57 +0000)]
Merge "Pass more information to the attribute parsing functions." am: 7a280cb2f7 am: d20f2dcde2
am: b8180f037e

* commit 'b8180f037edc9d16feee9937aba93d9c4a55f05a':
  Pass more information to the attribute parsing functions.

8 years agoMerge "Pass more information to the attribute parsing functions." am: 7a280cb2f7
Lorenzo Colitti [Mon, 9 Nov 2015 06:56:06 +0000 (06:56 +0000)]
Merge "Pass more information to the attribute parsing functions." am: 7a280cb2f7
am: d20f2dcde2

* commit 'd20f2dcde2c777e468258ca71303404638a0ae0d':
  Pass more information to the attribute parsing functions.

8 years agoMerge "Pass more information to the attribute parsing functions."
Lorenzo Colitti [Mon, 9 Nov 2015 06:54:26 +0000 (06:54 +0000)]
Merge "Pass more information to the attribute parsing functions."
am: 7a280cb2f7

* commit '7a280cb2f78961ab245051e777fa354804e5af4a':
  Pass more information to the attribute parsing functions.

8 years agoMerge "Pass more information to the attribute parsing functions."
Lorenzo Colitti [Mon, 9 Nov 2015 06:53:44 +0000 (06:53 +0000)]
Merge "Pass more information to the attribute parsing functions."

8 years agoMerge changes I608c9974,Ic13456c5,Ie77b1591 am: 61205df5b4 am: dadbfba71f
Lorenzo Colitti [Mon, 9 Nov 2015 06:51:07 +0000 (06:51 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591 am: 61205df5b4 am: dadbfba71f
am: 2b501c56f4

* commit '2b501c56f46dfc8bc6d867243d08108de90df979':
  Support nested structs in CStruct.
  Move common netlink code into a new netlink.py
  Move the forwarding crash test to a new file.

8 years agoPass more information to the attribute parsing functions.
Lorenzo Colitti [Thu, 29 Oct 2015 15:14:10 +0000 (00:14 +0900)]
Pass more information to the attribute parsing functions.

Change-Id: I790dc54dd3de8a84758789d58f2ee17f175a6582

8 years agoMerge changes I608c9974,Ic13456c5,Ie77b1591 am: 61205df5b4
Lorenzo Colitti [Mon, 9 Nov 2015 06:49:16 +0000 (06:49 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591 am: 61205df5b4
am: dadbfba71f

* commit 'dadbfba71f0edd79c4a9d2e48c0fcc7253c0e2ea':
  Support nested structs in CStruct.
  Move common netlink code into a new netlink.py
  Move the forwarding crash test to a new file.

8 years agoMerge changes I608c9974,Ic13456c5,Ie77b1591
Lorenzo Colitti [Mon, 9 Nov 2015 06:47:19 +0000 (06:47 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591
am: 61205df5b4

* commit '61205df5b44cc809f60714330686c887eeaf4037':
  Support nested structs in CStruct.
  Move common netlink code into a new netlink.py
  Move the forwarding crash test to a new file.

8 years agoMerge changes I608c9974,Ic13456c5,Ie77b1591
Lorenzo Colitti [Mon, 9 Nov 2015 06:45:16 +0000 (06:45 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591

* changes:
  Support nested structs in CStruct.
  Move common netlink code into a new netlink.py
  Move the forwarding crash test to a new file.

8 years agoSupport nested structs in CStruct.
Lorenzo Colitti [Thu, 29 Oct 2015 14:47:31 +0000 (23:47 +0900)]
Support nested structs in CStruct.

Change-Id: I608c9974617a9c1e2c5555d499116f72456e532d

8 years agoMove common netlink code into a new netlink.py
Lorenzo Colitti [Thu, 29 Oct 2015 14:51:09 +0000 (23:51 +0900)]
Move common netlink code into a new netlink.py

Change-Id: Ic13456c55707b1b73d6f2774b4232fa851cf853f

8 years agoMove the forwarding crash test to a new file.
Lorenzo Colitti [Wed, 28 Oct 2015 08:50:04 +0000 (17:50 +0900)]
Move the forwarding crash test to a new file.

Change-Id: Ie77b1591338d8a3daae04f845798908ecc42874c

8 years agoMerge "brillo_config: pull PRODUCT_VERSION from cfgtree" am: fe2032e0c0 am: db6e740fbc
Will Drewry [Fri, 6 Nov 2015 02:19:04 +0000 (02:19 +0000)]
Merge "brillo_config: pull PRODUCT_VERSION from cfgtree" am: fe2032e0c0 am: db6e740fbc
am: e338e770a6

* commit 'e338e770a66364417f4957ee93258c140afdfd27':
  brillo_config: pull PRODUCT_VERSION from cfgtree

8 years agoMerge "brillo_config: pull PRODUCT_VERSION from cfgtree" am: fe2032e0c0
Will Drewry [Fri, 6 Nov 2015 02:17:13 +0000 (02:17 +0000)]
Merge "brillo_config: pull PRODUCT_VERSION from cfgtree" am: fe2032e0c0
am: db6e740fbc

* commit 'db6e740fbceb69da0a7a8ee25e251918e8e36544':
  brillo_config: pull PRODUCT_VERSION from cfgtree

8 years agoMerge "brillo_config: pull PRODUCT_VERSION from cfgtree"
Will Drewry [Fri, 6 Nov 2015 02:15:25 +0000 (02:15 +0000)]
Merge "brillo_config: pull PRODUCT_VERSION from cfgtree"
am: fe2032e0c0

* commit 'fe2032e0c0c2e1fb6a63e7f3ddb374063f66b9d0':
  brillo_config: pull PRODUCT_VERSION from cfgtree

8 years agoMerge "brillo_config: pull PRODUCT_VERSION from cfgtree"
Will Drewry [Fri, 6 Nov 2015 02:12:58 +0000 (02:12 +0000)]
Merge "brillo_config: pull PRODUCT_VERSION from cfgtree"

8 years agobrillo_config: pull PRODUCT_VERSION from cfgtree
Will Drewry [Fri, 6 Nov 2015 00:07:18 +0000 (16:07 -0800)]
brillo_config: pull PRODUCT_VERSION from cfgtree

Add support to read the product version from
  config/brillo/product_version

Change-Id: Iee2394810b42fbab8be1e318373140f289f91346

8 years agoMerge "Fix build on non-neon targets." am: de104595f3 am: fcf974b439
Christopher Ferris [Thu, 5 Nov 2015 21:56:24 +0000 (21:56 +0000)]
Merge "Fix build on non-neon targets." am: de104595f3 am: fcf974b439
am: 70e4f0ee83

* commit '70e4f0ee834961217a6776e68cbdc14431fea359':
  Fix build on non-neon targets.

8 years agoMerge "Fix build on non-neon targets." am: de104595f3
Christopher Ferris [Thu, 5 Nov 2015 21:50:33 +0000 (21:50 +0000)]
Merge "Fix build on non-neon targets." am: de104595f3
am: fcf974b439

* commit 'fcf974b4399c556a60947fccb5e7f2daf6228867':
  Fix build on non-neon targets.

8 years agoMerge "Fix build on non-neon targets."
Christopher Ferris [Thu, 5 Nov 2015 21:46:51 +0000 (21:46 +0000)]
Merge "Fix build on non-neon targets."
am: de104595f3

* commit 'de104595f3b2001658b50278725d2a7491d724a6':
  Fix build on non-neon targets.

8 years agoMerge "Fix build on non-neon targets."
Christopher Ferris [Thu, 5 Nov 2015 21:42:20 +0000 (21:42 +0000)]
Merge "Fix build on non-neon targets."

8 years agoFix build on non-neon targets.
Christopher Ferris [Thu, 5 Nov 2015 21:41:24 +0000 (13:41 -0800)]
Fix build on non-neon targets.

Change-Id: I6f766ffcab394bd9d0e4f891ed2eff7ff1fa8fdc

8 years agoMerge "Allow creating 32 bit memtest on arm64." am: a3ed8dc78d am: 204dedb3d4
Christopher Ferris [Thu, 5 Nov 2015 21:07:39 +0000 (21:07 +0000)]
Merge "Allow creating 32 bit memtest on arm64." am: a3ed8dc78d am: 204dedb3d4
am: 2aaed157b0

* commit '2aaed157b00e1536952e838f3cf8384021997b44':
  Allow creating 32 bit memtest on arm64.

8 years agoMerge "Allow creating 32 bit memtest on arm64." am: a3ed8dc78d
Christopher Ferris [Thu, 5 Nov 2015 21:04:54 +0000 (21:04 +0000)]
Merge "Allow creating 32 bit memtest on arm64." am: a3ed8dc78d
am: 204dedb3d4

* commit '204dedb3d4ca03feda6067a0437e099ed4b3dfc9':
  Allow creating 32 bit memtest on arm64.

8 years agoMerge "Allow creating 32 bit memtest on arm64."
Christopher Ferris [Thu, 5 Nov 2015 21:02:17 +0000 (21:02 +0000)]
Merge "Allow creating 32 bit memtest on arm64."
am: a3ed8dc78d

* commit 'a3ed8dc78da05a47b127a9d2518961e63f28850e':
  Allow creating 32 bit memtest on arm64.

8 years agoMerge "Allow creating 32 bit memtest on arm64."
Christopher Ferris [Thu, 5 Nov 2015 20:58:43 +0000 (20:58 +0000)]
Merge "Allow creating 32 bit memtest on arm64."

8 years agoAllow creating 32 bit memtest on arm64.
Christopher Ferris [Thu, 5 Nov 2015 20:53:10 +0000 (12:53 -0800)]
Allow creating 32 bit memtest on arm64.

Also do a bit of cleanup in the makefile and a few of the files.

Change-Id: I10d9442a5105f47fe361b5b4fb031989150429d3

8 years agoMerge "Simpleperf: add test for cpu offline whiling recording." am: 09ae351f68 am...
Yabin Cui [Thu, 5 Nov 2015 18:34:43 +0000 (18:34 +0000)]
Merge "Simpleperf: add test for cpu offline whiling recording." am: 09ae351f68 am: 01462b310a
am: 64bdc46345

* commit '64bdc463455866db1e9b4767cee81d73c266084f':
  Simpleperf: add test for cpu offline whiling recording.

8 years agoMerge "Simpleperf: add test for cpu offline whiling recording." am: 09ae351f68
Yabin Cui [Thu, 5 Nov 2015 18:29:30 +0000 (18:29 +0000)]
Merge "Simpleperf: add test for cpu offline whiling recording." am: 09ae351f68
am: 01462b310a

* commit '01462b310a69da9b9282a94c2bf86a4bd8287a08':
  Simpleperf: add test for cpu offline whiling recording.

8 years agoMerge "Simpleperf: add test for cpu offline whiling recording."
Yabin Cui [Thu, 5 Nov 2015 18:27:43 +0000 (18:27 +0000)]
Merge "Simpleperf: add test for cpu offline whiling recording."
am: 09ae351f68

* commit '09ae351f68315adb8921f7bb3e69cfaab83628e1':
  Simpleperf: add test for cpu offline whiling recording.

8 years agoMerge "Simpleperf: add test for cpu offline whiling recording."
Yabin Cui [Thu, 5 Nov 2015 18:23:25 +0000 (18:23 +0000)]
Merge "Simpleperf: add test for cpu offline whiling recording."

8 years agoMerge "Populate BRILLO_PRODUCT_ID from the product config" am: d279f0614d am: fad999d7c6
Will Drewry [Thu, 5 Nov 2015 03:35:06 +0000 (03:35 +0000)]
Merge "Populate BRILLO_PRODUCT_ID from the product config" am: d279f0614d am: fad999d7c6
am: de5ec61c41

* commit 'de5ec61c4169f7449cb91955b8643af8ab8ded82':
  Populate BRILLO_PRODUCT_ID from the product config

8 years agoMerge "Populate BRILLO_PRODUCT_ID from the product config" am: d279f0614d
Will Drewry [Thu, 5 Nov 2015 03:32:24 +0000 (03:32 +0000)]
Merge "Populate BRILLO_PRODUCT_ID from the product config" am: d279f0614d
am: fad999d7c6

* commit 'fad999d7c6e54431d9e6393e9037ce2136a0a8ef':
  Populate BRILLO_PRODUCT_ID from the product config

8 years agoMerge "Populate BRILLO_PRODUCT_ID from the product config"
Will Drewry [Thu, 5 Nov 2015 03:29:46 +0000 (03:29 +0000)]
Merge "Populate BRILLO_PRODUCT_ID from the product config"
am: d279f0614d

* commit 'd279f0614d32554b524ce1618751583b70f33b96':
  Populate BRILLO_PRODUCT_ID from the product config

8 years agoMerge "Populate BRILLO_PRODUCT_ID from the product config"
Will Drewry [Thu, 5 Nov 2015 03:27:14 +0000 (03:27 +0000)]
Merge "Populate BRILLO_PRODUCT_ID from the product config"

8 years agoPopulate BRILLO_PRODUCT_ID from the product config
Will Drewry [Thu, 5 Nov 2015 02:51:35 +0000 (18:51 -0800)]
Populate BRILLO_PRODUCT_ID from the product config

Using cfgtree.mk, add support to load the brillo
product id directly from a file in the product tree
when configured.

BUG=25343470

Change-Id: Icf9777915612bf3b3630112cfe31b95bae23612f

8 years agoSimpleperf: add test for cpu offline whiling recording.
Yabin Cui [Wed, 4 Nov 2015 02:00:01 +0000 (18:00 -0800)]
Simpleperf: add test for cpu offline whiling recording.

Bug: 25193162
Change-Id: I17b34f4e6932698e158719b884efe8ab441fbdef

8 years agoMerge commit \'5b9bbc4f5092f3d42ee8a9527da724d9af540e51\' into HEAD am: 14601351e2
Bill Yi [Tue, 3 Nov 2015 23:48:07 +0000 (23:48 +0000)]
Merge commit \'5b9bbc4f5092f3d42ee8a9527da724d9af540e51\' into HEAD am: 14601351e2
am: a01a3bcb8c

* commit 'a01a3bcb8c43093c3449f0c0b195bdf12b6427a1':

8 years agoMerge commit \'5b9bbc4f5092f3d42ee8a9527da724d9af540e51\' into HEAD
Bill Yi [Tue, 3 Nov 2015 23:34:31 +0000 (23:34 +0000)]
Merge commit \'5b9bbc4f5092f3d42ee8a9527da724d9af540e51\' into HEAD
am: 14601351e2

* commit '14601351e2cd8023f49933620352068331031696':

8 years agoMerge commit '5b9bbc4f5092f3d42ee8a9527da724d9af540e51' into HEAD
Bill Yi [Tue, 3 Nov 2015 22:30:41 +0000 (14:30 -0800)]
Merge commit '5b9bbc4f5092f3d42ee8a9527da724d9af540e51' into HEAD

8 years agoMerge "simpleperf: support --cpu option in record/stat command." am: ce8a1f25ac am...
Yabin Cui [Fri, 30 Oct 2015 20:19:17 +0000 (20:19 +0000)]
Merge "simpleperf: support --cpu option in record/stat command." am: ce8a1f25ac am: 8f383b86f2
am: ebf49fd019

* commit 'ebf49fd01956cdf8754f8cedfeb52167323bbf6d':
  simpleperf: support --cpu option in record/stat command.

8 years agoMerge "simpleperf: support --cpu option in record/stat command." am: ce8a1f25ac
Yabin Cui [Fri, 30 Oct 2015 20:15:04 +0000 (20:15 +0000)]
Merge "simpleperf: support --cpu option in record/stat command." am: ce8a1f25ac
am: 8f383b86f2

* commit '8f383b86f28b62a78f27833404840132bd3707f2':
  simpleperf: support --cpu option in record/stat command.

8 years agoMerge "simpleperf: support --cpu option in record/stat command."
Yabin Cui [Fri, 30 Oct 2015 20:11:18 +0000 (20:11 +0000)]
Merge "simpleperf: support --cpu option in record/stat command."
am: ce8a1f25ac

* commit 'ce8a1f25ace5a8c2e317a347f96d5e14e79d6f2b':
  simpleperf: support --cpu option in record/stat command.

8 years agoMerge "simpleperf: support --cpu option in record/stat command."
Yabin Cui [Fri, 30 Oct 2015 20:05:38 +0000 (20:05 +0000)]
Merge "simpleperf: support --cpu option in record/stat command."

8 years agosimpleperf: support --cpu option in record/stat command.
Yabin Cui [Mon, 26 Oct 2015 23:15:29 +0000 (16:15 -0700)]
simpleperf: support --cpu option in record/stat command.

--cpu option is used to record on selected cpus.

Change-Id: If5bb9b42a064d2ff69fbeec77906fc79943dddc1

8 years agoMerge "brillo_config: Don\'t cache the timestamp." am: 63b10569b9 am: 4cf4f5c152
Bertrand Simonnet [Fri, 30 Oct 2015 18:39:24 +0000 (18:39 +0000)]
Merge "brillo_config: Don\'t cache the timestamp." am: 63b10569b9 am: 4cf4f5c152
am: 8215b1cf5b

* commit '8215b1cf5b22b3a05422c869bd5879c8abc7eaef':
  brillo_config: Don't cache the timestamp.

8 years agoMerge "brillo_config: Don\'t cache the timestamp." am: 63b10569b9
Bertrand Simonnet [Fri, 30 Oct 2015 18:36:19 +0000 (18:36 +0000)]
Merge "brillo_config: Don\'t cache the timestamp." am: 63b10569b9
am: 4cf4f5c152

* commit '4cf4f5c1520863269575b032c559e45625762c0b':
  brillo_config: Don't cache the timestamp.

8 years agoMerge "brillo_config: Don\'t cache the timestamp."
Bertrand Simonnet [Fri, 30 Oct 2015 18:33:20 +0000 (18:33 +0000)]
Merge "brillo_config: Don\'t cache the timestamp."
am: 63b10569b9

* commit '63b10569b9cda3303bad274fee5126f4e8b3a386':
  brillo_config: Don't cache the timestamp.

8 years agoMerge "brillo_config: Don't cache the timestamp."
Bertrand Simonnet [Fri, 30 Oct 2015 18:29:10 +0000 (18:29 +0000)]
Merge "brillo_config: Don't cache the timestamp."

8 years agobrillo_config: Don't cache the timestamp.
Bertrand SIMONNET [Thu, 29 Oct 2015 04:42:56 +0000 (21:42 -0700)]
brillo_config: Don't cache the timestamp.

We want the timestamp to change at every build as we may be using the
resulting image to generate an update and we need different images to
have different versions.

Bug: 25358721
Change-Id: I9ae0ae0ba34ea0f508fc3a5f051368e4bce57b61
Test: Build twice in a row, the timestamp is updated.

8 years agoMerge "ext4_utils: Parse unclean super block" am: a17cfd8b6d am: 0525bd6eae
Sami Tolvanen [Fri, 30 Oct 2015 09:01:23 +0000 (09:01 +0000)]
Merge "ext4_utils: Parse unclean super block" am: a17cfd8b6d am: 0525bd6eae
am: e39126bb65

* commit 'e39126bb653c507c08609421b6000dc427fe2eec':
  ext4_utils: Parse unclean super block

8 years agoMerge "ext4_utils: Parse unclean super block" am: a17cfd8b6d
Sami Tolvanen [Fri, 30 Oct 2015 08:58:11 +0000 (08:58 +0000)]
Merge "ext4_utils: Parse unclean super block" am: a17cfd8b6d
am: 0525bd6eae

* commit '0525bd6eae33f9f8a1e8c593d1e87290f28c458e':
  ext4_utils: Parse unclean super block

8 years agoMerge "ext4_utils: Parse unclean super block"
Sami Tolvanen [Fri, 30 Oct 2015 08:55:21 +0000 (08:55 +0000)]
Merge "ext4_utils: Parse unclean super block"
am: a17cfd8b6d

* commit 'a17cfd8b6dfc820fd6ae88e0097387dc4a442235':
  ext4_utils: Parse unclean super block

8 years agoMerge "ext4_utils: Parse unclean super block"
Sami Tolvanen [Fri, 30 Oct 2015 08:51:51 +0000 (08:51 +0000)]
Merge "ext4_utils: Parse unclean super block"

8 years agoMerge "libfec: remove verity validation cache" am: 98202de709 am: 72b11684dd
Sami Tolvanen [Fri, 30 Oct 2015 04:22:33 +0000 (04:22 +0000)]
Merge "libfec: remove verity validation cache" am: 98202de709 am: 72b11684dd
am: 64f87b748b

* commit '64f87b748b6abe233abd2bd52dbe56c5814a60f5':
  libfec: remove verity validation cache

8 years agoext4_utils: Parse unclean super block
Johan Redestig [Thu, 29 Oct 2015 17:04:47 +0000 (18:04 +0100)]
ext4_utils: Parse unclean super block

Dont fail to parse the superblock just because the file system was
not unmounted cleanly.

Change-Id: I381c3e6c55ef5eb478b53d06d6cc56df1b6f41f4

8 years agoMerge "libfec: remove verity validation cache" am: 98202de709
Sami Tolvanen [Thu, 29 Oct 2015 16:49:31 +0000 (16:49 +0000)]
Merge "libfec: remove verity validation cache" am: 98202de709
am: 72b11684dd

* commit '72b11684dd23cfdeaeef103b02744775948a72d0':
  libfec: remove verity validation cache

8 years agoMerge "libfec: remove verity validation cache"
Sami Tolvanen [Thu, 29 Oct 2015 16:45:08 +0000 (16:45 +0000)]
Merge "libfec: remove verity validation cache"
am: 98202de709

* commit '98202de709ed70ec3b3e80baa061dfc064754b6b':
  libfec: remove verity validation cache

8 years agoMerge "libfec: remove verity validation cache"
Sami Tolvanen [Thu, 29 Oct 2015 16:03:07 +0000 (16:03 +0000)]
Merge "libfec: remove verity validation cache"

8 years agolibfec: remove verity validation cache
Sami Tolvanen [Thu, 29 Oct 2015 15:45:17 +0000 (15:45 +0000)]
libfec: remove verity validation cache

Caching block validation results increases libfec memory usage and
does not provide comparable benefits in normal use cases, which do
not involve re-reading the same blocks.

Change-Id: I71ac47a7059b350b16e32207932004f3f147abcb

8 years agoMerge "Set accept_ra to 2 on all interfaces." am: 4ea2a41464 am: 81ab2106c4
Lorenzo Colitti [Wed, 28 Oct 2015 08:53:57 +0000 (08:53 +0000)]
Merge "Set accept_ra to 2 on all interfaces." am: 4ea2a41464 am: 81ab2106c4
am: 5b9bbc4f50

* commit '5b9bbc4f5092f3d42ee8a9527da724d9af540e51':
  Set accept_ra to 2 on all interfaces.

8 years agoMerge "Move packet definitions to their own file." am: ed1aa266ce am: 564a9cbd13
Lorenzo Colitti [Wed, 28 Oct 2015 08:53:53 +0000 (08:53 +0000)]
Merge "Move packet definitions to their own file." am: ed1aa266ce am: 564a9cbd13
am: 2c4125be42

* commit '2c4125be4289bd44451480ddc93616a15b3fcd2a':
  Move packet definitions to their own file.

8 years agoMerge "Set accept_ra to 2 on all interfaces." am: 4ea2a41464
Lorenzo Colitti [Wed, 28 Oct 2015 08:51:19 +0000 (08:51 +0000)]
Merge "Set accept_ra to 2 on all interfaces." am: 4ea2a41464
am: 81ab2106c4

* commit '81ab2106c4a6f2d8f59b1fc5e383857855ff6668':
  Set accept_ra to 2 on all interfaces.

8 years agoMerge "Move packet definitions to their own file." am: ed1aa266ce
Lorenzo Colitti [Wed, 28 Oct 2015 08:51:16 +0000 (08:51 +0000)]
Merge "Move packet definitions to their own file." am: ed1aa266ce
am: 564a9cbd13

* commit '564a9cbd1304a9311fff33c11f6686d20c9c2402':
  Move packet definitions to their own file.

8 years agoMerge "Set accept_ra to 2 on all interfaces."
Lorenzo Colitti [Wed, 28 Oct 2015 08:48:38 +0000 (08:48 +0000)]
Merge "Set accept_ra to 2 on all interfaces."
am: 4ea2a41464

* commit '4ea2a41464237deabff29bd29a9ffb621ac9f7af':
  Set accept_ra to 2 on all interfaces.

8 years agoMerge "Move packet definitions to their own file."
Lorenzo Colitti [Wed, 28 Oct 2015 08:48:35 +0000 (08:48 +0000)]
Merge "Move packet definitions to their own file."
am: ed1aa266ce

* commit 'ed1aa266cef795e383cc9a7ee77f860eaca8b7fe':
  Move packet definitions to their own file.

8 years agoMerge "Set accept_ra to 2 on all interfaces."
Lorenzo Colitti [Wed, 28 Oct 2015 08:46:42 +0000 (08:46 +0000)]
Merge "Set accept_ra to 2 on all interfaces."

8 years agoMerge "Move packet definitions to their own file."
Lorenzo Colitti [Wed, 28 Oct 2015 08:45:28 +0000 (08:45 +0000)]
Merge "Move packet definitions to their own file."

8 years agoSet accept_ra to 2 on all interfaces.
Lorenzo Colitti [Wed, 28 Oct 2015 07:56:51 +0000 (16:56 +0900)]
Set accept_ra to 2 on all interfaces.

This matches what we do on real devices, and it makes it easier
to write tests that use forwarding.

Change-Id: I720a75864f8fb30b59ff023c33ef3f82d1f35b4b

8 years agoMove packet definitions to their own file.
Lorenzo Colitti [Wed, 28 Oct 2015 07:56:12 +0000 (16:56 +0900)]
Move packet definitions to their own file.

Change-Id: I68c57311915e2a8dbdb6842dfb87367485fcf819

8 years agoMerge "Test SIOCKILLADDR on non-empty addresses too." am: fa61997537 am: e2f9e698bd
Lorenzo Colitti [Wed, 28 Oct 2015 07:16:00 +0000 (07:16 +0000)]
Merge "Test SIOCKILLADDR on non-empty addresses too." am: fa61997537 am: e2f9e698bd
am: 60b793d5b8

* commit '60b793d5b82ce5417879c22d3657432799d50aa4':
  Test SIOCKILLADDR on non-empty addresses too.