OSDN Git Service

android-x86/system-extras.git
7 years agoMerge "SquashFS whitelist support." am: 637989a574 am: 3f99edf598
Daniel Rosenberg [Fri, 10 Feb 2017 03:21:35 +0000 (03:21 +0000)]
Merge "SquashFS whitelist support." am: 637989a574 am: 3f99edf598
am: a57c18eb23

Change-Id: I4ec2e4563804678d0d3c30737206f2e2160cff46

7 years agoMerge "SquashFS whitelist support." am: 637989a574
Daniel Rosenberg [Fri, 10 Feb 2017 03:19:06 +0000 (03:19 +0000)]
Merge "SquashFS whitelist support." am: 637989a574
am: 3f99edf598

Change-Id: Iab7d7633ef37238f2fb133df97d9e5d80c7544ed

7 years agoMerge "SquashFS whitelist support."
Daniel Rosenberg [Fri, 10 Feb 2017 03:17:06 +0000 (03:17 +0000)]
Merge "SquashFS whitelist support."
am: 637989a574

Change-Id: I332b0a902a370b366611262e9c2ef93efbf13ca6

7 years agoMerge "SquashFS whitelist support."
Daniel Rosenberg [Fri, 10 Feb 2017 03:13:02 +0000 (03:13 +0000)]
Merge "SquashFS whitelist support."

7 years agoMerge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions...
Connor O'Brien [Fri, 10 Feb 2017 00:12:05 +0000 (00:12 +0000)]
Merge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions" am: b1ebb81b46 am: 17b1613366
am: bd62055335

Change-Id: Icd4dc0e00977c69e5fe0b48a90e19304cd578187

7 years agoMerge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions...
Connor O'Brien [Fri, 10 Feb 2017 00:10:25 +0000 (00:10 +0000)]
Merge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions" am: b1ebb81b46
am: 17b1613366

Change-Id: I1c3fbb6ece5dd417c5ee8071ca8e69a0bad0483e

7 years agoMerge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions"
Connor O'Brien [Fri, 10 Feb 2017 00:08:24 +0000 (00:08 +0000)]
Merge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions"
am: b1ebb81b46

Change-Id: I94507595b9a33127e9dde93c55359699f58c065e

7 years agoMerge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions"
Connor O'Brien [Fri, 10 Feb 2017 00:01:41 +0000 (00:01 +0000)]
Merge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions"

7 years agoSquashFS whitelist support.
Mohan Srinivasan [Tue, 26 Jul 2016 22:10:29 +0000 (15:10 -0700)]
SquashFS whitelist support.

Support for specifying a (whole file) whitelist to mksquashfs, so that
frequently read in files will not be compressed.
Bug: 28605313
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Change-Id: I07c848266ed656b7df3daf7f0e3569f5c9012280

7 years agoext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions
Connor O'Brien [Mon, 6 Feb 2017 22:52:10 +0000 (14:52 -0800)]
ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functions

Add versions of make_ext4fs_sparse_fd() and
make_ext4fs_sparse_fd_directory() that accept flash erase & logical
block size as arguments. Refactor to avoid copied code in the new
aligned versions of each function.

Test: Pass block sizes to new functions using fastboot -w and check
that the new userdata has the correct stride and stripe-width values.
Bug: 33243520
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I16da6e0ce699439c53d1a722c6d56eb3f9cd9bc5

7 years agoMerge "simpleperf: add inplace-sampler event type." am: a355220f81 am: 0da28de17a
Yabin Cui [Sat, 4 Feb 2017 01:37:04 +0000 (01:37 +0000)]
Merge "simpleperf: add inplace-sampler event type." am: a355220f81 am: 0da28de17a
am: c481862969

Change-Id: I1a27da43f38dfc012098d4ff79e9f6f3f172e295

7 years agoMerge "simpleperf: add inplace-sampler event type." am: a355220f81
Yabin Cui [Sat, 4 Feb 2017 01:34:35 +0000 (01:34 +0000)]
Merge "simpleperf: add inplace-sampler event type." am: a355220f81
am: 0da28de17a

Change-Id: I602d45c75feb39040caa099f9f1f38cf1a57db7e

7 years agoMerge "simpleperf: add inplace-sampler event type."
Yabin Cui [Sat, 4 Feb 2017 01:32:04 +0000 (01:32 +0000)]
Merge "simpleperf: add inplace-sampler event type."
am: a355220f81

Change-Id: I7a2ba78e9f664d680c33d0428a3ca2acf68ec0b2

