OSDN Git Service

android-x86/system-extras.git
7 years agoMerge "Remove references to kernel macros."
Christopher Ferris [Sun, 26 Feb 2017 18:34:22 +0000 (18:34 +0000)]
Merge "Remove references to kernel macros."
am: 0e82c84aba

Change-Id: Iec87f2ee43ca73500ebb1fda174fcb61891f1f83

7 years agoMerge "Remove references to kernel macros."
Christopher Ferris [Sun, 26 Feb 2017 18:28:04 +0000 (18:28 +0000)]
Merge "Remove references to kernel macros."

7 years agoMerge "simpleperf: fix a small error."
Yabin Cui [Sat, 25 Feb 2017 00:35:54 +0000 (00:35 +0000)]
Merge "simpleperf: fix a small error."
am: 3c7ae46f92

Change-Id: Ifdc09c4e294387031c142a015f1c2a6c0bc8f265

7 years agoMerge "simpleperf: fix a small error."
Treehugger Robot [Sat, 25 Feb 2017 00:31:13 +0000 (00:31 +0000)]
Merge "simpleperf: fix a small error."

7 years agosimpleperf: fix a small error.
Yabin Cui [Fri, 24 Feb 2017 20:37:42 +0000 (12:37 -0800)]
simpleperf: fix a small error.

Test: run binary_cache_builder.py.
Change-Id: I78b16b012bba641f82b33b936c94a1acd5bdf275

7 years agoRemove references to kernel macros.
Christopher Ferris [Fri, 24 Feb 2017 00:00:27 +0000 (16:00 -0800)]
Remove references to kernel macros.

The macros __force, __bitwise, __user are related to a kernel tool called
sparse to find kernel bugs. These macros are always defined as nothing
in the current uapi kernel header files, so these don't need to be here.

Change-Id: Ia29b0ddbe80298dc19b170c927f1910e14af2c6b
Test: Builds without warnings/errors.

7 years agoMerge "simpleperf: generate one report for each event attr."
Yabin Cui [Fri, 24 Feb 2017 02:13:50 +0000 (02:13 +0000)]
Merge "simpleperf: generate one report for each event attr."
am: 10dbaaa726

Change-Id: I1c97e29809a81fad33a916c5b5720ed8cfd13fa3

7 years agoMerge "simpleperf: generate one report for each event attr."
Treehugger Robot [Fri, 24 Feb 2017 02:09:19 +0000 (02:09 +0000)]
Merge "simpleperf: generate one report for each event attr."

7 years agoMerge "simpleperf: add --raw-period option for report cmd."
Yabin Cui [Fri, 24 Feb 2017 02:01:40 +0000 (02:01 +0000)]
Merge "simpleperf: add --raw-period option for report cmd."
am: d0d21b88ce

Change-Id: Ia2fec638189df5bb8cc1555788ada4d8a9ef3b1e

7 years agoMerge "simpleperf: add --raw-period option for report cmd."
Treehugger Robot [Fri, 24 Feb 2017 01:57:06 +0000 (01:57 +0000)]
Merge "simpleperf: add --raw-period option for report cmd."

7 years agosimpleperf: add --raw-period option for report cmd.
Yabin Cui [Fri, 24 Feb 2017 00:27:09 +0000 (16:27 -0800)]
simpleperf: add --raw-period option for report cmd.

Bug: http://b/35475170
Test: run simpleperf_unit_test.
Change-Id: Ib5bae0b775ac2a3e647b7724df01ce0b8deb1a38

7 years agosimpleperf: generate one report for each event attr.
Yabin Cui [Thu, 23 Feb 2017 23:54:11 +0000 (15:54 -0800)]
simpleperf: generate one report for each event attr.

Bug: http://b/35475170
Test: run simpleperf_unit_test.
Test: run report.py.
Change-Id: Ie9329a64c701bce38f7b440c16cb47e99e83db45

7 years agoMerge "simpleperf: build libsimpleperf_inplace_sampler library."
Yabin Cui [Thu, 23 Feb 2017 23:53:46 +0000 (23:53 +0000)]
Merge "simpleperf: build libsimpleperf_inplace_sampler library."
am: d9d2318176

Change-Id: If0d17051d5a0f2cbf1ea332fef36f5a0e2c4c1e7

7 years agoMerge "simpleperf: build libsimpleperf_inplace_sampler library."
Yabin Cui [Thu, 23 Feb 2017 23:50:32 +0000 (23:50 +0000)]
Merge "simpleperf: build libsimpleperf_inplace_sampler library."

