summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* TEST_MAPPING: add the rest of our actively maintained tests.Elliott Hughes2018-10-302-0/+25
| | | | | | | | | | We can't add the ones that need a shared library because the infrastructure doesn't work yet. (We also can't comment this in the file, because there's no support for comments :-( .) Bug: N/A Test: N/A Change-Id: I4d84f962bbf48fc708df336726c18e48fe206492
* Merge "fastboot: wipe overlayfs for partition"Treehugger Robot2018-10-272-3/+56
|\
| * fastboot: wipe overlayfs for partitionMark Salyzyn2018-10-262-3/+56
| | | | | | | | | | | | | | | | | | | | Arrange to delete the overlayfs backing when a specified partition has been flashed. Test: manual Bug: 109821005 Bug: 117605276 Change-Id: I1c6a0341c6cd2ecfbb7c71bec5679a74d579aadd
* | Merge "fastbootd: Remove metadata merging code."David Anderson2018-10-262-40/+5
|\ \
| * | fastbootd: Remove metadata merging code.David Anderson2018-10-262-40/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this code was to support preserving partitions across a flashall operation. Since we are not supporting persistent read-write partitions, this merging code is effectively useless - it is preserving only partitions that will be deleted. Additionally, this code does not merge partition group changes, since doing so accurately is difficult. Partition size changes aren't sent until after update-super resolves, so a valid re-grouping could be rejected during update-super if the existing partitions are too big. This patch removes the update-super merging code until a use case comes along and we can properly evaluate how it should work. Bug: N/A Test: fastboot flashall Change-Id: I1d622b23dabdf031897be9de49f59fc8cf3caf3b
* | | Merge "Yet another Mac fix."Yuchao Zhou2018-10-261-0/+4
|\ \ \
| * | | Yet another Mac fix.Elliott Hughes2018-10-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system/core/libziparchive/zip_archive.cc:847:36: error: use of undeclared identifier 'lseek64'; did you mean 'lseek'? const off64_t current_offset = lseek64(fd, 0, SEEK_CUR); Bug: N/A Test: builds Change-Id: If762011722d53376bb6dab35c6ee8031762e5a95
* | | | Merge "More Mac build fixes."Yuchao Zhou2018-10-265-6/+9
|\ \ \ \
| * | | | More Mac build fixes.Elliott Hughes2018-10-265-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libziparchive public headers that refer to `off64_t` also need the Mac workaround. In fastboot, there's a stray `lseek64` but since it's only for offset 0, any kind of seek is fine. Bug: N/A Test: builds Change-Id: I68b4f95202623ebf07ffe6c3e0e21437e7922c5b
* | | | | Merge "init: fix error messages when an invalid section header is found"Tom Cherry2018-10-261-1/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | init: fix error messages when an invalid section header is foundTom Cherry2018-10-261-1/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a section header such as 'on' or 'service' has an error with it, the rest of the commands / options are currently reported as errors since there is no valid parser object to parse them. For example, service !@#$%%^&*() /system/bin/false user root group blah blah blah Generates: init: /system/etc/init/bad.rc: 2: invalid service name '!@#$%%^&*()' init: /system/etc/init/bad.rc: 3: Invalid section keyword found init: /system/etc/init/bad.rc: 4: Invalid section keyword found init: /system/etc/init/bad.rc: 5: Invalid section keyword found This change suppresses the extraneous 'Invalid section keyword found' messages. Test: faulty error messages are suppressed. Change-Id: Ieeb2d5b8b7eea33e191a88ce5a0d41701686943f
* | | | Merge "init: allow vendor init to action on any vendor or odm property"Tom Cherry2018-10-261-0/+12
|\ \ \ \
| * | | | init: allow vendor init to action on any vendor or odm propertyTom Cherry2018-10-261-0/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial revert of "init: if vendor_init can read a property, let it be a trigger too" (b35f827c97ceb24e33fb2514ff62c8636bc46f59). We made a mistake when we allowed vendor init to action on any vendor or odm property, since when a new SELinux label is created for a vendor property, vendor_init does not automatically get read permissions for it. Recently, we tried to use read permissions instead of the built-in list in init, but that broke due to the above mistaken. Since we have already launched with these permissions as is, we must restore them. Bug: 118457755 Test: no denials for vendor init actionable properties on crosshatch Change-Id: I7a9a560c9a54a177c6b83d28309e2f288f05d400
* | | | Merge "fastboot: Resize logical partitions when using the flash command."David Anderson2018-10-261-5/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | fastboot: Resize logical partitions when using the flash command.David Anderson2018-10-251-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an image size changes slightly in between "flashall" and some change in the build, it's inconvenient to have to reflash the whole device again. This patch resizes partitions when using a normal flash command, to improve the developer workflow. Bug: N/A Test: fastboot flash system Change-Id: I349364a4742a0c15748f545fcfda946107720d45
* | | | Merge "libbase: a slightly cleaner solution to libbase's `off64_t` problem."Treehugger Robot2018-10-263-10/+25
|\ \ \ \
| * | | | libbase: a slightly cleaner solution to libbase's `off64_t` problem.Elliott Hughes2018-10-253-10/+25
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that I can't actually go back in time and just make bionic's `off_t` be 64-bit. Bug: N/A Test: builds Change-Id: Ic93336b07bffc0977bd0e9caad6a22ce29ca06ed
* | | | Merge "libcutils: lose socket_peer_is_trusted to ART, the only user."Treehugger Robot2018-10-262-43/+1
|\ \ \ \ | |/ / / |/| | |
| * | | libcutils: lose socket_peer_is_trusted to ART, the only user.Elliott Hughes2018-10-252-43/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: N/A Test: builds Change-Id: I599270729c2037b2c06d7906a5e5f7362fbbaf08
* | | | Merge "fastboot: Check that reboot to userspace succeeded."Treehugger Robot2018-10-251-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | fastboot: Check that reboot to userspace succeeded.David Anderson2018-10-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After rebooting to userspace fastboot, the first command issued is "update-super". If we wound up in the bootloader by accident (as happened to a few users with a busted vbmeta_system), the resulting error message will be very misleading ("update-super" will be an unrecognized command). Instead, this patch explicitly errors if we did not successfully boot into fastbootd. Bug: N/A Test: fastboot flashall Change-Id: I7d5bd64db540978bd0bae884f40ce8c3df48f856
* | | | Merge "libbase: quick fix for Mac build."Treehugger Robot2018-10-251-0/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | libbase: quick fix for Mac build.Elliott Hughes2018-10-251-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | I'll come back for the better fix later... Bug: N/A Test: builds Change-Id: I967c2436cf5816cf9a0edcd3f04f307969e48bcb
* | | Merge "Make native metrics logger write to statsd socket"Howard Ro2018-10-256-7/+77
|\ \ \
| * | | Make native metrics logger write to statsd socketHoward Ro2018-10-246-7/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous submission of this change, aosp/790068, caused a failure in sdk_mac for CLOCK_REALTIME and <endian.h> not being available. Bug: 110537511 Test: compiles without failures and verified the correct metric Change-Id: Iba1dc920ad82e88a4bcdd2feaee9a06202a440c2
* | | | Merge "liblp: Add an abstraction layer for opening partitions."Treehugger Robot2018-10-2515-160/+411
|\ \ \ \
| * | | | liblp: Add an abstraction layer for opening partitions.David Anderson2018-10-2415-160/+411
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces an IPartitionOpener abstraction. Methods that interact with live metadata, such as ReadMetadata, UpdatePartitionTable, and FlashPartitionTable, now require an IPartitionOpener object. Its purpose is dependency injection: it will make these methods much easier to test when the super partition spans multiple block devices. All non-test consumers should be using PartitionOpener, and as such, some helper methods have been added that automatically create one. Bug: 116802789 Test: liblp_test gtest device with super partition boots Change-Id: I76725a5830ef643c5007c152c00ccaad8085151f
* | | | | Merge "liblp: Store device information in a new block device table."David Anderson2018-10-2513-138/+278
|\| | | |
| * | | | liblp: Store device information in a new block device table.David Anderson2018-10-2413-138/+278
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the alignment, block device size, and starting sector fields from LpGeometry into a new LpMetadataBlockDevice struct. The metadata now contains a table of these structs, and the table will have exactly one entry representing the super partition. This refactoring will make it easier to have logical partitions span multiple physical partitions. When that happens, the table will be allowed to have more than one entry, and the first entry of the table will be considered the "root" of the super partition. Bug: 116802789 Test: liblp_test gtest device with logical partitions flashes and boots Change-Id: I97f23beac0363182cb6ae78ba2595860950afcf0
* | | | Merge "libbase: add O_CLOEXEC to <android-base/file.h>."Elliott Hughes2018-10-253-6/+7
|\ \ \ \
| * | | | libbase: add O_CLOEXEC to <android-base/file.h>.Elliott Hughes2018-10-243-6/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | We already expose O_BINARY, and O_CLOEXEC seems equally legitimate. Bug: N/A Test: builds Change-Id: I7f07e1bb2a5d6b5c5f293783c39ceab148fabefb
* | | | Merge "fs_mgr: fs_mgr_overlayfs_teardown access to dynamic partition data"Mark Salyzyn2018-10-251-0/+14
|\ \ \ \
| * | | | fs_mgr: fs_mgr_overlayfs_teardown access to dynamic partition dataMark Salyzyn2018-10-221-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If fs_mgr_overlayfs_teardown is called with a specific mount_point reference (eg: /vendor, /product, /system) when /mnt/scratch is not mounted (eg: in recovery or fastboot mode), then mount it to perform the directory teardown. Test: manual on future changes: fastboot flash vendor -> fastbootd Bug: 109821105 Bug: 117605276 Change-Id: I5735008e33b57d35345a799dc68bb43c9189135a
* | | | | Merge "libbase: remove ARRAYSIZE_UNSAFE."Treehugger Robot2018-10-251-54/+14
|\ \ \ \ \
| * | | | | libbase: remove ARRAYSIZE_UNSAFE.Elliott Hughes2018-10-241-54/+14
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the indentation of a neighboring comment. Bug: N/A Test: builds Change-Id: Iebe5f518b2ac14718f3cae91007e62b61bed9dc0
* | | | | Merge "adb: Use a default _SC_GETPW_R_SIZE_MAX size"Treehugger Robot2018-10-251-0/+3
|\ \ \ \ \
| * | | | | adb: Use a default _SC_GETPW_R_SIZE_MAX sizeRobert Yang2018-10-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sysconf(_SC_GETPW_R_SIZE_MAX) may return −1 if there is no hard limit on the the buffer size. Some libc implementations such as musl don't define this limit and will return -1. Use a default buffer size to handle this case. Change-Id: I997b13a2c2dca00574e049a259135e61c8ed8e03 Signed-off-by: Robert Yang <decatf@gmail.com>
* | | | | | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I413bb086f5ff064430c061bdd5d0fe3d02925304
| * \ \ \ \ \ Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.Bill Rassieur2018-10-101-5/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I398364a59b493057139bdfd5de6b5070978c44bb BUG: 117431430
| | * | | | | | Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, ↵android-build-team Robot2018-08-161-5/+1
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2 Change-Id: Ia75958a7ea990a00967dbc876fcd5fdd0339fb85
| | * | | | | | Revert "Support Speck encryption."Greg Kaiser2018-08-161-5/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 49c27c5cb2c48ce4665affe2b3086077c768a9ae. Remove the Speck encryption support. It was eventually decided not to allow Speck in Android P, so this code is no longer needed and wasn't used outside of testing. Bug: 112009351 Test: Confirmed AES continues to work with FBE. Change-Id: Ia5458143be5687fff8d541d8fa2c8ee24a369da4 (cherry picked from commit 270e90f033dd412206697e3a27aee76c24038c33)
| * | | | | | Merge cherrypicks of [4392181, 4392182, 4392183, 4392184, 4392201, 4392202] ↵android-build-team Robot2018-06-212-12/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pi-release Change-Id: I82b5577e2ecdbf50a73df940db72964b9c6969af
| | * | | | | | Determine product partition path on build timeDoheon Lee2018-06-212-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Path of product partitoin can be set as /product or /system/product whether generate extra product partition or not. Substitute %PRODUCT% to relevant path to know linker which path should search and permit. Bug: 110286945 Test: m -j # Check /system/etc/ld.config.$(PLATFORM_VNDK_VERSION).txt Change-Id: I6ca177d0c9c5af00ad821879fece40848331fc8d Merged-In: I6ca177d0c9c5af00ad821879fece40848331fc8d (cherry picked from commit cccad0bf8461ab575a5861f9bc68c9f8f69db582) (cherry picked from commit 93d837f3a90acec007647f21ed4573f044fa6f1e)
| | * | | | | | Add /system/product/* paths to permitted pathsInseob Kim2018-06-211-0/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As linker doesn't resolve paths in permitted paths, /system/product variants should be added to support devices having product partition under /system. Bug: 110286945 Test: m -j succeeds on taimen and libraries under /system can dlopen libraries under /system/product/apps Change-Id: Icd102d44511702e4ec66c07a367b59c3d9700a44 Merged-In: Icd102d44511702e4ec66c07a367b59c3d9700a44 (cherry picked from commit 3918936b9e7fee51828d285a1217c7202d5cb2d1) (cherry picked from commit c4cf62f4b4e9186a897e943b2419fb9a13739c1b)
| * | | | | | Merge cherrypicks of [4368877, 4369031, 4369032, 4369033, 4369034, 4368878, ↵android-build-team Robot2018-06-183-16/+33
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4369035, 4369036, 4369008] into pi-release Change-Id: I05769d63a54c76d20b8724dce36b30e54cba9be6
| | * | | | | | Populate recovery DTBO offset correctlyHridya Valsaraju2018-06-182-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, remove recovery_dtbo_offset argument for mkbootimg as this is calculated based on sizes of kernel, ramdisk and second binaries. Also, modify unpack_bootimg to use the recovery_dtbo_offset field to extract recovery_dtbo. Test: make recoveryimage showcommands -j32 Bug: 80207223 unpack_bootimg --boot_img $OUT/recovery.img diff recovery_dtbo dtbo.img Change-Id: I588ccc8b739c169b6f78c17ffe554c5562397d98 Merged-In: I588ccc8b739c169b6f78c17ffe554c5562397d98 (cherry picked from commit 26e01bbdc5cb2dcad64d73ec836447b8ded4fc6c) (cherry picked from commit b8371d532d6cd1314954c2d3e9b8a79d3d70e7c7)
| | * | | | | | Correct comment in boot image headerHridya Valsaraju2018-06-181-5/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: make Bug: 80207223 Change-Id: I88cf7683e036ff43bbe3ff5418519c7e35e08b79 Merged-In: I88cf7683e036ff43bbe3ff5418519c7e35e08b79 (cherry picked from commit d0ab4e3701dcec866cb05f4d2a122fbbcabf61cc) (cherry picked from commit f514f6f66aba10f2668481a4d643c7983a0ea93a)
| * | | | | | Snap for 4826885 from 820ef1505828e89b704f319311ed0cf4ec73752c to pi-releaseandroid-build-team Robot2018-06-071-4/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbb0531108a6292880957b7f4a4a5225926e32c6
| * \ \ \ \ \ \ Snap for 4824048 from ea03e1f8412903838b449871190e1279dc79e076 to pi-releaseandroid-build-team Robot2018-06-061-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f4785f6e473990eb636cea655c7d1c78022de93
| * \ \ \ \ \ \ \ Snap for 4818534 from 9bd3ee1c4f14f268b0959edd891ef852b95370b8 to pi-releaseandroid-build-team Robot2018-06-039-39/+120
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc9af3a531d434302036e2d1d61e172bd9a7849d