7 years agoMerge "simpleperf: add inplace-sampler event type."
Yabin Cui [Sat, 4 Feb 2017 01:25:50 +0000 (01:25 +0000)]
Merge "simpleperf: add inplace-sampler event type."

7 years agosimpleperf: add inplace-sampler event type.
Yabin Cui [Mon, 30 Jan 2017 19:34:24 +0000 (11:34 -0800)]
simpleperf: add inplace-sampler event type.

Add inplace-sampler event type, so it can be used in
record/list command. This cl doesn't add code for communicating
with profiled process, and fake records in InplaceSamplerClient.cpp
for testing purpose.
Refactor runtest.py to test inplace-sampler profiling.

Bug: http://b/30974760
Test: run runtest.py --inplace-sampler.
Change-Id: I92d8b03583c58b3589207f5c655e03853899be3a

7 years agoMerge "Add permission bits to open with O_CREAT." am: 420c7c361b am: 46964d6c22
George Burgess IV [Fri, 3 Feb 2017 03:17:48 +0000 (03:17 +0000)]
Merge "Add permission bits to open with O_CREAT." am: 420c7c361b am: 46964d6c22
am: d3fd9b1003

Change-Id: I4b5043ae0a82e2961f761ba15e1a8c2567c94950

7 years agoMerge "Add permission bits to open with O_CREAT." am: 420c7c361b
George Burgess IV [Fri, 3 Feb 2017 03:15:17 +0000 (03:15 +0000)]
Merge "Add permission bits to open with O_CREAT." am: 420c7c361b
am: 46964d6c22

Change-Id: I6f59bdfcc9e1bfa522ccc583407ae3ebf71d91ca

7 years agoMerge "Add permission bits to open with O_CREAT."
George Burgess IV [Fri, 3 Feb 2017 03:12:18 +0000 (03:12 +0000)]
Merge "Add permission bits to open with O_CREAT."
am: 420c7c361b

Change-Id: Ie89ae89536e51c8d881a4f9459905b406e19a4c9

7 years agoMerge "Add permission bits to open with O_CREAT."
Treehugger Robot [Fri, 3 Feb 2017 03:07:41 +0000 (03:07 +0000)]
Merge "Add permission bits to open with O_CREAT."

7 years agoMerge "Fix clang static analyzer warnings." am: 94ae35de6c am: ecafd27df2
Manoj Gupta [Fri, 3 Feb 2017 02:51:33 +0000 (02:51 +0000)]
Merge "Fix clang static analyzer warnings." am: 94ae35de6c am: ecafd27df2
am: e4b8f60650

Change-Id: I2dca064165dc417488567d65fdd0df63f494efdc

7 years agoMerge "Fix clang static analyzer warnings." am: 94ae35de6c
Manoj Gupta [Fri, 3 Feb 2017 02:49:06 +0000 (02:49 +0000)]
Merge "Fix clang static analyzer warnings." am: 94ae35de6c
am: ecafd27df2

Change-Id: I6b30af775a87c5f25e30a41c3db569dff6a8de74

7 years agoMerge "Fix clang static analyzer warnings."
Manoj Gupta [Fri, 3 Feb 2017 02:46:37 +0000 (02:46 +0000)]
Merge "Fix clang static analyzer warnings."
am: 94ae35de6c

Change-Id: I69421f7b3f8ae07b4e9f40006c33957defcbbc7d

7 years agoMerge "Fix clang static analyzer warnings."
Treehugger Robot [Fri, 3 Feb 2017 02:40:04 +0000 (02:40 +0000)]
Merge "Fix clang static analyzer warnings."

7 years agoAdd permission bits to open with O_CREAT.
George Burgess IV [Wed, 1 Feb 2017 06:46:46 +0000 (22:46 -0800)]
Add permission bits to open with O_CREAT.

It's an error to pass open O_CREAT without giving it mode bits:
https://linux.die.net/man/3/open

Given that we never seem to do anything with the file but delete it,
0600 seems fine.

Bug: 32073964
Test: Now builds with clang FORTIFY.
Change-Id: Ia68463144b32475a470d39530a1fcaa0b52825ca

7 years agoMerge "Add libbase dependency for recovery_test/boot_control_copy" am: a284424d6c...
bowgotsai [Sat, 28 Jan 2017 01:46:12 +0000 (01:46 +0000)]
Merge "Add libbase dependency for recovery_test/boot_control_copy" am: a284424d6c am: 1e253ff82c
am: 0ed8b439b3

Change-Id: Ia0f6d76e1dd2e78c4fbde3804db44f3794a922fb

