git.osdn.net Git - android-x86/system-extras.git/log

Thierry Strudel [Sat, 5 Dec 2015 00:27:56 +0000 (00:27 +0000)]

procrank: add proportional swap accounting am: 08ea6e722b am: 6ca5d69923
am: c641ee4131

* commit 'c641ee41319181e02e3a9afc2fc93d3989d1d41e':
procrank: add proportional swap accounting

commit | commitdiff | tree

Thierry Strudel [Wed, 2 Dec 2015 23:53:00 +0000 (23:53 +0000)]

procrank: add proportional swap accounting am: 08ea6e722b
am: 6ca5d69923

* commit '6ca5d6992307ac6d063e4a7a1f0457afb88e033c':
procrank: add proportional swap accounting

commit | commitdiff | tree

Thierry Strudel [Wed, 2 Dec 2015 23:49:41 +0000 (23:49 +0000)]

procrank: add proportional swap accounting
am: 08ea6e722b

* commit '08ea6e722b1f2d6359f54fe39c6bed82f524291c':
procrank: add proportional swap accounting

commit | commitdiff | tree

Paul Crowley [Tue, 1 Dec 2015 10:39:42 +0000 (10:39 +0000)]

Merge "Add _directory function for fd-based ext4 filesystem creation"

commit | commitdiff | tree

Thierry Strudel [Sat, 21 Nov 2015 02:07:15 +0000 (18:07 -0800)]

procrank: add proportional swap accounting

Shared pages are reported in each of the sharing process swapped pages.
Compute a proportional swap usage to get a meaningful value of what each
process has in swap. Report also process unique pages swapped out.
In case ZRAM is used compute the compression ration and report the
actual RAM use of the swapped pages.

Bug: 25392275
Change-Id: I3a28c7812a09a02e1a604593615f5c6ad0340f9f

commit | commitdiff | tree

Paul Crowley [Fri, 27 Nov 2015 09:05:39 +0000 (09:05 +0000)]

Add _directory function for fd-based ext4 filesystem creation

Allow an initializing directory to be specified in ext4 filesystem
creation where the target is specified as as an fd, to match
where it is given as a filename.

Bug: 25898323
Change-Id: I945c9554b885ab9f903fd2985ad4b73399304321

commit | commitdiff | tree

Yabin Cui [Thu, 26 Nov 2015 00:08:11 +0000 (00:08 +0000)]

Merge "Simpleperf: remove unnecessary exit()." am: dd7f62ed57 am: 5345ea0e4f
am: 002efefd9d

* commit '002efefd9d24da9740667530350d04b4ff3ee2b1':
Simpleperf: remove unnecessary exit().

commit | commitdiff | tree

Riley Andrews [Thu, 26 Nov 2015 00:07:16 +0000 (00:07 +0000)]

Merge "zram performance test." am: bb0eca64ee am: 50f6f801ff
am: 3057b631b6

* commit '3057b631b6deb095e85ca81cd4958f6eb5818688':
zram performance test.

commit | commitdiff | tree

Yabin Cui [Wed, 25 Nov 2015 01:09:06 +0000 (01:09 +0000)]

Merge "Simpleperf: remove unnecessary exit()." am: dd7f62ed57
am: 5345ea0e4f

* commit '5345ea0e4f77b97b7292131161d4ed8789236ee3':
Simpleperf: remove unnecessary exit().

commit | commitdiff | tree

Yabin Cui [Wed, 25 Nov 2015 01:06:22 +0000 (01:06 +0000)]

Merge "Simpleperf: remove unnecessary exit()."
am: dd7f62ed57

* commit 'dd7f62ed576e70e73a92b278c99dcba0d27f33a5':
Simpleperf: remove unnecessary exit().

commit | commitdiff | tree

Yabin Cui [Wed, 25 Nov 2015 01:03:01 +0000 (01:03 +0000)]

Merge "Simpleperf: remove unnecessary exit()."

commit | commitdiff | tree

Yabin Cui [Wed, 25 Nov 2015 00:58:53 +0000 (16:58 -0800)]

Simpleperf: remove unnecessary exit().

Change-Id: I5256617373c3414195a7a994d0ce217d9afd47e6

commit | commitdiff | tree

Riley Andrews [Mon, 23 Nov 2015 22:37:31 +0000 (22:37 +0000)]

Merge "zram performance test." am: bb0eca64ee
am: 50f6f801ff

* commit '50f6f801ff406bc1983e5ae21c5e875c1ae11479':
zram performance test.

commit | commitdiff | tree

Riley Andrews [Mon, 23 Nov 2015 22:33:22 +0000 (22:33 +0000)]

Merge "zram performance test."
am: bb0eca64ee

* commit 'bb0eca64eea52340daf187a6e5908a6f27875e0a':
zram performance test.

commit | commitdiff | tree

