OSDN Git Service
Dan Shi [Fri, 31 Mar 2017 17:13:43 +0000 (17:13 +0000)]
Merge "Add test config to time-unit-tests" am:
f8289b9e88
am:
d48cc6e096
Change-Id: I1318a1ea96f5652309dd481ea8b59ce54c95668d
Dan Shi [Fri, 31 Mar 2017 17:13:35 +0000 (17:13 +0000)]
Merge "Add test config to mmapPerf" am:
a2f6b2fe17
am:
e988c3ee6a
Change-Id: I33354a1899d4206387f08e7ced39d5717a0ee090
Dan Shi [Fri, 31 Mar 2017 17:13:26 +0000 (17:13 +0000)]
Merge "Add test config to perfprofd_test" am:
e0d790c82c
am:
53011202e2
Change-Id: I958abbc2add81e44bc1bde40beb47c18ef98e399
Dan Shi [Fri, 31 Mar 2017 17:11:45 +0000 (17:11 +0000)]
Merge "Add test config to time-unit-tests"
am:
f8289b9e88
Change-Id: I9e14a76af68fccc187f2f6adf41b8a08e0a73609
Dan Shi [Fri, 31 Mar 2017 17:11:36 +0000 (17:11 +0000)]
Merge "Add test config to mmapPerf"
am:
a2f6b2fe17
Change-Id: I8273d4b05e3db03f20dc3d05d45d309283abf559
Dan Shi [Fri, 31 Mar 2017 17:11:27 +0000 (17:11 +0000)]
Merge "Add test config to perfprofd_test"
am:
e0d790c82c
Change-Id: I3e4a8f2b22870bd7ed3ad473a4b7135ff1a2d3c1
Treehugger Robot [Fri, 31 Mar 2017 17:07:28 +0000 (17:07 +0000)]
Merge "Add test config to time-unit-tests"
Treehugger Robot [Fri, 31 Mar 2017 17:07:11 +0000 (17:07 +0000)]
Merge "Add test config to mmapPerf"
Treehugger Robot [Fri, 31 Mar 2017 17:06:57 +0000 (17:06 +0000)]
Merge "Add test config to perfprofd_test"
Tom Cherry [Fri, 31 Mar 2017 16:45:09 +0000 (16:45 +0000)]
Merge "Removed e4crypt_create_device_key" am:
582a79634a
am:
6cf3d8775f
Change-Id: Icb460a36cabc6181af15f8c8beaf4877934d6a31
Tom Cherry [Fri, 31 Mar 2017 16:43:08 +0000 (16:43 +0000)]
Merge "Removed e4crypt_create_device_key"
am:
582a79634a
Change-Id: I23e8519eaf880d9d9f76ee651d2af966d1271e8e
Tom Cherry [Fri, 31 Mar 2017 16:41:00 +0000 (16:41 +0000)]
Merge "Removed e4crypt_create_device_key"
Bowgo Tsai [Fri, 31 Mar 2017 02:35:19 +0000 (02:35 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")" am:
4485a7b47d
am:
8ecb417ce3
Change-Id: I5f223563408bc3133e91238ee34894ab13ff4103
Bowgo Tsai [Fri, 31 Mar 2017 02:32:52 +0000 (02:32 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")"
am:
4485a7b47d
Change-Id: Ibc639cb80e15617fd351dd8a85dcbdd1b60d7bbd
Treehugger Robot [Fri, 31 Mar 2017 02:28:29 +0000 (02:28 +0000)]
Merge "Switch to fs_mgr_read_fstab("/fstab.device")"
Dan Shi [Thu, 30 Mar 2017 06:36:06 +0000 (23:36 -0700)]
Add test config to perfprofd_test
Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo
Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#
Bug:
35882476
Test: local test
Change-Id: Ia0842c07ee908fbdcb01eefbe810d2d6aeff9bda
Sen Jiang [Wed, 29 Mar 2017 23:32:14 +0000 (23:32 +0000)]
Merge changes Ice70d9ab,Iba7ac028 am:
01320a387b
am:
9c290a08e8
Change-Id: Id70264e1b980eb3ea68425fdb44160e364b83515
Sen Jiang [Wed, 29 Mar 2017 23:31:10 +0000 (23:31 +0000)]
Merge changes Ice70d9ab,Iba7ac028
am:
01320a387b
Change-Id: Ie9fcffc1626270c19441590fd75f76fbc907ca88
Treehugger Robot [Wed, 29 Mar 2017 23:24:01 +0000 (23:24 +0000)]
Merge changes Ice70d9ab,Iba7ac028
* changes:
os-release.d: remove deprecated cfgtree support.
os-release.d: Add system_id.
Janis Danisevskis [Wed, 29 Mar 2017 22:19:23 +0000 (15:19 -0700)]
Removed e4crypt_create_device_key
Init was the only user of e4crypt_create_device_key and
it is not using it any more.
Bug:
36278706
Test: Removed unused code, and codebase still builds.
Change-Id: Id134a2dbcaf6553353962f5b93883bb3981f217c
Sen Jiang [Fri, 24 Mar 2017 21:33:35 +0000 (14:33 -0700)]
os-release.d: remove deprecated cfgtree support.
They are from tier 1 and are now dead.
Test: m dist
Change-Id: Ice70d9ab0fe8ff528e2ad5de8fb4ab2bd270ba04
(cherry picked from commit
91ac1f9c0d623383fa7ad453ff70f35086061d07)
Sen Jiang [Fri, 24 Mar 2017 19:44:58 +0000 (12:44 -0700)]
os-release.d: Add system_id.
This is the app id of the SoM stored in the system.
Test: adb shell cat /etc/os-release.d/system_id
Change-Id: Iba7ac028ffa7402f06fbf9c4a3a077eb3414940e
(cherry picked from commit
d41148b6c8d59d4f35711028248fc644428ddc57)
Dan Shi [Wed, 29 Mar 2017 19:26:54 +0000 (12:26 -0700)]
Add test config to mmapPerf
Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo
Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#
Bug:
35882476
Test: local test
Change-Id: Ie318c3abd3eb7ee5ad153774dce39f6fad552289
Bowgo Tsai [Wed, 29 Mar 2017 08:07:12 +0000 (16:07 +0800)]
Switch to fs_mgr_read_fstab("/fstab.device")
fstab.device is for backward compatibility in legacy devices.
As it doesn't have fstab entries in device tree (for early mount) so we
can just use the ordinary fs_mgr_read_fstab().
For new devices having early mount, it should use
fs_mgr_read_fstab_default() instead.
Bug:
35811655
Test: boot sailfish
Change-Id: I70b64787e600d6e338e57f2a31bad188a39d433d
Tianjie Xu [Tue, 28 Mar 2017 20:03:37 +0000 (20:03 +0000)]
Merge "Fix the linking error due to libminui change" am:
5e9cc93aca
am:
d5d88e29d2
Change-Id: I855f99a87ace1c509fd8c0d3edc260cdad7257cf
Tianjie Xu [Tue, 28 Mar 2017 19:53:57 +0000 (19:53 +0000)]
Merge "Fix the linking error due to libminui change"
am:
5e9cc93aca
Change-Id: Ifd0239bc371a1a7ca1a67be62a9efc331ff4dfcb
Tianjie Xu [Tue, 28 Mar 2017 19:42:53 +0000 (19:42 +0000)]
Merge "Fix the linking error due to libminui change"
Dan Shi [Tue, 28 Mar 2017 19:19:04 +0000 (12:19 -0700)]
Add test config to time-unit-tests
Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo
Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#
Bug:
35882476
Test: local test
Change-Id: I7f5f4f9fae754f0585be0b6c5ba7737bfcd86d86
Jin Qian [Sat, 25 Mar 2017 22:18:33 +0000 (22:18 +0000)]
Merge "ext4_utils: fix crash when filesystem size is too small" am:
7902acdaa0
am:
d57a607ac7
Change-Id: I6857786fde370caf9c7ea10202e90b8e945d6627
Jin Qian [Sat, 25 Mar 2017 22:16:04 +0000 (22:16 +0000)]
Merge "ext4_utils: fix crash when filesystem size is too small"
am:
7902acdaa0
Change-Id: Ieb83a45f469eeca6a17cacd1d211b5d3c7fedd15
Treehugger Robot [Sat, 25 Mar 2017 22:13:37 +0000 (22:13 +0000)]
Merge "ext4_utils: fix crash when filesystem size is too small"
Jin Qian [Sat, 25 Mar 2017 00:01:54 +0000 (17:01 -0700)]
ext4_utils: fix crash when filesystem size is too small
make_ext4fs crashes if size is less than block size or less than
header size (super block + descriptors + bitmaps). Check the size
and return errors.
Test: run make_ext4fs with small sizes
Bug:
36576677
Change-Id: I61d92e280cdf290054fadda5a045fc839c6fd8fe
Tianjie Xu [Sat, 25 Mar 2017 00:36:01 +0000 (17:36 -0700)]
Fix the linking error due to libminui change
Test: mma
Change-Id: I56be95ee8062b0bccce296dec4909b9eabb7959a
Yabin Cui [Wed, 22 Mar 2017 21:17:46 +0000 (21:17 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3839284." am:
91ddc60836
am:
3c996df3b9
Change-Id: I93d5ec056cb3fcef495afa4e2670861714911867
Yabin Cui [Wed, 22 Mar 2017 21:16:41 +0000 (21:16 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3839284."
am:
91ddc60836
Change-Id: Ieea7cf96db623a47488e139d338e2207a1fa3a2f
Treehugger Robot [Wed, 22 Mar 2017 21:08:46 +0000 (21:08 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3839284."
Yabin Cui [Wed, 22 Mar 2017 19:13:13 +0000 (12:13 -0700)]
simpleperf: update simpleperf prebuilts to build
3839284.
Taken from branch aosp-master.
And remove update.py from the distribution.
Bug: http://b/
35726123
Test: run pprof_proto_generator.py.
Change-Id: I9b8e0c2f804c5e61ef1c9b1eb1aa626d0d849f64
Yabin Cui [Wed, 22 Mar 2017 00:13:42 +0000 (00:13 +0000)]
Merge "simpleperf: add new scripts in sdk artifacts." am:
955ffc9f09
am:
d4d6e0c95d
Change-Id: Ic8f2ed68e863d56a447892657b28687b347c35c2
Yabin Cui [Wed, 22 Mar 2017 00:10:12 +0000 (00:10 +0000)]
Merge "simpleperf: add new scripts in sdk artifacts."
am:
955ffc9f09
Change-Id: I602c1c414bd2abd30a01a50bb45059cfa74b757d
Treehugger Robot [Tue, 21 Mar 2017 23:54:10 +0000 (23:54 +0000)]
Merge "simpleperf: add new scripts in sdk artifacts."
Yabin Cui [Tue, 21 Mar 2017 22:16:34 +0000 (15:16 -0700)]
simpleperf: add new scripts in sdk artifacts.
Bug: http://b/
35726123
Test: run `make sdk -j30`.
Change-Id: I1515afc0d69dbbcc3756b7d93b738039a1174571
Yabin Cui [Tue, 21 Mar 2017 17:20:32 +0000 (17:20 +0000)]
Merge "simpleperf: add script to generate proto data used by pprof." am:
94892d4ead
am:
50c4ddad23
Change-Id: I4bcd5796e144063454d63632eaf43879ce859748
Yabin Cui [Tue, 21 Mar 2017 17:17:01 +0000 (17:17 +0000)]
Merge "simpleperf: add script to generate proto data used by pprof."
am:
94892d4ead
Change-Id: I73afb3476a3cef47b9e9a88556745f07362f44d9
Yabin Cui [Tue, 21 Mar 2017 17:11:59 +0000 (17:11 +0000)]
Merge "simpleperf: add script to generate proto data used by pprof."
Yabin Cui [Thu, 16 Mar 2017 20:00:43 +0000 (13:00 -0700)]
simpleperf: add script to generate proto data used by pprof.
Also change Addr2Line to support inline functions.
Bug: http://b/
35726123
Test: run gen_pprof_proto.py manually.
Change-Id: Ia2f84ac142e7075ea902f3456235db24567e4fcd
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
OSDN Git Service