7 years agoMerge "Add libbase dependency for recovery_test/boot_control_copy" am: a284424d6c
bowgotsai [Sat, 28 Jan 2017 01:43:44 +0000 (01:43 +0000)]
Merge "Add libbase dependency for recovery_test/boot_control_copy" am: a284424d6c
am: 1e253ff82c

Change-Id: Ie05144f6b4f99cab13b59c47dd3f6c5d3599a1d4

7 years agoMerge "Add libbase dependency for recovery_test/boot_control_copy"
bowgotsai [Sat, 28 Jan 2017 01:41:18 +0000 (01:41 +0000)]
Merge "Add libbase dependency for recovery_test/boot_control_copy"
am: a284424d6c

Change-Id: I3470638860da74d9811459fdb65ea58d52fd6013

7 years agoMerge "Add libbase dependency for recovery_test/boot_control_copy"
Treehugger Robot [Sat, 28 Jan 2017 01:37:21 +0000 (01:37 +0000)]
Merge "Add libbase dependency for recovery_test/boot_control_copy"

7 years agoAdd libbase dependency for recovery_test/boot_control_copy
bowgotsai [Mon, 23 Jan 2017 11:02:20 +0000 (19:02 +0800)]
Add libbase dependency for recovery_test/boot_control_copy

It requires libbase due to fs_mgr is using <android-base/logging.h>

Bug: 34336098
Test: compile

Change-Id: I120a8f6c7e7bf052081e8c97a358384665927088

7 years agoMerge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a am: b1a2bd97b3
Colin Cross [Thu, 26 Jan 2017 19:02:13 +0000 (19:02 +0000)]
Merge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a am: b1a2bd97b3
am: a2cd7c5c0c

Change-Id: I7c0e6cc298165d1dc5e25014d73e850b9f7fe201

7 years agoMerge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a
Colin Cross [Thu, 26 Jan 2017 18:59:42 +0000 (18:59 +0000)]
Merge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a
am: b1a2bd97b3

Change-Id: I6af0e1f0d5ea6697605fc946354da8f92d9f4d39

7 years agoMerge "Use LOCAL_TEST_DATA for test data"
Colin Cross [Thu, 26 Jan 2017 18:56:42 +0000 (18:56 +0000)]
Merge "Use LOCAL_TEST_DATA for test data"
am: ad2b30810a

Change-Id: I35911b438b2f5e4becef60eae5dcee789e93988f

7 years agoMerge "Use LOCAL_TEST_DATA for test data"
Colin Cross [Thu, 26 Jan 2017 18:51:47 +0000 (18:51 +0000)]
Merge "Use LOCAL_TEST_DATA for test data"

7 years agoMerge "Do not add macro min() definition for C++" am: 95eafbaf0a am: 4a107a12e8
bowgotsai [Thu, 26 Jan 2017 02:38:18 +0000 (02:38 +0000)]
Merge "Do not add macro min() definition for C++" am: 95eafbaf0a am: 4a107a12e8
am: c0e5c66110

Change-Id: I42800574019cc23a44246e2afde273e7b7dd13fa

7 years agoMerge "Do not add macro min() definition for C++" am: 95eafbaf0a
bowgotsai [Thu, 26 Jan 2017 02:35:46 +0000 (02:35 +0000)]
Merge "Do not add macro min() definition for C++" am: 95eafbaf0a
am: 4a107a12e8

Change-Id: Iaef92e7bf888c0ed225cbd1f7f49acc5d832025c

7 years agoMerge "Do not add macro min() definition for C++"
bowgotsai [Thu, 26 Jan 2017 02:32:06 +0000 (02:32 +0000)]
Merge "Do not add macro min() definition for C++"
am: 95eafbaf0a

Change-Id: I7d3f88862bfee00d6f4d7b4150addad7f1360e8f

7 years agoMerge "Do not add macro min() definition for C++"
Treehugger Robot [Thu, 26 Jan 2017 02:24:21 +0000 (02:24 +0000)]
Merge "Do not add macro min() definition for C++"

7 years agoMerge "Convert several libraries to soong." am: 3b680bb63e am: 087a92d552
Alex Deymo [Wed, 25 Jan 2017 23:59:19 +0000 (23:59 +0000)]
Merge "Convert several libraries to soong." am: 3b680bb63e am: 087a92d552
am: e27390725c

Change-Id: I29902a81c198e62a703c03adc77f324542f1a4f0

7 years agoMerge "Convert several libraries to soong." am: 3b680bb63e
Alex Deymo [Wed, 25 Jan 2017 23:56:19 +0000 (23:56 +0000)]
Merge "Convert several libraries to soong." am: 3b680bb63e
am: 087a92d552