Riley Andrews [Mon, 23 Nov 2015 22:27:48 +0000 (22:27 +0000)]

Merge "zram performance test."

commit | commitdiff | tree

Riley Andrews [Fri, 20 Nov 2015 23:40:09 +0000 (15:40 -0800)]

zram performance test.

Test dumps raw read and write performance to the zram device. It will
turn off the swap, benchmark, and then restore the swap device during a
successful run.

Signed-off-by: Riley Andrews <riandrews@google.com>
Change-Id: I9b5474b5f0a7556ca2093f3f0d1f792fa2fb1514

commit | commitdiff | tree

Thierry Strudel [Sat, 21 Nov 2015 02:20:58 +0000 (02:20 +0000)]

procrank: Fix some printf alignements am: 5e20c25f63 am: 7ad5b7d135
am: a763c6bb61

* commit 'a763c6bb61a81012112b97c0189c372a651db961':
procrank: Fix some printf alignements

Swap column in procrank not reported with swap enabled am: aa5a7df9d8 am: 2424169f81
am: 587130ca09

* commit '587130ca09b76e2bd92e83fdbec1e25493422a20':
Swap column in procrank not reported with swap enabled

commit | commitdiff | tree

Thierry Strudel [Sat, 21 Nov 2015 02:18:00 +0000 (02:18 +0000)]

procrank: Fix some printf alignements am: 5e20c25f63
am: 7ad5b7d135

* commit '7ad5b7d13581832472d9f8da576c50f72c203bf2':
procrank: Fix some printf alignements

Swap column in procrank not reported with swap enabled am: aa5a7df9d8
am: 2424169f81

* commit '2424169f810933f2713358f4cb393934528f322f':
Swap column in procrank not reported with swap enabled

commit | commitdiff | tree

Thierry Strudel [Sat, 21 Nov 2015 02:15:07 +0000 (02:15 +0000)]

procrank: Fix some printf alignements
am: 5e20c25f63

* commit '5e20c25f630fcaace1728090a43998f076b2851f':
procrank: Fix some printf alignements

Swap column in procrank not reported with swap enabled
am: aa5a7df9d8

* commit 'aa5a7df9d83c39e41fd07c1281a9912544022448':
Swap column in procrank not reported with swap enabled

commit | commitdiff | tree

Thierry Strudel [Fri, 20 Nov 2015 20:45:09 +0000 (12:45 -0800)]

procrank: Fix some printf alignements

Bug: 25392275
Change-Id: I8ea4d01310190c34b68d3f3140ea336ad82df665

Swap column in procrank not reported with swap enabled

Bug: 25392275
Change-Id: I6d2a0b03abba555b3667f6ccf12896caeecf27aa

Merge "bootctl: Fix the error checking for strtol result." am: de2ad9750a am: 60e27741b3
am: 7f4c45a92e

* commit '7f4c45a92ef7875fa4ae54179722ff4e48975a75':
bootctl: Fix the error checking for strtol result.

Merge "bootctl: Fix the error checking for strtol result." am: de2ad9750a
am: 60e27741b3

* commit '60e27741b3e235ac490f6d46f1abdfd1d2bc0394':
bootctl: Fix the error checking for strtol result.

Merge "bootctl: Fix the error checking for strtol result."
am: de2ad9750a

* commit 'de2ad9750aa29f696ca94a4ec4fa1286293ef72d':
bootctl: Fix the error checking for strtol result.

Merge "bootctl: Fix the error checking for strtol result."

bootctl: Fix the error checking for strtol result.