7 years agoMerge "Use interfaceDescriptor instead of interfaceChain"
Yifan Hong [Thu, 23 Feb 2017 21:42:51 +0000 (21:42 +0000)]
Merge "Use interfaceDescriptor instead of interfaceChain"
am: 7e5199f5dd

Change-Id: I1e3ba417e30e2736fe0f1a13c300da7d4e6ad4f6

7 years agoMerge "Use interfaceDescriptor instead of interfaceChain"
Treehugger Robot [Thu, 23 Feb 2017 21:36:32 +0000 (21:36 +0000)]
Merge "Use interfaceDescriptor instead of interfaceChain"

7 years agoUse interfaceDescriptor instead of interfaceChain
Yifan Hong [Thu, 23 Feb 2017 02:11:18 +0000 (18:11 -0800)]
Use interfaceDescriptor instead of interfaceChain

wherever suits. Sementically, interfaceDescriptor
returns the first element of interfaceChain; use
interfaceDescriptor when the rest of the elements
aren't used.

Bug: 34136228

Test: pass
Change-Id: Icc78e7e9b17b7c51c705c20d51c2fbac5b1c5dd7

7 years agoMerge "Remove external/openssl/include from verity include path."
Elliott Hughes [Tue, 21 Feb 2017 21:22:28 +0000 (21:22 +0000)]
Merge "Remove external/openssl/include from verity include path."
am: f286f3d5ce

Change-Id: I402ad1d1a6920bb15bf15640c4acf1b7fa6471a8

7 years agoMerge "Remove external/openssl/include from verity include path."
Treehugger Robot [Tue, 21 Feb 2017 21:19:25 +0000 (21:19 +0000)]
Merge "Remove external/openssl/include from verity include path."

7 years agoMerge "bootctl: Return<T> is non-copyable."
Yifan Hong [Tue, 21 Feb 2017 18:30:33 +0000 (18:30 +0000)]
Merge "bootctl: Return<T> is non-copyable."
am: c38d4f183c

Change-Id: I6e8044692697b34f57f8d6f02f82c810df8299d6

7 years agoMerge "bootctl: Return<T> is non-copyable."
Yifan Hong [Tue, 21 Feb 2017 18:25:00 +0000 (18:25 +0000)]
Merge "bootctl: Return<T> is non-copyable."

7 years agoRemove external/openssl/include from verity include path.
Elliott Hughes [Sun, 19 Feb 2017 17:13:33 +0000 (09:13 -0800)]
Remove external/openssl/include from verity include path.

Bug: N/A
Test: builds
Change-Id: I7f13cd6c3edcff436676e93ca305e07ba6a92b08

7 years agobootctl: Return<T> is non-copyable.
Yifan Hong [Fri, 17 Feb 2017 22:35:07 +0000 (14:35 -0800)]
bootctl: Return<T> is non-copyable.

By copying the Return<T> in handl_return, the original
Return<T> object is left status unchecked when it is destroyed.

Test: compiles
Change-Id: I7bf21370e8323374deb9a8d3f252e9742357f000

7 years agoMerge "simpleperf: build cts test running in app context." am: ff972054e9 am: 5710e45719
Yabin Cui [Wed, 15 Feb 2017 23:49:23 +0000 (23:49 +0000)]
Merge "simpleperf: build cts test running in app context." am: ff972054e9 am: 5710e45719
am: 11125c7333

Change-Id: I27e1e246e370bf56bbbc74274b3514b0a5546b90

7 years agoMerge "fix potential leak of memory pointed." am: d1506c64ad am: a825c78434
Yunlian Jiang [Wed, 15 Feb 2017 23:49:04 +0000 (23:49 +0000)]
Merge "fix potential leak of memory pointed." am: d1506c64ad am: a825c78434
am: 85877ba13e

Change-Id: I6208bbf3c55c0def7d8f87347c0983cf640f60c6

7 years agoMerge "simpleperf: build cts test running in app context." am: ff972054e9
Yabin Cui [Wed, 15 Feb 2017 23:42:35 +0000 (23:42 +0000)]
Merge "simpleperf: build cts test running in app context." am: ff972054e9
am: 5710e45719

Change-Id: Ifdaf61899cf5c89055ebf047fd090d94b2ea6764

7 years agoMerge "fix potential leak of memory pointed." am: d1506c64ad
Yunlian Jiang [Wed, 15 Feb 2017 23:42:11 +0000 (23:42 +0000)]
Merge "fix potential leak of memory pointed." am: d1506c64ad
am: a825c78434

Change-Id: Ifa43447bddd0ebe7e35a1a2a7ee9a5072d20b57b