Change-Id: I7918852ff16800f490286d31baa3cd0e03ebff31

7 years agoMerge "Convert several libraries to soong."
Alex Deymo [Wed, 25 Jan 2017 23:53:18 +0000 (23:53 +0000)]
Merge "Convert several libraries to soong."
am: 3b680bb63e

Change-Id: I284f137d8a9c1971308be68997cdf4d6a39ccfb2

7 years agoMerge "Convert several libraries to soong."
Alex Deymo [Wed, 25 Jan 2017 23:48:42 +0000 (23:48 +0000)]
Merge "Convert several libraries to soong."

7 years agoMerge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions" am: 537783ad...
Wei Wang [Wed, 25 Jan 2017 17:58:37 +0000 (17:58 +0000)]
Merge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions" am: 537783ad78 am: 6d83bb3c82
am: 419875e8e5

Change-Id: Idd86206479af8e4cf95f93e6e284c145f7d20b59

7 years agoMerge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions" am: 537783ad78
Wei Wang [Wed, 25 Jan 2017 17:56:07 +0000 (17:56 +0000)]
Merge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions" am: 537783ad78
am: 6d83bb3c82

Change-Id: If0ef5b8f0bfe5b3e3ff0aee4130fb11d9c9c3756

7 years agoMerge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions"
Wei Wang [Wed, 25 Jan 2017 17:53:38 +0000 (17:53 +0000)]
Merge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions"
am: 537783ad78

Change-Id: I203b054060a2f7e49ce143f9e8d0c51b7dd7b314

7 years agoMerge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions"
Treehugger Robot [Wed, 25 Jan 2017 17:50:40 +0000 (17:50 +0000)]
Merge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions"

7 years agoDo not add macro min() definition for C++
bowgotsai [Mon, 16 Jan 2017 13:46:45 +0000 (21:46 +0800)]
Do not add macro min() definition for C++

It will have build error when the caller also includes <algorithm> in C++:
  external/libcxx/include/__undef_min_max: macro min is incompatible with C++

Bug: 34336098
Test: builds

Change-Id: I984a24a8dfce6da5a1ad52594ef94ed97c67e9b8

7 years agoMerge "Allow passing flash block sizes to libext4_utils" am: de893939ec am: 8018614aab
Connor O'Brien [Wed, 25 Jan 2017 04:25:27 +0000 (04:25 +0000)]
Merge "Allow passing flash block sizes to libext4_utils" am: de893939ec am: 8018614aab
am: fa83cde440

Change-Id: I1ed0a7fae86ca6c4e8bfa499ba145c3631093cf1

7 years agoMerge "Allow passing flash block sizes to libext4_utils" am: de893939ec
Connor O'Brien [Wed, 25 Jan 2017 04:22:27 +0000 (04:22 +0000)]
Merge "Allow passing flash block sizes to libext4_utils" am: de893939ec
am: 8018614aab

Change-Id: I0b6f4c3dddc6d093ab6498ed73557b504b48c775

7 years agoMerge "Allow passing flash block sizes to libext4_utils"
Connor O'Brien [Wed, 25 Jan 2017 04:16:31 +0000 (04:16 +0000)]
Merge "Allow passing flash block sizes to libext4_utils"
am: de893939ec

Change-Id: I222b516b3adc6330f3e49c503d3d537e0c14bdd8

7 years agoMerge "Allow passing flash block sizes to libext4_utils"
Treehugger Robot [Wed, 25 Jan 2017 04:13:59 +0000 (04:13 +0000)]
Merge "Allow passing flash block sizes to libext4_utils"

7 years agoAllow passing flash block sizes to libext4_utils
Connor O'Brien [Wed, 25 Jan 2017 01:41:50 +0000 (17:41 -0800)]
Allow passing flash block sizes to libext4_utils

Flash erase & logical block size can be used to tune the stride
and stripe_width parameters. Add make_ext4fs_directory_align,
which takes these sizes as arguments.

Test: Factory reset marlin, confirm userdata params are set correctly
Bug: 33243520
Change-Id: Ic8343cff221f0e203a463370a4f1be5ee191946d
Signed-off-by: Connor O'Brien <connoro@google.com>
7 years agoMerge "slideshow: Track the minui callback API change." am: e6fb950818 am: 0839a67e3f
Tao Bao [Wed, 25 Jan 2017 00:57:35 +0000 (00:57 +0000)]
Merge "slideshow: Track the minui callback API change." am: e6fb950818 am: 0839a67e3f
am: ebb6a2a00a

