Commit Graph

31978 Commits

Author SHA1 Message Date
Dan Willemsen dacd341a7a Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: b37312a794
am: c0fbad2b2b

Change-Id: I7716d015717044122985f606bf78c55229691dc4
2017-04-11 17:06:57 +00:00
Jocelyn Bohr e53621c1f2 Merge changes from topic 'trusty_km2_hal'
am: a4b40020ef

Change-Id: I31e2ef8b8a41876cc6c2288abde798e261d00247
2017-04-11 17:04:45 +00:00
Dan Willemsen c0fbad2b2b Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
am: b37312a794

Change-Id: Ide6db0c1ceb6254a2279ca277a2b8a9dbd67b9b7
2017-04-11 16:55:27 +00:00
Jocelyn Bohr a4b40020ef Merge changes from topic 'trusty_km2_hal'
* changes:
  trusty: keymaster: update device tests to use 2.0 API
  trusty: keymaster: Implement abort
  trusty: keymaster: Implement finish
  trusty: keymaster: Implement update
  trusty: keymaster: Implement begin
  trusty: keymaster: Implement upgrade_key
  trusty: keymaster: Implement attest_key
  trusty: keymaster: Implement export_key
  trusty: keymaster: Implement import_key
  trusty: keymaster: Implement get_key_characteristics
  trusty: keymaster: Implement generate_key
  trusty: keymaster: Implement add_rng_entropy
  trusty: keymaster: Implement configure
  trusty: keymaster: Begin update from Keymaster 0.3 to 2.0
2017-04-11 16:52:45 +00:00
Treehugger Robot b37312a794 Merge "Remove .(ll)ndk suffix from (ll)ndk_library" 2017-04-11 16:19:16 +00:00
Elliott Hughes e821e1b850 Merge "Add a reasonably full implementation of gzip/gunzip/zcat." am: ca3de5562b am: a16ad5d45c
am: 1f592779c5

Change-Id: If7226bcba47bf68e4d4c983324a4d29f9739c317
2017-04-11 15:59:52 +00:00
Elliott Hughes 1f592779c5 Merge "Add a reasonably full implementation of gzip/gunzip/zcat." am: ca3de5562b
am: a16ad5d45c

Change-Id: Ia3eeaf06ee22473070785a1aee28bc048822d55b
2017-04-11 15:50:20 +00:00
Elliott Hughes a16ad5d45c Merge "Add a reasonably full implementation of gzip/gunzip/zcat."
am: ca3de5562b

Change-Id: Id997ac6f852b8036c661376d28d20eacdc3cdc8a
2017-04-11 15:46:19 +00:00
Elliott Hughes ca3de5562b Merge "Add a reasonably full implementation of gzip/gunzip/zcat." 2017-04-11 15:40:32 +00:00
Dan Willemsen ab89b34b6f Remove .(ll)ndk suffix from (ll)ndk_library
Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Merged-In: Ica4eedda51bb34db2f39d2c64ea436e1f633bfc3
Change-Id: Ica4eedda51bb34db2f39d2c64ea436e1f633bfc3
2017-04-11 15:14:28 +00:00
Steven Moreland e85c4a0359 Merge changes from topic 'llndk_rename' into oc-dev
am: ce4c78224d

Change-Id: I9a8345c7387b960aedc039031fa724ebdc05b0d8
2017-04-11 07:42:59 +00:00
Dan Willemsen a9d13d5aaf Remove .(ll)ndk suffix from (ll)ndk_library
am: c8202dc5f7

Change-Id: I5a1c891735dcaf7b87f2b4d428804d056848b574
2017-04-11 07:42:44 +00:00
TreeHugger Robot ce4c78224d Merge changes from topic 'llndk_rename' into oc-dev
* changes:
  Remove .(ll)ndk suffix from (ll)ndk_library
  Remove .(ll)ndk suffix from (ll)ndk_library
2017-04-11 07:22:26 +00:00
Keun-young Park 4fa5c37090 Merge "poll umount completion from /proc/mounts" into oc-dev
am: 4d4348c771  -s ours

Change-Id: I55fd48916999fab547e7cd1f9ba7885a8ed7afa6
2017-04-11 02:16:57 +00:00
Adam Lesinski 2e79e7a439 Merge "ZipWriter: Keep LFH and CFH in sync" into oc-dev
am: d4c8d87a9b

Change-Id: I88bdc3a7d7f007da28ad12387b6ba88c51ee877a
2017-04-11 02:06:16 +00:00
Keun-young Park 4d4348c771 Merge "poll umount completion from /proc/mounts" into oc-dev 2017-04-11 01:46:26 +00:00
Adam Lesinski d987c9dd9e ZipWriter: Keep LFH and CFH in sync
We change the GPB in the LocalFileHeader if the entry can not
have a trailing DataDescriptor. Make sure to patch the
CentralFileHeader to have the same bits set.

Modify ZipArchive to check that the data descriptor bit is consistent
between Central and Local file headers.

(cherry-pick of commit e0eca55fe6)