system/extras/bootctl/bootctl.c:136:13: warning: comparison is always false due to limited range of data type [-Wtype-limits]
if (ret == LONG_MIN || ret == LONG_MAX) {

Change-Id: Id4816716e4c6d304c2ca531aadbcc62117ad7376

commit | commitdiff | tree

David Zeuthen [Thu, 19 Nov 2015 20:09:07 +0000 (20:09 +0000)]

bootctl: Command-line wrapper for boot_control HAL. am: 9c75618117 -s ours
am: 02406835bf

* commit '02406835bf6d7b7004dbf46b3357b37e489eeb6f':
bootctl: Command-line wrapper for boot_control HAL.

commit | commitdiff | tree

David Zeuthen [Thu, 19 Nov 2015 19:59:25 +0000 (19:59 +0000)]

bootctl: Command-line wrapper for boot_control HAL.
am: 9c75618117 -s ours

* commit '9c75618117cc0ac52a1916a3a949c10b2638a607':
bootctl: Command-line wrapper for boot_control HAL.

ext4_utils: Wrap wipe.h to be C++ compatible. am: 13e82fe19e
am: 98f2f7225d

* commit '98f2f7225dc79ba639c22dda101e5ec9ecb7005f':
ext4_utils: Wrap wipe.h to be C++ compatible.

ext4_utils: Wrap wipe.h to be C++ compatible.
am: 13e82fe19e

* commit '13e82fe19e59ccbc69dcdf0f3d786cf06d4a66fa':
ext4_utils: Wrap wipe.h to be C++ compatible.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sami Tolvanen [Thu, 19 Nov 2015 15:39:53 +0000 (15:39 +0000)]

Merge "fec: report correct ecc location for -E"

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Riley Andrews [Tue, 17 Nov 2015 22:27:53 +0000 (22:27 +0000)]

Merge "Alloc stress." am: 6978131b78
am: 5d84cc42b2

* commit '5d84cc42b20fd8133a1e642a4db37bd6b0fb8dd7':
Alloc stress.

commit | commitdiff | tree

Riley Andrews [Tue, 17 Nov 2015 22:22:15 +0000 (22:22 +0000)]

Merge "Alloc stress."
am: 6978131b78

* commit '6978131b781d16e6911fa51f68e101abe225de5c':
Alloc stress.

commit | commitdiff | tree

Riley Andrews [Tue, 17 Nov 2015 21:38:45 +0000 (21:38 +0000)]

Merge "Alloc stress."

commit | commitdiff | tree

David Zeuthen [Mon, 31 Aug 2015 21:55:33 +0000 (17:55 -0400)]

bootctl: Command-line wrapper for boot_control HAL.

Change-Id: Icd7bfee8fcc04ca113c2e6dc8bcefd614e804bb6

ext4_utils: Wrap wipe.h to be C++ compatible.

Change-Id: I78422a26cfe5c54f79fcb336e02460339eae7df2
(cherry picked from commit 7d056b49edc7bef93203baa043eec49c7efd1046)

commit | commitdiff | tree

Riley Andrews [Fri, 13 Nov 2015 01:51:07 +0000 (17:51 -0800)]

Alloc stress.

Change-Id: Ib1b506ef43aea122a76dac80d1eaf819c81073b1

commit | commitdiff | tree

Paul Lawrence [Fri, 13 Nov 2015 17:25:09 +0000 (17:25 +0000)]

Merge "Create convert_fbe breadcrumb file to support conversion to FBE"

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Christopher Ferris [Thu, 12 Nov 2015 21:00:53 +0000 (21:00 +0000)]

Merge "Fix a size specification bug for the bandwidth test."

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Christopher Ferris [Mon, 9 Nov 2015 21:06:47 +0000 (21:06 +0000)]

Merge "Do not try and sanitize memtest."

commit | commitdiff | tree

Christopher Ferris [Mon, 9 Nov 2015 21:03:52 +0000 (13:03 -0800)]

Do not try and sanitize memtest.

Bug: 25592757
Change-Id: I944bdabd7026251d903f9e3441859401fdcb872f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Mon, 9 Nov 2015 08:19:26 +0000 (08:19 +0000)]

Merge "Use packets.py instead of old multinetwork_test.Packets"

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Lorenzo Colitti [Mon, 9 Nov 2015 06:53:44 +0000 (06:53 +0000)]

Merge "Pass more information to the attribute parsing functions."

commit | commitdiff | tree

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.

commit | commitdiff | tree

Lorenzo Colitti [Thu, 29 Oct 2015 15:14:10 +0000 (00:14 +0900)]

Pass more information to the attribute parsing functions.

Change-Id: I790dc54dd3de8a84758789d58f2ee17f175a6582

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Lorenzo Colitti [Thu, 29 Oct 2015 14:47:31 +0000 (23:47 +0900)]

Support nested structs in CStruct.

Change-Id: I608c9974617a9c1e2c5555d499116f72456e532d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Will Drewry [Fri, 6 Nov 2015 02:12:58 +0000 (02:12 +0000)]

Merge "brillo_config: pull PRODUCT_VERSION from cfgtree"

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Christopher Ferris [Thu, 5 Nov 2015 21:42:20 +0000 (21:42 +0000)]

Merge "Fix build on non-neon targets."

commit | commitdiff | tree

Christopher Ferris [Thu, 5 Nov 2015 21:41:24 +0000 (13:41 -0800)]

Fix build on non-neon targets.

Change-Id: I6f766ffcab394bd9d0e4f891ed2eff7ff1fa8fdc

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Christopher Ferris [Thu, 5 Nov 2015 20:58:43 +0000 (20:58 +0000)]

Merge "Allow creating 32 bit memtest on arm64."

commit | commitdiff | tree

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

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.

Merge "Simpleperf: add test for cpu offline whiling recording." am: 09ae351f68
am: 01462b310a

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

Merge "Simpleperf: add test for cpu offline whiling recording."
am: 09ae351f68

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

Merge "Simpleperf: add test for cpu offline whiling recording."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Will Drewry [Thu, 5 Nov 2015 03:27:14 +0000 (03:27 +0000)]

Merge "Populate BRILLO_PRODUCT_ID from the product config"

commit | commitdiff | tree

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