Change-Id: I6c77e213a7d6aadfb074a2afdb3ca5801c93af3c

7 years agoMerge "slideshow: Track the minui callback API change." am: e6fb950818
Tao Bao [Wed, 25 Jan 2017 00:56:09 +0000 (00:56 +0000)]
Merge "slideshow: Track the minui callback API change." am: e6fb950818
am: 0839a67e3f

Change-Id: Ifa689522e1f8abc04516d763da8ba04740603edf

7 years agoMerge "slideshow: Track the minui callback API change."
Tao Bao [Wed, 25 Jan 2017 00:53:44 +0000 (00:53 +0000)]
Merge "slideshow: Track the minui callback API change."
am: e6fb950818

Change-Id: Ie24361cc1012c2392391ebe3cecf1a6eea60a309

7 years agoMerge "slideshow: Track the minui callback API change."
Tao Bao [Wed, 25 Jan 2017 00:49:47 +0000 (00:49 +0000)]
Merge "slideshow: Track the minui callback API change."

7 years agoConvert several libraries to soong.
Alex Deymo [Thu, 12 Jan 2017 00:54:52 +0000 (16:54 -0800)]
Convert several libraries to soong.

This patch coverts libfec and its dependencies to soong. This also
updates the name of the libext2_uuid-host library removing the "-host"
suffix as that is also being converted to soong.

Also create a shared library for libfec given that it has quite a few
dependencies.

Bug: 34284069
Test: mmma system/extras; make checkbuild

Change-Id: Ib3ada6420bae32418a02ca92db664d0d24214e2f

7 years agoMerge "Add instrumentation test support to app_profiler.py" am: 2083cfad2c am: 1e80b276b1
Chris Craik [Tue, 24 Jan 2017 20:12:37 +0000 (20:12 +0000)]
Merge "Add instrumentation test support to app_profiler.py" am: 2083cfad2c am: 1e80b276b1
am: 34437aaf8b

Change-Id: Iad5acf496655bcc84ffc0b5d7568c64b4f0f7f80

7 years agoMerge "Add instrumentation test support to app_profiler.py" am: 2083cfad2c
Chris Craik [Tue, 24 Jan 2017 20:11:07 +0000 (20:11 +0000)]
Merge "Add instrumentation test support to app_profiler.py" am: 2083cfad2c
am: 1e80b276b1

Change-Id: I0f5734f492986cb681aa8bcebc8e43b4b696356a

7 years agoMerge "Add instrumentation test support to app_profiler.py"
Chris Craik [Tue, 24 Jan 2017 20:09:06 +0000 (20:09 +0000)]
Merge "Add instrumentation test support to app_profiler.py"
am: 2083cfad2c

Change-Id: Ibbf899eec04b1ba17eed68ae781c95700d345049

7 years agoMerge "Add instrumentation test support to app_profiler.py"
Chris Craik [Tue, 24 Jan 2017 20:07:35 +0000 (20:07 +0000)]
Merge "Add instrumentation test support to app_profiler.py"

7 years agoMerge "Add gitignore for pyc files" am: ff3ac1be4a am: e99d12b83d
Chris Craik [Tue, 24 Jan 2017 02:27:49 +0000 (02:27 +0000)]
Merge "Add gitignore for pyc files" am: ff3ac1be4a am: e99d12b83d
am: 7beab6c7b6

Change-Id: Iac433744d9ce02b4285ef25d6a5fd68d7d69aca0

7 years agoMerge "Add gitignore for pyc files" am: ff3ac1be4a
Chris Craik [Tue, 24 Jan 2017 02:17:47 +0000 (02:17 +0000)]
Merge "Add gitignore for pyc files" am: ff3ac1be4a
am: e99d12b83d

Change-Id: I60168033fe4acc9433e5b34c43c3dd1a8901c9ba

7 years agoMerge "Add gitignore for pyc files"
Chris Craik [Tue, 24 Jan 2017 01:39:35 +0000 (01:39 +0000)]
Merge "Add gitignore for pyc files"
am: ff3ac1be4a

Change-Id: I5e63f8102aec18dd2c89e2586dc0322eebf32316

7 years agoMerge "Add gitignore for pyc files"
Treehugger Robot [Tue, 24 Jan 2017 01:33:11 +0000 (01:33 +0000)]
Merge "Add gitignore for pyc files"

7 years agoAdd instrumentation test support to app_profiler.py
Chris Craik [Tue, 24 Jan 2017 00:49:46 +0000 (16:49 -0800)]
Add instrumentation test support to app_profiler.py