Test: make ziparchive-tests
Bug: 36686974
Change-Id: Ied167570abcf6426b1c678cd40123e5ad65909db
2017-04-11 01:45:25 +00:00
TreeHugger Robot d4c8d87a9b Merge "ZipWriter: Keep LFH and CFH in sync" into oc-dev 2017-04-11 01:28:45 +00:00
Chia-I Wu bbab165cf3 Merge "libgrallocusage: use gralloc1.h usage flags" into oc-dev
am: 64d1849077

Change-Id: I78bd2067fcd9e95c527266889513817e5ac10c21
2017-04-11 01:14:37 +00:00
Chia-I Wu 64d1849077 Merge "libgrallocusage: use gralloc1.h usage flags" into oc-dev 2017-04-11 01:08:38 +00:00
Keun-young Park ae56bc7efa Merge "poll umount completion from /proc/mounts" am: 625a098573 am: cb4dadfb08
am: 4c44243c45

Change-Id: Iee3fac59672d5f7f6bfdad35e374fec3f5a29f29
2017-04-11 01:04:55 +00:00
Keun-young Park 4c44243c45 Merge "poll umount completion from /proc/mounts" am: 625a098573
am: cb4dadfb08

Change-Id: Iad3165a37e54476bffa7396f7b180da6ca673a3a
2017-04-11 01:00:51 +00:00
Keun-young Park cb4dadfb08 Merge "poll umount completion from /proc/mounts"
am: 625a098573

Change-Id: Ie6fc3a126124a61c09c6aababb1da7893bb7eff7
2017-04-11 00:55:22 +00:00
Keun-young Park 0e90dee9e0 poll umount completion from /proc/mounts
- umount operation is asynchronous except for root partition.
  Returning from umount does not guarantee completion of
  umount. Poll /proc/mounts to confirm completion of umount.
- Treat all devices mounting to /data as emulated devices. This is
  future proof when fs other than sdcardfs is used.
- Drop quota sync from sync step. There is no differences in
  frequencies of quota error.
- Run umount in reverse order from mounting order so that any
  hidden dependency can be auto-resolved.
- Add dump of lsof and /proc/mounts when umount fails. lsof only runs
  when selinux is toggled into permissive mode. The dump is enabled
  only for non-user build.
- Keep logcat until vold shutdown in case vold has any error to report.

bug: 36551218
Test: python packages/services/Car/tools/bootanalyze/bootanalyze.py -r -c packages/services/Car/tools/bootanalyze/config.yaml -n 1000 -f -e 20 -w 30

Change-Id: I87b17b966d7004c205452d81460b02c6acf50d45
(cherry picked from commit 2ba5c8103d)
2017-04-10 17:48:19 -07:00
Keun-young Park 625a098573 Merge "poll umount completion from /proc/mounts" 2017-04-11 00:34:00 +00:00
Jocelyn Bohr 5020603116 trusty: keymaster: update device tests to use 2.0 API
Test: builds, ran trusty_keymaster_tipc on imx6ul
Change-Id: Ie9e8ee35ec31aead12adb348e6542a648b41fd7a
2017-04-10 17:33:49 -07:00
Jocelyn Bohr 465615e538 trusty: keymaster: Implement abort
Test: builds
Change-Id: I8dfef740a75ff76aebd3ee63aa747e319193aaed
2017-04-10 17:33:49 -07:00
Jocelyn Bohr e57f3ce2bf trusty: keymaster: Implement finish
Test: builds
Change-Id: I8505f428613176eea5373a459bbce0de17406c55
2017-04-10 17:33:49 -07:00
Jocelyn Bohr 86eb966106 trusty: keymaster: Implement update
Test: builds
Change-Id: Ie411a4e7ae3b5242814777f2781e1d2508917bfa
2017-04-10 17:33:49 -07:00
Jocelyn Bohr d7da42c0fa trusty: keymaster: Implement begin
Test: builds
Change-Id: Icb5470a8c95131ee3d68ab2ce41423302b9ed531
2017-04-10 17:33:49 -07:00
Jocelyn Bohr 22812e9a30 trusty: keymaster: Implement upgrade_key
Test: builds
Change-Id: I2ce86be1cd2c2c35ded371b21cb6546c31e0014e
2017-04-10 17:33:49 -07:00
Jocelyn Bohr a256198b92 trusty: keymaster: Implement attest_key
Test: builds
Change-Id: Ic5bf59db43b4301cbc2fa216470b9f07de8336b0
2017-04-10 17:33:49 -07:00
Jocelyn Bohr 4cbfa7f2f0 trusty: keymaster: Implement export_key
Test: builds
Change-Id: I47d1ed4144014fca47fdf67f9f4d2eb0d9b1eb8f
2017-04-10 17:33:49 -07:00
Jocelyn Bohr 2d768669fa trusty: keymaster: Implement import_key
Test: builds
Change-Id: Ie130df9958d0a75fdedb463a38ea2625e88940db
2017-04-10 17:33:49 -07:00
Jocelyn Bohr a02270fdd9 trusty: keymaster: Implement get_key_characteristics
Test: builds
Change-Id: I6e6a28d8eec5ff91a9e8c82597593857732407f3
2017-04-10 17:33:45 -07:00
Jocelyn Bohr e514dd8ad4 trusty: keymaster: Implement generate_key
Test: builds
Change-Id: Ib77e29709eed2e5f0cd16ed214db61f4257fcebd
2017-04-10 17:21:10 -07:00
Jocelyn Bohr 126402aae7 trusty: keymaster: Implement add_rng_entropy
Test: builds
Change-Id: Iec5f61777f9b39136028d61acaf724b9fafb4492
2017-04-10 17:19:49 -07:00
Jocelyn Bohr dccc76cd0b trusty: keymaster: Implement configure
This patch also forces the underlying structure of enum keymaster_command
to be uint32_t.