7 years agoMerge "simpleperf: build cts test running in app context."
Yabin Cui [Wed, 15 Feb 2017 23:39:18 +0000 (23:39 +0000)]
Merge "simpleperf: build cts test running in app context."
am: ff972054e9

Change-Id: Idb6e09b061dbf836ae0207fd2b7ecf203568f027

7 years agoMerge "fix potential leak of memory pointed."
Yunlian Jiang [Wed, 15 Feb 2017 23:38:59 +0000 (23:38 +0000)]
Merge "fix potential leak of memory pointed."
am: d1506c64ad

Change-Id: I1ff731e498540f4927355154069e9a6a997bc926

7 years agoMerge "simpleperf: build cts test running in app context."
Yabin Cui [Wed, 15 Feb 2017 23:13:11 +0000 (23:13 +0000)]
Merge "simpleperf: build cts test running in app context."

7 years agoMerge "fix potential leak of memory pointed."
Treehugger Robot [Wed, 15 Feb 2017 22:57:36 +0000 (22:57 +0000)]
Merge "fix potential leak of memory pointed."

7 years agosimpleperf: build cts test running in app context.
Yabin Cui [Thu, 15 Dec 2016 01:43:26 +0000 (17:43 -0800)]
simpleperf: build cts test running in app context.

When built for cts test, the test binary uses run-as to move itself
to the data directory of debuggable app 'com.android.simpleperf',
and run the tests in app context using run-as.

Bug: http://b/18790309
Test: run cts-tradefed, 'run everything -m CtsSimpleperfTestCase'.
Change-Id: I523470bb8062cb944b44dc6f264a8b1c14221b62

7 years agosimpleperf: build libsimpleperf_inplace_sampler library.
Yabin Cui [Fri, 10 Feb 2017 20:07:29 +0000 (12:07 -0800)]
simpleperf: build libsimpleperf_inplace_sampler library.

libsimpleperf_inplace_sampler.so is a library linked with
user's app. It opens a unix socket server and waits for
simpleperf's profiling request. This patch doesn't contain
code generating real samples, instead it uses a fake sample
for testing.
Add runtest for 32bit. Increase runtest duration to 2 seconds
and adjust some args in runtest.conf to make test result stable.
Fix one tiny error in cmd_report.cpp to report correctly
in `report --sort comm,symbol`.

Bug: http://b/30974760
Test: run simpleperf_unit_test.
Test: run runtest.py.
Change-Id: I58163fe47f62e6ba7dd684b33a2ce302feb880f5

7 years agoMerge "simpleperf: fix an error in checking monitored targets." am: 264b69316c am...
Yabin Cui [Fri, 10 Feb 2017 21:47:55 +0000 (21:47 +0000)]
Merge "simpleperf: fix an error in checking monitored targets." am: 264b69316c am: 4801c5f9af
am: ff836c2652

Change-Id: Ie2e1f1168da7682af751f2a45e34273db071d702

7 years agoMerge "simpleperf: fix an error in checking monitored targets." am: 264b69316c
Yabin Cui [Fri, 10 Feb 2017 21:45:11 +0000 (21:45 +0000)]
Merge "simpleperf: fix an error in checking monitored targets." am: 264b69316c
am: 4801c5f9af

Change-Id: I3b811e7b634c87e655fb499332af635d0253ae6c

7 years agoMerge "simpleperf: fix an error in checking monitored targets."
Yabin Cui [Fri, 10 Feb 2017 21:43:10 +0000 (21:43 +0000)]
Merge "simpleperf: fix an error in checking monitored targets."
am: 264b69316c

Change-Id: I0e12b0c09a0be8e8b3befe42a47bf4d111cdd562

7 years agoMerge "simpleperf: fix an error in checking monitored targets."
Yabin Cui [Fri, 10 Feb 2017 21:38:27 +0000 (21:38 +0000)]
Merge "simpleperf: fix an error in checking monitored targets."

7 years agosimpleperf: fix an error in checking monitored targets.
Yabin Cui [Fri, 10 Feb 2017 18:24:43 +0000 (10:24 -0800)]
simpleperf: fix an error in checking monitored targets.

Bug: http://b/30974760
Test: run simpleperf_unit_test.
Change-Id: Ib3b5772468f0d67f54859d7dff15f66b567fac95

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 agofix potential leak of memory pointed.
Yunlian Jiang [Wed, 8 Feb 2017 03:47:08 +0000 (19:47 -0800)]
fix potential leak of memory pointed.

This fixes the warning
warning: Potential leak of memory pointed to by field 'bench'

Bug: None
Test: The warning is gone.
Change-Id: Ief00a2f040b0a9700040e1c13856f24e3e7c817d

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