Bug: 32834638
Test: manual runs of app_profiler.py

Change-Id: I9bd3741ffed4f765ddc4cdb7cf56f0772f87ffcb

7 years agoAdd gitignore for pyc files
Chris Craik [Mon, 23 Jan 2017 23:38:19 +0000 (15:38 -0800)]
Add gitignore for pyc files

Test: manual - ran app_profiler.py

Change-Id: I2f6b78bd7ed1200af4fe66a3fcaa8a08ef261576

7 years agoMerge "bootctrl HAL uses "default" service name" am: ea69a18cd4 am: f5aecac914
Chris Phoenix [Mon, 23 Jan 2017 21:12:28 +0000 (21:12 +0000)]
Merge "bootctrl HAL uses "default" service name" am: ea69a18cd4 am: f5aecac914
am: 4139b36780

Change-Id: Ifb5748b68c622e37e60a7a32f4bf090e5412605d

7 years agoMerge "bootctrl HAL uses "default" service name" am: ea69a18cd4
Chris Phoenix [Mon, 23 Jan 2017 20:58:23 +0000 (20:58 +0000)]
Merge "bootctrl HAL uses "default" service name" am: ea69a18cd4
am: f5aecac914

Change-Id: I1ce7232dd42a4c7d9c6f0d8053dc1479f3335577

7 years agoMerge "bootctrl HAL uses "default" service name"
Chris Phoenix [Mon, 23 Jan 2017 20:53:26 +0000 (20:53 +0000)]
Merge "bootctrl HAL uses "default" service name"
am: ea69a18cd4

Change-Id: If08bbb1e45369083dcbea731005b035f026c238d

7 years agoMerge "bootctrl HAL uses "default" service name"
Chris Phoenix [Mon, 23 Jan 2017 20:48:31 +0000 (20:48 +0000)]
Merge "bootctrl HAL uses "default" service name"

7 years agoMerge "simpleperf: profile non-debuggable apps on rooted devices." am: d69dc72924...
Yabin Cui [Mon, 23 Jan 2017 18:31:42 +0000 (18:31 +0000)]
Merge "simpleperf: profile non-debuggable apps on rooted devices." am: d69dc72924 am: 64114ddf2e
am: b4af4c3634

Change-Id: Ie220f297ba75b4df2b35fda25959bfada19628a1

7 years agoMerge "simpleperf: profile non-debuggable apps on rooted devices." am: d69dc72924
Yabin Cui [Mon, 23 Jan 2017 18:27:24 +0000 (18:27 +0000)]
Merge "simpleperf: profile non-debuggable apps on rooted devices." am: d69dc72924
am: 64114ddf2e

Change-Id: I9b0e320c594b27e593f8335eb413f6e996191c61

7 years agoMerge "simpleperf: profile non-debuggable apps on rooted devices."
Yabin Cui [Mon, 23 Jan 2017 18:23:20 +0000 (18:23 +0000)]
Merge "simpleperf: profile non-debuggable apps on rooted devices."
am: d69dc72924

Change-Id: Ib0017026f5327a4369efd3283a15d3b9fc2b8ed7

7 years agoMerge "simpleperf: profile non-debuggable apps on rooted devices."
Yabin Cui [Mon, 23 Jan 2017 18:19:14 +0000 (18:19 +0000)]
Merge "simpleperf: profile non-debuggable apps on rooted devices."

7 years agoMerge "Set stripe_width and stride params in make_ext4fs" am: 03785cf69e am: c7f8230a7c
Connor O'Brien [Sat, 21 Jan 2017 00:23:02 +0000 (00:23 +0000)]
Merge "Set stripe_width and stride params in make_ext4fs" am: 03785cf69e am: c7f8230a7c
am: d3c96f8749

Change-Id: I6b8e07aae32bb9517a5b772c6cef1e0c34f6ac93

7 years agoMerge "Set stripe_width and stride params in make_ext4fs" am: 03785cf69e
Connor O'Brien [Sat, 21 Jan 2017 00:19:32 +0000 (00:19 +0000)]
Merge "Set stripe_width and stride params in make_ext4fs" am: 03785cf69e
am: c7f8230a7c

Change-Id: I9a8998bfba37b356ad44f12bee3822c4ef71627c

7 years agoMerge "Set stripe_width and stride params in make_ext4fs"
Connor O'Brien [Sat, 21 Jan 2017 00:15:32 +0000 (00:15 +0000)]
Merge "Set stripe_width and stride params in make_ext4fs"
am: 03785cf69e

Change-Id: I0c7ea59f5ac6d4b5d0cddc62939903380e674581