Test: builds
Change-Id: Ie8969beb9d6a15313456fbe54ef3806f6778ade2
2017-04-10 17:19:26 -07:00
Jocelyn Bohr e194e272f3 trusty: keymaster: Begin update from Keymaster 0.3 to 2.0
Replaces all Keymaster 0.3 methods with Keymaster 2.0 methods.
Stub out implementations.

Change-Id: Ie92110eb9da77ead98f65ed53d9a9c9457b8ac3c
Test: builds
2017-04-10 17:18:00 -07:00
Keun-young Park 2ba5c8103d poll umount completion from /proc/mounts
- umount operation is asynchronous except for root partition.
  Returning from umount does not guarantee completion of
  umount. Poll /proc/mounts to confirm completion of umount.
- Treat all devices mounting to /data as emulated devices. This is
  future proof when fs other than sdcardfs is used.
- Drop quota sync from sync step. There is no differences in
  frequencies of quota error.
- Run umount in reverse order from mounting order so that any
  hidden dependency can be auto-resolved.
- Add dump of lsof and /proc/mounts when umount fails. lsof only runs
  when selinux is toggled into permissive mode. The dump is enabled
  only for non-user build.
- Keep logcat until vold shutdown in case vold has any error to report.

bug: 36551218
Test: python packages/services/Car/tools/bootanalyze/bootanalyze.py -r -c packages/services/Car/tools/bootanalyze/config.yaml -n 1000 -f -e 20 -w 30

Change-Id: I87b17b966d7004c205452d81460b02c6acf50d45
2017-04-10 15:41:15 -07:00
Mark Salyzyn 2a0d5bd8a6 Merge "liblog: adapt to removal of property name size limit" into oc-dev
am: b07c58758b

Change-Id: Ib5e374cce2e51902d796b3bdf8ddec4fca3393a0
2017-04-10 21:31:50 +00:00
Mark Salyzyn b07c58758b Merge "liblog: adapt to removal of property name size limit" into oc-dev 2017-04-10 21:15:27 +00:00
Josh Gao a0ff3d7b6b Merge "crash_dump: during early boot, output to kmsg on userdebug." am: 72ca48e5cb am: 35b7a274ac
am: e80f6668f5

Change-Id: Ic9b44bd3cf50240c1f34edb8aa35a821a75e202c
2017-04-10 21:13:05 +00:00
Josh Gao e80f6668f5 Merge "crash_dump: during early boot, output to kmsg on userdebug." am: 72ca48e5cb
am: 35b7a274ac

Change-Id: Idda1bf55e654dd5e1eb72248572f9352671a3745
2017-04-10 21:08:07 +00:00
Josh Gao 35b7a274ac Merge "crash_dump: during early boot, output to kmsg on userdebug."
am: 72ca48e5cb

Change-Id: I7af41a7a0040ec2b04367042ff1afffb732fb316
2017-04-10 21:03:35 +00:00
Josh Gao 72ca48e5cb Merge "crash_dump: during early boot, output to kmsg on userdebug." 2017-04-10 20:51:59 +00:00
Steven Moreland db9b260096 Remove .(ll)ndk suffix from (ll)ndk_library
Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Change-Id: Ia039812817495c00e450eec7292447d5e8f93adb
2017-04-10 12:58:03 -07:00
Dan Willemsen c8202dc5f7 Remove .(ll)ndk suffix from (ll)ndk_library
Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Change-Id: Ica4eedda51bb34db2f39d2c64ea436e1f633bfc3
2017-04-10 12:54:31 -07:00
Mark Salyzyn f9e32f4883 libcutils: fs_config: target_out_path assumed /system breaking partitions
am: ffa763208b

Change-Id: I8bd21aea71e62653c35d451cfca78e5554854a04
2017-04-10 19:51:55 +00:00
Mark Salyzyn ffa763208b libcutils: fs_config: target_out_path assumed /system breaking partitions
(cherry picked from commit 6e9cb8fd79)

Strip off trailing / then /system and then add back the appropriate
config directory.  This fixes an issue with reading vendor, oem or odm
partitions.

Test: manual build successfully interprets all etc/fs_config_* files.
Test: manual incremental build successfully interprets all etc/fs_config_* files.
Bug: 36071012
Change-Id: Iba363f0731bb8d15e595bb45c56db97722edabc2
2017-04-10 19:32:11 +00:00