OSDN Git Service
Mohamad Ayyash [Wed, 24 Jun 2015 20:04:29 +0000 (13:04 -0700)]
mksquashfsimage.sh: Add forward slash for SRC_DIR
There is a bug in mksquashfs that fails to interpret symlink dirs unless
they have a forward slash
Change-Id: I64df07d99858a792e1d7af5d11234fe8b75f91ae
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Todd Kjos [Wed, 20 May 2015 19:47:00 +0000 (12:47 -0700)]
Scripts to automate simple workloads for testing
DO NOT MERGE (already in master)
The initial set of scripts:
recentsfling.sh : start a set of apps, switch to recents and fling
systemapps.sh : start a set of apps, and then loop to move them
to the forground, checking whether the app had
been LMK'd or required direct reclaims
feedly-chrome.sh : automate a feedly, chrome
workflow making sure both stay in memory
Change-Id: I40f0862623ea0963bb0eaed3a585b41b69bbbbc7
Elliott Hughes [Sat, 16 May 2015 00:20:47 +0000 (17:20 -0700)]
Don't use TEMP_FAILURE_RETRY with close in system/extras.
Bug: http://b/
20501816
Change-Id: I32123049314a30a255fdf1a76a0e00bd35ac8801
(cherry picked from commit
454b989922c7fb8e1411d06ee26ad7c4e6bc2abe)
Yabin Cui [Thu, 14 May 2015 02:22:42 +0000 (02:22 +0000)]
Merge "Dump build_id feature in `simpleperf record`." into mnc-dev
Yabin Cui [Wed, 6 May 2015 02:58:07 +0000 (19:58 -0700)]
Dump build_id feature in `simpleperf record`.
Bug:
19483574
Change-Id: Ie2acd8a157bca9ad3c01a2e4b37e139aba89670f
(cherry picked from commit
8f6225147c5b6cb2159a7f5cb0dab952ee0759df)
Yabin Cui [Thu, 14 May 2015 02:15:48 +0000 (02:15 +0000)]
Merge "Dump kernel/modules/thread mmap information in `simpleperf record`." into mnc-dev
Yabin Cui [Tue, 5 May 2015 03:27:57 +0000 (20:27 -0700)]
Dump kernel/modules/thread mmap information in `simpleperf record`.
Bug:
19483574
Change-Id: Ia65cb12804a6dffa440501736a6229b2f7248958
(cherry picked from commit
7d59bb49fb47fbc82ef5c77d7aebf7174fd996e1)
Yabin Cui [Thu, 14 May 2015 02:10:22 +0000 (02:10 +0000)]
Merge "Implement simpleperf record/dumprecord subcommands." into mnc-dev
Yabin Cui [Tue, 28 Apr 2015 22:54:13 +0000 (15:54 -0700)]
Implement simpleperf record/dumprecord subcommands.
(cherry picked from commit
9759e1b1ce76185aa539aeea2fb1cbd8382156e7)
Bug:
19483574
Change-Id: Id879713a75c2d3a6289d8847b95ee0bb4a2cc8a0
Dehao Chen [Thu, 7 May 2015 20:16:35 +0000 (13:16 -0700)]
Add sequence number to encoded perf.data file.
Bug:
19483574
(cherry picked from commit
f4605017b29dd98232af9385e71079a3ba0297f1)
Change-Id: I0ca00ce1a4695f2543da3a24987e9cbbeb22cc09
Adam Langley [Mon, 11 May 2015 19:17:25 +0000 (12:17 -0700)]
system/extra: include more of what you use.
This is a reland of
aa24bc89b78a5981df7618bdef78b7b49ffad14d which was
reverted in
291e20dab39783c7074191ff2d2de9b86465c10f because it broke
the git_master-gpl builder.
This version of the change uses crypto.h as a proxy for mem.h because
it'll work in both BoringSSL and OpenSSL.
(cherry picked from commit
a83adf6354f3073a1938ffcd6cadd5c357856de5)
Bug:
21085331
Change-Id: I9e4c9e4d459c2e31f74180b3a3b2ab139ab76e80
Dehao Chen [Tue, 5 May 2015 22:03:48 +0000 (15:03 -0700)]
Separate the destination directory to /data/misc/perfprofd.
Remove reading of aux-config.
Bug:
19483574
(cherry picked from commit
58bade36c738ed96137cfcc8d15f0505f085b5ae)
Change-Id: I019540197561d13d99640a8ff7042c20b58d9b9f
Dehao Chen [Mon, 4 May 2015 23:08:00 +0000 (16:08 -0700)]
Change the encoded file's mode to be readable by GMS core.
Bug:
19483574
(cherry picked from commit
adc45b2517a336e152aaa8ffbf19a505547f7d77)
Change-Id: I0ec40f7571d9b400bc37f2ebe7a268d1cb8dfe82
Dehao Chen [Thu, 30 Apr 2015 17:54:26 +0000 (10:54 -0700)]
Update simpleperf path to /system/xbin/simpleperf.
Change-Id: Ib326b1669553146e028c8354bb5077176d150616
(cherry picked from commit
35bb6be739761482fa7e72214d2aedf2623cbb9a)
Than McIntosh [Wed, 29 Apr 2015 18:48:32 +0000 (14:48 -0400)]
Switch perfprofd from using full to lite version of protobuf library.
Change-Id: Ie4cf7cd2e6e4f90bcdba39200c856c219b710065
(cherry picked from commit
124dd4262f2a2c8e55fdb81af9981b1f949a9686)
Dehao Chen [Wed, 29 Apr 2015 20:31:48 +0000 (13:31 -0700)]
Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified.
Change-Id: Ib6a442726b687f8aaec27dee30962cf3cc820918
(cherry picked from commit
bfd3af43e88249e763185005cf1db3cca4a3e6ed)
Dehao Chen [Mon, 27 Apr 2015 22:34:09 +0000 (15:34 -0700)]
Build simpleperf in user-debug mode, and put it in /system/xbin/.
(cherry picked from commit
d455de47298ada7e3532104a8e3312822a940906)
Change-Id: I53aa95e0c34957262bc9ebf3c2dff40bfee6867e
Dehao Chen [Mon, 27 Apr 2015 22:25:39 +0000 (15:25 -0700)]
Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/
(cherry picked from commit
2a1e7e814c9cb300c22132763a1817c04907e75b)
Change-Id: Ie893f20cd8b103d5eabdc57a13a6c6d9cf35d27d
Colin Cross [Fri, 24 Apr 2015 22:42:36 +0000 (22:42 +0000)]
am
7117efce: Merge "fix possible buffer overrun in librank"
* commit '
7117efced82fcb4d3658161d765bfc964ab930f4':
fix possible buffer overrun in librank
Colin Cross [Fri, 24 Apr 2015 21:58:46 +0000 (21:58 +0000)]
Merge "fix possible buffer overrun in librank"
Yabin Cui [Thu, 23 Apr 2015 23:44:29 +0000 (23:44 +0000)]
am
ffc011b6: Merge "Implement simpleperf stat subcommand."
* commit '
ffc011b651535c46225630f5b73a798d86c1f52e':
Implement simpleperf stat subcommand.
Yabin Cui [Thu, 23 Apr 2015 23:01:30 +0000 (23:01 +0000)]
Merge "Implement simpleperf stat subcommand."
Yabin Cui [Tue, 21 Apr 2015 01:07:17 +0000 (18:07 -0700)]
Implement simpleperf stat subcommand.
Also add some simple unit-tests.
Change-Id: Ic30a2d4a879e028a8c82babbaf82e322fc49a838
Than McIntosh [Thu, 23 Apr 2015 02:17:57 +0000 (02:17 +0000)]
am
8103fad7: Merge "Second round of changes to \'perf\' profile collection daemon."
* commit '
8103fad7c4f71b9ea7b27f624d7c40153132da2b':
Second round of changes to 'perf' profile collection daemon.
Than McIntosh [Thu, 23 Apr 2015 00:31:24 +0000 (00:31 +0000)]
Merge "Second round of changes to 'perf' profile collection daemon."
daegeun.song [Wed, 22 Apr 2015 02:31:29 +0000 (11:31 +0900)]
fix possible buffer overrun in librank
Use snprintf instead of sprintf and fclose() before return.
Change-Id: I2c367b2e7b943f4ed10551c18ecc971e6b830c66
Signed-off-by: Daegeun Song <daegeun.song@lge.com>
Than McIntosh [Fri, 17 Apr 2015 19:10:43 +0000 (15:10 -0400)]
Second round of changes to 'perf' profile collection daemon.
Details:
- avoid use of system() in favor of fork/exec.
- add option to selectively disable/enable mpdecision service around perf
collection runs to improve profile quality and avoid kernel pmuevents issues.
- default to using 'simpleperf' instead of 'perf'
Change-Id: I27928d8bb647fd852ec944158ebfd8efa38c01b4
Colin Cross [Wed, 22 Apr 2015 20:18:47 +0000 (20:18 +0000)]
am
8f4e7976: Merge "Do free and fclose when error occur."
* commit '
8f4e79766cb67241666d7454b71982fd53e9fb61':
Do free and fclose when error occur.
Colin Cross [Wed, 22 Apr 2015 17:57:32 +0000 (17:57 +0000)]
Merge "Do free and fclose when error occur."
daegeun.song [Wed, 22 Apr 2015 05:14:02 +0000 (14:14 +0900)]
Do free and fclose when error occur.
Do free and fclose when error occur.
Change-Id: Ifc611579cf919eeb3fbbf1dff70e7f851a26e083
Signed-off-by: Daegeun Song <daegeun.song@lge.com>
Yabin Cui [Sat, 18 Apr 2015 21:49:18 +0000 (21:49 +0000)]
am
9a6b9137: Merge "Implement simpleperf list subcommand."
* commit '
9a6b9137db9cd00e1189322a5db5581cd67e2867':
Implement simpleperf list subcommand.
Yabin Cui [Sat, 18 Apr 2015 21:13:26 +0000 (21:13 +0000)]
Merge "Implement simpleperf list subcommand."
Yabin Cui [Thu, 16 Apr 2015 22:26:31 +0000 (15:26 -0700)]
Implement simpleperf list subcommand.
simpleperf is used to replace linux/tools/perf. And This CL implements
the list subcommand of it.
Change-Id: I3e6fe854e19cc370070d0fd8416d0aa6fa8f8e90
Mark Salyzyn [Thu, 16 Apr 2015 18:45:51 +0000 (18:45 +0000)]
am
7f223030: Merge "f2fs_utils: fix build break in static_sdk_tools"
* commit '
7f223030ffe1a24600b09f52f17209f42dc0dcc0':
f2fs_utils: fix build break in static_sdk_tools
Mark Salyzyn [Thu, 16 Apr 2015 18:02:41 +0000 (18:02 +0000)]
Merge "f2fs_utils: fix build break in static_sdk_tools"
Mark Salyzyn [Thu, 16 Apr 2015 16:56:36 +0000 (09:56 -0700)]
f2fs_utils: fix build break in static_sdk_tools
external/f2fs-tools/mkfs/f2fs_format.c:357:
error: undefined reference to dev_read_version
clang: error:
linker command failed with exit code 1 (use -v to see invocation)
make: *** [out/host/linux-x86/obj/lib/libf2fs_fmt_host_dyn.so] Error 1
Change-Id: I9bf1eec9ee60aa2fc55a3d0793a67d36f271acef
Mark Salyzyn [Wed, 15 Apr 2015 19:16:35 +0000 (19:16 +0000)]
am
81c39be5: Merge "make_ext4fs: use libcutils and libselinux shared libraries"
* commit '
81c39be5ecdc37c32439c9b7d078be182505a34e':
make_ext4fs: use libcutils and libselinux shared libraries
Elliott Hughes [Wed, 15 Apr 2015 19:16:34 +0000 (19:16 +0000)]
am
d16419e1: Merge "Move away from gr_surface."
* commit '
d16419e176efa26f1760a52a9b57df96d070147a':
Move away from gr_surface.
Mark Salyzyn [Wed, 15 Apr 2015 18:14:37 +0000 (18:14 +0000)]
Merge "make_ext4fs: use libcutils and libselinux shared libraries"
Elliott Hughes [Wed, 15 Apr 2015 17:59:52 +0000 (17:59 +0000)]
Merge "Move away from gr_surface."
Elliott Hughes [Wed, 15 Apr 2015 17:23:15 +0000 (10:23 -0700)]
Move away from gr_surface.
Change-Id: Id23940a2e92bbfd56a2f2e1e021fb89114830dd4
Mark Salyzyn [Tue, 7 Apr 2015 16:36:29 +0000 (09:36 -0700)]
make_ext4fs: use libcutils and libselinux shared libraries
- move libcutils and libselinux as shared now that they are
in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging
Bug:
19908228
Change-Id: I85d6d0c1fd5cf22f7328fdfcbe9a8511a552857c
Paul Crowley [Thu, 9 Apr 2015 16:35:39 +0000 (16:35 +0000)]
am
a8ac44e4: Merge "select(2) is bad, always use poll(2). Also remove unnecessary loop."
* commit '
a8ac44e4da690d8278e24b611a8cb00010f70fd2':
select(2) is bad, always use poll(2). Also remove unnecessary loop.
Paul Crowley [Thu, 9 Apr 2015 15:55:35 +0000 (15:55 +0000)]
Merge "select(2) is bad, always use poll(2). Also remove unnecessary loop."
Paul Crowley [Thu, 9 Apr 2015 09:18:54 +0000 (10:18 +0100)]
select(2) is bad, always use poll(2). Also remove unnecessary loop.
Change-Id: I18cb8d75945413e35dc904bc95362d9b579cb336
Christopher Ferris [Thu, 9 Apr 2015 01:15:23 +0000 (01:15 +0000)]
am
de9235d6: Merge "Add memmove benchmarking."
* commit '
de9235d6fab42798cb32a772115f75e7bbf0bd3c':
Add memmove benchmarking.
Christopher Ferris [Wed, 8 Apr 2015 22:28:38 +0000 (22:28 +0000)]
Merge "Add memmove benchmarking."
Christopher Ferris [Wed, 8 Apr 2015 22:21:42 +0000 (15:21 -0700)]
Add memmove benchmarking.
Change-Id: I75bb907f5633d155cd411941ea6d9d39b9787983
Jeff Sharkey [Tue, 7 Apr 2015 21:10:54 +0000 (21:10 +0000)]
Merge "Add real UUID support to ext4_utils."
Elliott Hughes [Tue, 7 Apr 2015 20:53:20 +0000 (20:53 +0000)]
am
46b4f7d4: Merge "Perf profile collection daemon."
* commit '
46b4f7d4288acfbf4c8a4aabcd70a47fa92744d9':
Perf profile collection daemon.
Elliott Hughes [Tue, 7 Apr 2015 20:10:14 +0000 (20:10 +0000)]
Merge "Perf profile collection daemon."
Jeff Sharkey [Tue, 7 Apr 2015 05:29:04 +0000 (22:29 -0700)]
Add real UUID support to ext4_utils.
For some unknown reason, we've always been generating the same UUID
for every single ext4 partition that we formatted. Yikes.
Add a flag to request that a real UUID be generated when creating
filesystem.
Bug:
19993667
Change-Id: I6f3f6aa373021cb8b6779e5354ac36436c4d98d3
Than McIntosh [Thu, 5 Mar 2015 16:05:02 +0000 (11:05 -0500)]
Perf profile collection daemon.
Collects system-wide profiles via periodic invocation of
/system/bin/perf, placing the resulting data files in a destination
directory selected via config file. Behavior of the daemon, e.g how
often to profile, duration of profiling runs, etc, can also be
controlled with config file settings.
Change-Id: I7978cab62aa0c2507ecf8d70ba073e77db730120
Mohamad Ayyash [Tue, 7 Apr 2015 02:07:06 +0000 (02:07 +0000)]
am
01869e7a: Merge "Introduce squashfs-utils that includes helper functions"
* commit '
01869e7a7c7afb0074c0caa2bda34f38aa83ed2a':
Introduce squashfs-utils that includes helper functions
Mohamad Ayyash [Tue, 7 Apr 2015 01:24:21 +0000 (01:24 +0000)]
Merge "Introduce squashfs-utils that includes helper functions"
Mohamad Ayyash [Thu, 2 Apr 2015 02:25:28 +0000 (19:25 -0700)]
Introduce squashfs-utils that includes helper functions
For example: extracting filesystem size from superblock
Change-Id: I97c79d80ebb767a977c8ca27f7e0877b5ead8fdc
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mark Salyzyn [Mon, 6 Apr 2015 23:14:48 +0000 (23:14 +0000)]
am
0a726d10: Merge "ext_utils: xattr_free_space assert"
* commit '
0a726d107744add5ea656bca6b214ba3c8100ee6':
ext_utils: xattr_free_space assert
Mark Salyzyn [Mon, 6 Apr 2015 23:14:41 +0000 (23:14 +0000)]
am
0f68c105: Merge "ext4_utils: xattr_assert_sane false positives"
* commit '
0f68c105ffaf80b9619b8970572b213d284ce117':
ext4_utils: xattr_assert_sane false positives
Mark Salyzyn [Mon, 6 Apr 2015 19:41:07 +0000 (19:41 +0000)]
Merge "ext_utils: xattr_free_space assert"
Mark Salyzyn [Mon, 6 Apr 2015 19:37:28 +0000 (12:37 -0700)]
ext_utils: xattr_free_space assert
Commit
636d848860e5eac4225a830706fc34d48d8cc01e failed
to modify the assert checking to compensate for the
four null bytes.
Change-Id: Iec618f94f05f8700683507a3c797521689103b5a
Mark Salyzyn [Mon, 6 Apr 2015 19:22:48 +0000 (19:22 +0000)]
Merge "ext4_utils: xattr_assert_sane false positives"
Mark Salyzyn [Mon, 6 Apr 2015 19:16:42 +0000 (12:16 -0700)]
ext4_utils: xattr_assert_sane false positives
xattr_free_space() does not match kernel, it subtracts
sizeof(__u32) as a buffer zone to permit IS_LAST_ENTRY
to function. As documented in .../linux/fs/ext4/xattr.c:
+------------------+
| header |
| entry 1 | |
| entry 2 | | growing downwards
| entry 3 | v
| four null bytes | <<<< HERE is why sizeof(__u32)
| . . . |
| value 1 | ^
| value 3 | | growing upwards
| value 2 | |
+------------------+
Change-Id: Iee6e4e90664a3c2c5056006870b0f2f22b236bad
Elliott Hughes [Sat, 4 Apr 2015 19:43:15 +0000 (19:43 +0000)]
am
01764adb: Merge "Fix missing \'\n\'s in kernel logging."
* commit '
01764adb2c182ef593fba3b9cdece112c26a4765':
Fix missing '\n's in kernel logging.
Elliott Hughes [Sat, 4 Apr 2015 19:06:34 +0000 (19:06 +0000)]
Merge "Fix missing '\n's in kernel logging."
Elliott Hughes [Sat, 4 Apr 2015 19:03:52 +0000 (12:03 -0700)]
Fix missing '\n's in kernel logging.
Change-Id: I3a127b2d50012fec2f91fd302bbc611e47e04aff
Mark Salyzyn [Thu, 2 Apr 2015 21:40:13 +0000 (21:40 +0000)]
am
e3267421: Merge "ext4_utils: move fs_config to libcutils"
* commit '
e32674213dc5ad2375423e43b3f2419ead19f568':
ext4_utils: move fs_config to libcutils
Mark Salyzyn [Thu, 2 Apr 2015 20:59:05 +0000 (20:59 +0000)]
Merge "ext4_utils: move fs_config to libcutils"
Mark Salyzyn [Wed, 1 Apr 2015 14:31:14 +0000 (07:31 -0700)]
ext4_utils: move fs_config to libcutils
Bug:
19908228
Change-Id: Ic868d3e71d2a166603f3f0618aca5ea69639bdaf
Paul Lawrence [Thu, 2 Apr 2015 16:20:13 +0000 (16:20 +0000)]
am
0dbb7d33: Merge "ext4_utils: Abstracting ext4 encryption property system"
* commit '
0dbb7d33082ac3f12d2422d9af941f34686028e4':
ext4_utils: Abstracting ext4 encryption property system
Paul Lawrence [Thu, 2 Apr 2015 15:39:01 +0000 (15:39 +0000)]
Merge "ext4_utils: Abstracting ext4 encryption property system"
Paul Lawrence [Mon, 16 Mar 2015 22:35:55 +0000 (15:35 -0700)]
ext4_utils: Abstracting ext4 encryption property system
Change-Id: Iddca42328e9249eb09eb68e6d5339a02cfebecd0
Mohamad Ayyash [Wed, 1 Apr 2015 18:57:40 +0000 (18:57 +0000)]
am
252cea86: Merge "build_verity_tree: Add verbose flag"
* commit '
252cea86c4aa8bf363ebe5928d9bd09c55d6cc90':
build_verity_tree: Add verbose flag
Mohamad Ayyash [Tue, 31 Mar 2015 19:27:29 +0000 (12:27 -0700)]
build_verity_tree: Add verbose flag
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
(cherry picked from commit
70f72fb1035e753f5cef176339618723fba943e2)
Change-Id: Ic1f4c843e9597a9e7c0f43eb908c17420c259d9a
Sami Tolvanen [Wed, 1 Apr 2015 17:43:05 +0000 (17:43 +0000)]
am
960dbff3: Merge "slideshow: fix format string type"
* commit '
960dbff3838c6731420a9f796cf527f0d205bf18':
slideshow: fix format string type
Mohamad Ayyash [Wed, 1 Apr 2015 17:35:05 +0000 (17:35 +0000)]
Merge "build_verity_tree: Add verbose flag"
Sami Tolvanen [Wed, 1 Apr 2015 17:02:48 +0000 (17:02 +0000)]
Merge "slideshow: fix format string type"
Sami Tolvanen [Wed, 1 Apr 2015 16:53:41 +0000 (17:53 +0100)]
slideshow: fix format string type
Format string specifies %u, even though long int is passed.
Change-Id: I541c15552e403e16bef7a78f53d81eaacb605120
Mohamad Ayyash [Tue, 31 Mar 2015 19:27:29 +0000 (12:27 -0700)]
build_verity_tree: Add verbose flag
Change-Id: I0c5607f7aa5e964abc2031bbe71ff5c6e6ef56cc
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Elliott Hughes [Tue, 31 Mar 2015 02:05:10 +0000 (02:05 +0000)]
am
b7f56ac0: Merge "fs_mgr exports its headers."
* commit '
b7f56ac0176ae78e083bc8f95081b0befe2b17a2':
fs_mgr exports its headers.
Elliott Hughes [Tue, 31 Mar 2015 01:36:03 +0000 (01:36 +0000)]
Merge "fs_mgr exports its headers."
Elliott Hughes [Tue, 31 Mar 2015 00:48:49 +0000 (17:48 -0700)]
fs_mgr exports its headers.
Change-Id: I6fddb60a902be5ac216d32a751ec8c178c26ebaf
Paul Lawrence [Mon, 30 Mar 2015 17:27:35 +0000 (17:27 +0000)]
am
17fb21d0: Merge "Clean up includes"
* commit '
17fb21d013743a93bab3cdfc899e952184cae58c':
Clean up includes
Paul Lawrence [Mon, 30 Mar 2015 16:51:54 +0000 (16:51 +0000)]
Merge "Clean up includes"
Paul Lawrence [Mon, 30 Mar 2015 16:16:09 +0000 (09:16 -0700)]
Clean up includes
Remove two system files
Remove a circular include dependency by using a callback function
Change-Id: I159357b3a0ad06d0a7ebf45feb82989bcc1b303a
Elliott Hughes [Sat, 28 Mar 2015 18:16:28 +0000 (18:16 +0000)]
am
abe6f251: Merge "Don\'t #include "../"."
* commit '
abe6f251d1b836516514b88a6f2582fdb1f23ec4':
Don't #include "../".
Elliott Hughes [Sat, 28 Mar 2015 17:49:57 +0000 (17:49 +0000)]
Merge "Don't #include "../"."
Elliott Hughes [Sat, 28 Mar 2015 17:39:46 +0000 (10:39 -0700)]
Don't #include "../".
If you have to use a relative path (especially one out of the current
git project), you probably shouldn't be using those headers...
(cherrypick of
0c58a04b5567b84a13269835d9365a045d85b95e.)
Change-Id: Ifef6945cf1e884a4aa7f8f5532f1de660a22dafc
Elliott Hughes [Sat, 28 Mar 2015 17:39:46 +0000 (10:39 -0700)]
Don't #include "../".
If you have to use a relative path (especially one out of the current
git project), you probably shouldn't be using those headers...
Change-Id: Ifef6945cf1e884a4aa7f8f5532f1de660a22dafc
Paul Lawrence [Fri, 27 Mar 2015 23:43:18 +0000 (23:43 +0000)]
am
75c6509b: Merge "[HACK] Adding e4crypt support"
* commit '
75c6509ba647dd3d6fb61df6e59c52b16b7cda3f':
[HACK] Adding e4crypt support
Paul Lawrence [Fri, 27 Mar 2015 20:36:19 +0000 (20:36 +0000)]
Merge "[HACK] Adding e4crypt support"
Paul Lawrence [Wed, 25 Feb 2015 23:11:13 +0000 (15:11 -0800)]
[HACK] Adding e4crypt support
This is a dirty hack requiring a lot of clean up.
Needed to allow other parts to make progress.
Add e4crypt functions to libext4_utils
Add e4crypt command line tool
Change-Id: Iac5ae75e7f39cccc87701faf1f590e44f5209c0e
Elliott Hughes [Fri, 27 Mar 2015 02:28:01 +0000 (02:28 +0000)]
am
99918d02: Merge "Special-case "su --help"."
* commit '
99918d024a0b361f48162599c968fb100e1dcc3e':
Special-case "su --help".
Elliott Hughes [Fri, 27 Mar 2015 02:01:27 +0000 (02:01 +0000)]
Merge "Special-case "su --help"."
Elliott Hughes [Fri, 27 Mar 2015 00:09:41 +0000 (17:09 -0700)]
Special-case "su --help".
Rather than force people to move from "su system echo -n hello", where
the -n gets interpreted by getopt_long(3), to "su system -- echo -n hello",
just hard-code the recognition of --help. This seems easier than moving
people over to the more traditional "su -c 'echo -n hello'" style.
Bug:
19948740
Change-Id: I248269343b452a381effb7b8926ac7f2522b941b
Paul Lawrence [Thu, 26 Mar 2015 14:15:11 +0000 (14:15 +0000)]
Merge "[HACK] Adding e4crypt support"
Paul Lawrence [Wed, 25 Feb 2015 23:11:13 +0000 (15:11 -0800)]
[HACK] Adding e4crypt support
This is a dirty hack requiring a lot of clean up.
Needed to allow other parts to make progress.
Add e4crypt functions to libext4_utils
Add e4crypt command line tool
Change-Id: Iac5ae75e7f39cccc87701faf1f590e44f5209c0e
Elliott Hughes [Tue, 24 Mar 2015 04:07:20 +0000 (04:07 +0000)]
am
d56e76f0: Merge "Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP."
* commit '
d56e76f04b1f2ec89c52f68941591c54b8da21b3':
Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.
Elliott Hughes [Tue, 24 Mar 2015 03:41:09 +0000 (03:41 +0000)]
Merge "Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP."
Elliott Hughes [Tue, 24 Mar 2015 03:20:54 +0000 (20:20 -0700)]
Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.
Change-Id: Ifa87d9a9406acec1d5cdf7dd63af0df52c5cfb3c
Kenny Root [Wed, 18 Mar 2015 17:51:48 +0000 (17:51 +0000)]
am
efa04370: Merge "system/extras/verity: BoringSSL fix."
* commit '
efa043704bcbdc98b6c29a27f3a42caccb174664':
system/extras/verity: BoringSSL fix.