OSDN Git Service
Bowgo Tsai [Sat, 11 Mar 2017 03:57:56 +0000 (03:57 +0000)]
Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am:
5b88b5289a
am:
c2d829fe87
Change-Id: If54dc63b8dbfbfce2413d4afc029f4a79d4dda37
Bowgo Tsai [Sat, 11 Mar 2017 03:54:27 +0000 (03:54 +0000)]
Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
am:
5b88b5289a
Change-Id: I49e418feb8f60b120ba50146bc89797e05060b00
Treehugger Robot [Sat, 11 Mar 2017 03:48:47 +0000 (03:48 +0000)]
Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
Bowgo Tsai [Fri, 10 Mar 2017 16:13:15 +0000 (16:13 +0000)]
Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs" am:
61f66033d5
am:
5e10463e25
Change-Id: I0603fa9c97a71520e4d536e84d3034d7415cfdcc
Bowgo Tsai [Fri, 10 Mar 2017 16:09:41 +0000 (16:09 +0000)]
Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"
am:
61f66033d5
Change-Id: I07bd875763057958220c65e20d49d528c647fbdb
Treehugger Robot [Fri, 10 Mar 2017 16:06:00 +0000 (16:06 +0000)]
Merge "Replacing fs_mgr_read_fstab() with new fs_mgr APIs"
Bowgo Tsai [Fri, 10 Mar 2017 11:20:54 +0000 (19:20 +0800)]
Replacing fs_mgr_read_fstab() with new fs_mgr APIs
The fstab settings of early-mounted partitions (e.g., /vendor)
will be in kernel device tree. Switch to the new API to get the
whole settings with those in device tree:
fs_mgr_read_fstab_with_dt("/fstab.device")
The original default /fstab.{ro.hardware} might be moved to
/vendor/etc/. or /odm/etc/. Use another new API to get the default
fstab instead of using the hard-coded /fstab.{ro.hardware}.
This API also includes the settings from device tree:
fs_mgr_read_fstab_default()
Bug:
35811655
Test: build pass
Change-Id: I14bee88b9f599b7bbc2be56042684709e5946de2
Bowgo Tsai [Fri, 10 Mar 2017 09:03:24 +0000 (17:03 +0800)]
fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()
The original default /fstab.{ro.hardware} might be moved to
/vendor/etc/. or /odm/etc/. Use the new API to get the default
fstab instead of using the hard-coded /fstab.{ro.hardware}.
Bug:
35811655
Test: boot sailfish
Change-Id: Ie11a4f22ed449ef90cbcc7117227a99ea9d79110
Sen Jiang [Wed, 8 Mar 2017 05:08:49 +0000 (05:08 +0000)]
Merge "Separate system_version and product_version." am:
b7b92040c2
am:
17c7b6045a
Change-Id: I7ea71a0659015d41d8744e2baab339926b98eecb
Sen Jiang [Wed, 8 Mar 2017 05:06:11 +0000 (05:06 +0000)]
Merge "Separate system_version and product_version."
am:
b7b92040c2
Change-Id: Idd8433d4c4e4d35e44feb706d34ce2609c265c8d
Treehugger Robot [Wed, 8 Mar 2017 04:43:56 +0000 (04:43 +0000)]
Merge "Separate system_version and product_version."
Sen Jiang [Wed, 22 Feb 2017 01:16:35 +0000 (17:16 -0800)]
Separate system_version and product_version.
system_version will be at /etc/os-release.d/system_version, no symlink.
product_version still at oem partition, but now has only one number.
Bug:
35364984
Test: m droid dist oem_image custom_images -j
Change-Id: If0f357d29c8dd0cec1ff4999a3c42b0362a45c01
(cherry picked from commit
9b173cccb8bdb750d4cf7855e5379ceee5ba030f)
Yabin Cui [Tue, 7 Mar 2017 19:08:58 +0000 (19:08 +0000)]
Merge "simpleperf: adjust sample_freq based on max_sample_rate file." am:
8e9eabe7f4
am:
d2b9b31a63
Change-Id: Ieb0498aff61487ab773b8c257124fc2543b4fea9
Yabin Cui [Tue, 7 Mar 2017 19:08:22 +0000 (19:08 +0000)]
Merge "simpleperf: adjust sample_freq based on max_sample_rate file."
am:
8e9eabe7f4
Change-Id: I2c993cab3f1a7627e6c2187c02d937570ac9dd64
Yabin Cui [Tue, 7 Mar 2017 19:06:56 +0000 (19:06 +0000)]
Merge "simpleperf: adjust sample_freq based on max_sample_rate file."
Yabin Cui [Tue, 7 Mar 2017 01:05:50 +0000 (17:05 -0800)]
simpleperf: adjust sample_freq based on max_sample_rate file.
Starting from kernel 4.4, perf_event_max_sample_rate can be
adjusted dynamically by the kernel to limit the cpu percentage
used to dump records.
Bug: http://b/
35554543
Test: echo 100 >/proc/sys/kernel/perf_event_max_sample_rate &&
Test: run CtsSimpleperfTestCases
Change-Id: I75f6cbc124c545d05fd56b07c6a868b7ca15cd8a
Alex Deymo [Sat, 4 Mar 2017 01:54:02 +0000 (01:54 +0000)]
Merge "Put product_id and product_version to OEM partition." am:
dbcd26053b
am:
1dfe33e52a
Change-Id: I32bf51ba5866c39209b584032c528c0b8cf6cfdc
Alex Deymo [Sat, 4 Mar 2017 01:51:29 +0000 (01:51 +0000)]
Merge "Put product_id and product_version to OEM partition."
am:
dbcd26053b
Change-Id: If665126b6b7ddc6cb32b1fb3b375d68dc1bd1684
Alex Deymo [Sat, 4 Mar 2017 01:46:19 +0000 (01:46 +0000)]
Merge "Put product_id and product_version to OEM partition."
Sen Jiang [Thu, 3 Nov 2016 23:24:14 +0000 (16:24 -0700)]
Put product_id and product_version to OEM partition.
Also create symlinks for each entry in /etc/os-release.d to its corresponding
location in /oem/os-release.d.
Test: m installclean && m droid oem_image dist
Bug:
32555385
Bug:
33211225
Bug:
35804180
(cherry picked from commit
8de8ac139aa289f22f5326af2805a64c0b6bd410)
(cherry picked from commit
4c6f2be8720829eaf8681bcf584f1064e735fa7c)
Christopher Ferris [Sun, 26 Feb 2017 18:37:52 +0000 (18:37 +0000)]
Merge "Remove references to kernel macros." am:
0e82c84aba
am:
1016972e58
Change-Id: I1ad17e947ebb3457e3fb708f9c35cdee0afd3452
Christopher Ferris [Sun, 26 Feb 2017 18:34:22 +0000 (18:34 +0000)]
Merge "Remove references to kernel macros."
am:
0e82c84aba
Change-Id: Iec87f2ee43ca73500ebb1fda174fcb61891f1f83
Christopher Ferris [Sun, 26 Feb 2017 18:28:04 +0000 (18:28 +0000)]
Merge "Remove references to kernel macros."
Yabin Cui [Sat, 25 Feb 2017 00:38:23 +0000 (00:38 +0000)]
Merge "simpleperf: fix a small error." am:
3c7ae46f92
am:
9898014244
Change-Id: If59978d87ce44508bb438f3d8bda7e69ec256fc5
Yabin Cui [Sat, 25 Feb 2017 00:35:54 +0000 (00:35 +0000)]
Merge "simpleperf: fix a small error."
am:
3c7ae46f92
Change-Id: Ifdc09c4e294387031c142a015f1c2a6c0bc8f265
Treehugger Robot [Sat, 25 Feb 2017 00:31:13 +0000 (00:31 +0000)]
Merge "simpleperf: 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
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.
Yabin Cui [Fri, 24 Feb 2017 02:16:22 +0000 (02:16 +0000)]
Merge "simpleperf: generate one report for each event attr." am:
10dbaaa726
am:
96d4268ea9
Change-Id: I023cd64190c70a85e70701a125dd7573ae3a4832
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
Treehugger Robot [Fri, 24 Feb 2017 02:09:19 +0000 (02:09 +0000)]
Merge "simpleperf: generate one report for each event attr."
Yabin Cui [Fri, 24 Feb 2017 02:03:41 +0000 (02:03 +0000)]
Merge "simpleperf: add --raw-period option for report cmd." am:
d0d21b88ce
am:
7db7e63529
Change-Id: Ic1cabc5f9162013e4218a1c67853ed0d38d6fe83
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
Treehugger Robot [Fri, 24 Feb 2017 01:57:06 +0000 (01:57 +0000)]
Merge "simpleperf: 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
Yabin Cui [Thu, 23 Feb 2017 23:56:16 +0000 (23:56 +0000)]
Merge "simpleperf: build libsimpleperf_inplace_sampler library." am:
d9d2318176
am:
81a43f5d2f
Change-Id: Iee29eb35371386d719fc14c75d379d9452ae6f6d
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
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
Yabin Cui [Thu, 23 Feb 2017 23:50:32 +0000 (23:50 +0000)]
Merge "simpleperf: build libsimpleperf_inplace_sampler library."
Yifan Hong [Thu, 23 Feb 2017 21:44:51 +0000 (21:44 +0000)]
Merge "Use interfaceDescriptor instead of interfaceChain" am:
7e5199f5dd
am:
d14a3dc170
Change-Id: I6616e79565ff3cda71199d6055ee77140fe30fdb
Yifan Hong [Thu, 23 Feb 2017 21:42:51 +0000 (21:42 +0000)]
Merge "Use interfaceDescriptor instead of interfaceChain"
am:
7e5199f5dd
Change-Id: I1e3ba417e30e2736fe0f1a13c300da7d4e6ad4f6
Treehugger Robot [Thu, 23 Feb 2017 21:36:32 +0000 (21:36 +0000)]
Merge "Use 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
Elliott Hughes [Tue, 21 Feb 2017 21:24:33 +0000 (21:24 +0000)]
Merge "Remove external/openssl/include from verity include path." am:
f286f3d5ce
am:
465a7c717e
Change-Id: Ic1c0a2a89e47d6c3ca4a1a662bab07a817785e7a
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
Treehugger Robot [Tue, 21 Feb 2017 21:19:25 +0000 (21:19 +0000)]
Merge "Remove external/openssl/include from verity include path."
Yifan Hong [Tue, 21 Feb 2017 18:33:09 +0000 (18:33 +0000)]
Merge "bootctl: Return<T> is non-copyable." am:
c38d4f183c
am:
7df6e74999
Change-Id: I0d48172354849ed086c906588a16cafd73d9ab2d
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
Yifan Hong [Tue, 21 Feb 2017 18:25:00 +0000 (18:25 +0000)]
Merge "bootctl: Return<T> is non-copyable."
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
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
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
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
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
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
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
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
Yabin Cui [Wed, 15 Feb 2017 23:13:11 +0000 (23:13 +0000)]
Merge "simpleperf: build cts test running in app context."
Treehugger Robot [Wed, 15 Feb 2017 22:57:36 +0000 (22:57 +0000)]
Merge "fix potential leak of memory pointed."
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
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
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
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
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
Yabin Cui [Fri, 10 Feb 2017 21:38:27 +0000 (21:38 +0000)]
Merge "simpleperf: 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
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
Daniel Rosenberg [Fri, 10 Feb 2017 03:19:06 +0000 (03:19 +0000)]
Merge "SquashFS whitelist support." am:
637989a574
am:
3f99edf598
Change-Id: Iab7d7633ef37238f2fb133df97d9e5d80c7544ed
Daniel Rosenberg [Fri, 10 Feb 2017 03:17:06 +0000 (03:17 +0000)]
Merge "SquashFS whitelist support."
am:
637989a574
Change-Id: I332b0a902a370b366611262e9c2ef93efbf13ca6
Daniel Rosenberg [Fri, 10 Feb 2017 03:13:02 +0000 (03:13 +0000)]
Merge "SquashFS whitelist support."
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
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
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
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"
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
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
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
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
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
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
Yabin Cui [Sat, 4 Feb 2017 01:25:50 +0000 (01:25 +0000)]
Merge "simpleperf: 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
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
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
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
Treehugger Robot [Fri, 3 Feb 2017 03:07:41 +0000 (03:07 +0000)]
Merge "Add permission bits to open with O_CREAT."
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
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
Manoj Gupta [Fri, 3 Feb 2017 02:46:37 +0000 (02:46 +0000)]
Merge "Fix clang static analyzer warnings."
am:
94ae35de6c
Change-Id: I69421f7b3f8ae07b4e9f40006c33957defcbbc7d
Treehugger Robot [Fri, 3 Feb 2017 02:40:04 +0000 (02:40 +0000)]
Merge "Fix clang static analyzer warnings."
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
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
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
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
Treehugger Robot [Sat, 28 Jan 2017 01:37:21 +0000 (01:37 +0000)]
Merge "Add 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
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
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
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
Colin Cross [Thu, 26 Jan 2017 18:51:47 +0000 (18:51 +0000)]
Merge "Use LOCAL_TEST_DATA for test data"