7 years agosimpleperf: profile non-debuggable apps on rooted devices.
Yabin Cui [Sat, 21 Jan 2017 00:14:32 +0000 (16:14 -0800)]
simpleperf: profile non-debuggable apps on rooted devices.

run-as requires apps to be debuggable. But on rooted devices,
we can profile non-debuggable apps by running as root.

Bug: http://b/32834638
Test: run app_profiler.py.
Change-Id: I7cc44893fd4a67593b4f1791fb7fb4a70fd273e9

7 years agoMerge "Set stripe_width and stride params in make_ext4fs"
Connor O'Brien [Sat, 21 Jan 2017 00:06:04 +0000 (00:06 +0000)]
Merge "Set stripe_width and stride params in make_ext4fs"

7 years agobootctrl HAL uses "default" service name
Chris Phoenix [Fri, 20 Jan 2017 19:37:15 +0000 (11:37 -0800)]
bootctrl HAL uses "default" service name

The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

In support of b/33844934

Change-Id: Iba190c717cf02d2dfe90b470f82b6ca4a82b6c07
Merged-In: Idc2c5ba09f2486ff9cc9815d72a7e5a0af323b22

7 years agoSet stripe_width and stride params in make_ext4fs
Connor O'Brien [Fri, 20 Jan 2017 19:50:32 +0000 (11:50 -0800)]
Set stripe_width and stride params in make_ext4fs

If available, make_ext4fs will use flash erase & logical block
sizes to tune stride and stripe_width.

Test: Build userdata w/ make_ext4fs, flash, check stride & stripe values
Bug: 33243520
Change-Id: I54f95d822cc1ccc0ebb5edec023560cd9e30e259
Signed-off-by: Connor O'Brien <connoro@google.com>
7 years agoext4_utils: Change to base/logging in ext4_crypt_init_extensions
Wei Wang [Fri, 20 Jan 2017 22:01:52 +0000 (14:01 -0800)]
ext4_utils: Change to base/logging in ext4_crypt_init_extensions

Test: on device
Bug: 34256270
Change-Id: Idd560ff5662c6c2d646a80f47b4ad8a6bf9a0970

7 years agoslideshow: Track the minui callback API change.
Tao Bao [Fri, 20 Jan 2017 16:55:20 +0000 (08:55 -0800)]
slideshow: Track the minui callback API change.

Needs the matching change in bootable/recovery.

Test: mmma system/extra/slideshow
Change-Id: Id82bee220b69b154fa1816766f58dbde4d718e8c

7 years agoMerge "ext4_utils: add logging in forked command" am: 7f56eee60c am: b63433aa8c
Wei Wang [Wed, 18 Jan 2017 21:57:47 +0000 (21:57 +0000)]
Merge "ext4_utils: add logging in forked command" am: 7f56eee60c am: b63433aa8c
am: 6bc0e5338b

Change-Id: Idad96ff4c819a4d2f677fa81839106c775b85df9

7 years agoMerge "ext4_utils: add logging in forked command" am: 7f56eee60c
Wei Wang [Wed, 18 Jan 2017 21:55:18 +0000 (21:55 +0000)]
Merge "ext4_utils: add logging in forked command" am: 7f56eee60c
am: b63433aa8c

Change-Id: I4480fffff229139ffe2ce351a39705c5e6886584

7 years agoMerge "ext4_utils: add logging in forked command"
Wei Wang [Wed, 18 Jan 2017 21:53:17 +0000 (21:53 +0000)]
Merge "ext4_utils: add logging in forked command"
am: 7f56eee60c

Change-Id: I68d58fdde4c2399359331624b3fcca9b9e922ff4

7 years agoMerge "ext4_utils: add logging in forked command"
Treehugger Robot [Wed, 18 Jan 2017 21:51:03 +0000 (21:51 +0000)]
Merge "ext4_utils: add logging in forked command"

7 years agoUse LOCAL_TEST_DATA for test data
Colin Cross [Sat, 17 Dec 2016 20:38:46 +0000 (12:38 -0800)]
Use LOCAL_TEST_DATA for test data

LOCAL_TEST_DATA will install the test data alongside the test, for
both a local build and when building for the continuous testers.
Ues it instead of hacking the test data into the binary.

Test: simpleperf_unit_test
Change-Id: I330e5a505d5bf6f65d0e283830da6f51f4bf2560

7 years agoext4_utils: add logging in forked command
Wei Wang [Thu, 12 Jan 2017 21:44:11 +0000 (13:44 -0800)]
ext4_utils: add logging in forked command

Bug: 33786699
Test: manual

(cherry picked from commit 8040206d8c2ff8ffcb219fb2da426d8f00887c1f)

Change-Id: If922ebbfed7c7ba2fa296de5f3c46909970cfbb5

7 years agoMerge "Pass stripe_width and stride parameters to mke2fs" am: 34e2918a90 am: 5cfb2c72f7
Connor O'Brien [Tue, 17 Jan 2017 20:19:06 +0000 (20:19 +0000)]
Merge "Pass stripe_width and stride parameters to mke2fs" am: 34e2918a90 am: 5cfb2c72f7
am: f238ec3789

Change-Id: I605a43f96339222c34821fec7e50410babfe3f58

7 years agoMerge "Pass stripe_width and stride parameters to mke2fs" am: 34e2918a90
Connor O'Brien [Tue, 17 Jan 2017 20:16:39 +0000 (20:16 +0000)]
Merge "Pass stripe_width and stride parameters to mke2fs" am: 34e2918a90
am: 5cfb2c72f7

Change-Id: Ie58b73f8fc435563aadc8162788d8a5739dc9040

7 years agoMerge "Pass stripe_width and stride parameters to mke2fs"
Connor O'Brien [Tue, 17 Jan 2017 20:13:36 +0000 (20:13 +0000)]
Merge "Pass stripe_width and stride parameters to mke2fs"
am: 34e2918a90

Change-Id: Ie6457466b4d02a0269e451883eb9f4d9316a616d

7 years agoMerge "Pass stripe_width and stride parameters to mke2fs"
Connor O'Brien [Tue, 17 Jan 2017 20:07:10 +0000 (20:07 +0000)]
Merge "Pass stripe_width and stride parameters to mke2fs"

7 years agoMerge "simpleperf: Update document for scripts." am: 7aa9dd25ee am: 57fe7cecc3
Yabin Cui [Fri, 13 Jan 2017 22:34:14 +0000 (22:34 +0000)]
Merge "simpleperf: Update document for scripts." am: 7aa9dd25ee am: 57fe7cecc3
am: 514b1fb3a4

Change-Id: Iae7258e1fc54b48274bc8747984f575a1e7fe290

7 years agoMerge "simpleperf: Update document for scripts." am: 7aa9dd25ee
Yabin Cui [Fri, 13 Jan 2017 22:31:05 +0000 (22:31 +0000)]
Merge "simpleperf: Update document for scripts." am: 7aa9dd25ee
am: 57fe7cecc3

Change-Id: Id5f6fed769036e4de9d800b095f651e6dec8a7b4

7 years agoMerge "simpleperf: Update document for scripts."
Yabin Cui [Fri, 13 Jan 2017 22:28:37 +0000 (22:28 +0000)]
Merge "simpleperf: Update document for scripts."
am: 7aa9dd25ee

Change-Id: Ib468ca00c3c386fed50a63a205e769cc87cded4c

7 years agoMerge "simpleperf: Update document for scripts."
Yabin Cui [Fri, 13 Jan 2017 22:24:42 +0000 (22:24 +0000)]
Merge "simpleperf: Update document for scripts."

7 years agoPass stripe_width and stride parameters to mke2fs
Connor O'Brien [Fri, 6 Jan 2017 00:53:58 +0000 (16:53 -0800)]
Pass stripe_width and stride parameters to mke2fs

If available, use flash erase & logical block sizes to tune stride
and stripe parameters to mke2fs.

Test: Built & flashed userdata; checked stride & stripe values
Bug: 33243520
Merged-In: I07319a0bc3d3418b1f4e74e61b10e02dc78fb4db
Change-Id: I07319a0bc3d3418b1f4e74e61b10e02dc78fb4db
Signed-off-by: Connor O'Brien <connoro@google.com>
7 years agoMerge "simpleperf: fix dumpping kernel symbols." am: fb7b130078 am: 16b0b3d73a
Yabin Cui [Fri, 13 Jan 2017 18:42:19 +0000 (18:42 +0000)]
Merge "simpleperf: fix dumpping kernel symbols." am: fb7b130078 am: 16b0b3d73a
am: 81140f6108

Change-Id: Ie3913662a2c97eedb66be4ce759fbac282ea72aa

7 years agosimpleperf: Update document for scripts.
Yabin Cui [Fri, 13 Jan 2017 01:18:13 +0000 (17:18 -0800)]
simpleperf: Update document for scripts.

And fix an error in utils.py.

Bug: http://b/32834638
Test: none.
Change-Id: I94e3599213e886517ca6e38412dbe0bb7f36d87c