summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move restorecon and restorecon_recursive code to libselinux.Stephen Smalley2014-01-282-51/+5
| | | | | | | | | | | | This requires telling libselinux to use the sehandle already obtained by init rather than re-acquiring it internally. init retains ownership of the sehandle because it performs the initial load, uses the sehandle for other purposes (e.g. labeling of directories created via mkdir and labeling of socket files), and handles the policy reload property trigger. Change-Id: I4a380caab7f8481c33eb64fcdb16b6cabe918ebd Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "adbd: Don't close/reopen FFS ep0 on disconnect"Benoit Goby2014-01-281-19/+24
|\
| * adbd: Don't close/reopen FFS ep0 on disconnectJack Pham2014-01-071-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of bulk read/write failure or disconnect, transport_usb calls usb_ffs_kick in order to force the daemon to re-open the FunctionFS ep files as a way to soft restart the kernel driver. However, there's no reason to always close the ep0 file, as it would need to be reopened and the descriptors rewritten--this is unnecessary, especially in the simple/frequent case of cable disconnect, and causes the kernel driver to unbind and bind *all* of the function drivers. This is causing USB Chapter 9 tests to fail. Thus, try to reuse the same ep0 file handle across reconnects. In case there is a failure, the ep1/ep2 opens would fail and all the file handles get dropped. For the adb root case, the entire daemon gets restarted anyway. Change-Id: I0840085c52a0795dcb2d751c39aa4a436c039ee2
* | Merge "Fix overflow in adb_client"Nick Kralevich2014-01-271-2/+2
|\ \
| * | Fix overflow in adb_clientNick Kralevich2014-01-271-2/+2
|/ / | | | | | | | | | | | | | | | | Credit: Joshua Drake Bug: 12060953 (cherry picked from commit e89e09dd2b9b42184973e3ade291186a2737bced) Change-Id: I8a9b2592a5e4f7527c607abfe4ea6df6eb550aa8
* | Merge "Get arm64 to compile."Christopher Ferris2014-01-272-3/+2
|\ \
| * | Get arm64 to compile.Christopher Ferris2014-01-272-3/+2
|/ / | | | | | | Change-Id: Ica021aa134388fe7069a5de5df8036ecf0d570f8
* | Merge "Use <stdint.h> for INT32_MIN and INT32_MAX."Elliott Hughes2014-01-251-2/+0
|\ \
| * | Use <stdint.h> for INT32_MIN and INT32_MAX.Elliott Hughes2014-01-241-2/+0
|/ / | | | | | | | | Bug: 12708004 Change-Id: I99f222b2db1d128abf6ffbf7173a5aaff48f8e85
* | Merge "system/core: rename aarch64 target to arm64"Colin Cross2014-01-2424-177/+177
|\ \
| * | system/core: rename aarch64 target to arm64Colin Cross2014-01-2324-177/+177
| | | | | | | | | | | | | | | | | | | | | Rename aarch64 build targets to arm64. The gcc toolchain is still aarch64. Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
* | | Merge "Fix entry handling for 0 length entries."Brian Carlstrom2014-01-242-2/+46
|\ \ \
| * | | Fix entry handling for 0 length entries.Narayan Kamath2014-01-242-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two minor issues were fixed: - The offset to entry data can be the same as the central directory offset when the last entry in the file has length 0 and is stored (not deflated). Fix a check that disallowed this. We already have a strict check that entry data must end before the central directory, so we're covered. - We would attempt to map a segment of length 0 when writing an entry whose length is 0. We should just return early in this case. bug: 12623277 Change-Id: I2a4ca0c4d170cc3cbf326e5ca13894acd9c434c9
* | | | Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-242-8/+30
|\ \ \ \ | |_|/ / |/| | |
| * | | adbd: switch to su domain when running as rootNick Kralevich2014-01-222-8/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adbd runs as root, it should transition into the su domain. This is needed to run the adbd and shell domains in enforcing on userdebug / eng devices without breaking developer workflows. Introduce a new device_banner command line option. Change-Id: Ib33c0dd2dd6172035230514ac84fcaed2ecf44d6
* | | Merge changes Ib13d9654,I98723ccdColin Cross2014-01-243-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | * changes: system/core: remove $(KERNEL_HEADERS) from includes libcutils: fix atomic_memory_store_barrier
| * | system/core: remove $(KERNEL_HEADERS) from includesColin Cross2014-01-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The kernel headers are already in the include path, and manually adding them again will break on a multiarch build, where the kernel headers may be different for each arch. Change-Id: Ib13d96543f2c97b1b487a46e1748ceb2c5724169
| * | libcutils: fix atomic_memory_store_barrierColin Cross2014-01-221-1/+1
|/ / | | | | | | | | | | | | dmb isht is not a valid instruction, fix it to be dmb ishst (data memory barrier, inner shareable, on writes). Change-Id: I98723ccd8618b7863cb55da53dc29b979c9905a5
* | Merge "Attempt to fix Mac build"Christopher Ferris2014-01-181-1/+1
|\ \
| * | Attempt to fix Mac buildBrian Carlstrom2014-01-181-1/+1
|/ / | | | | | | Change-Id: I1364255bfed7788a35531962508bad804b8d5b7f
* | Merge "Fix "adb push /sdcard/filename""Nick Kralevich2014-01-181-13/+13
|\ \
| * | Fix "adb push /sdcard/filename"Nick Kralevich2014-01-171-13/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't assume that calling chown(filename, getuid(), getgid()) will always succeed. In the case of /sdcard, a file you create will be owned by root, so the chown call will fail. Instead, use uid=gid=-1 so that the chown call is truly a no-op. Ignore the results of calling chmod. Again, for /sdcard, the chmod call will never succeed, because the file isn't owned by the shell user. Bug: 12441485 Change-Id: I11eaf1d6f6049c1158afc29754fbb7af2baf2c78
* | Merge "Fix 'r' for LP64."Elliott Hughes2014-01-171-25/+31
|\ \
| * | Fix 'r' for LP64.Elliott Hughes2014-01-171-25/+31
| | | | | | | | | | | | Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
* | | Merge "Add PROT_* constants not found on windows."Christopher Ferris2014-01-171-0/+8
|\ \ \
| * | | Add PROT_* constants not found on windows.Christopher Ferris2014-01-171-0/+8
|/ / / | | | | | | | | | Change-Id: Ic515363ed66dfb2d8e1a6fdfa274508b3a91311d
* | | Merge "Rewrite libbacktrace to be all C++."Christopher Ferris2014-01-1720-706/+602
|\ \ \ | |/ / |/| |
| * | Rewrite libbacktrace to be all C++.Christopher Ferris2014-01-1620-706/+602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes removing the map_info.c source and replacing it with the BacktraceMap class to handle all map related code. Change all callers of libbacktrace map functionality. Also modify the corkscrew thread code so that it doesn't need to build the map twice (once in the corkscrew format and once in the libbacktrace format). Change-Id: I32865a39f83a3dd6f958fc03c2759ba47d12382e
* | | Merge "Remove obsolete 'setconsole' command."Elliott Hughes2014-01-162-162/+0
|\ \ \
| * | | Remove obsolete 'setconsole' command.Elliott Hughes2014-01-162-162/+0
|/ / / | | | | | | | | | Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
* | | Merge "system/core 64-bit cleanup."Elliott Hughes2014-01-1630-64/+57
|\ \ \
| * | | system/core 64-bit cleanup.Elliott Hughes2014-01-1630-64/+57
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This cleans up most of the size-related problems in system/core. There are still a few changes needed for a clean 64-bit build, but they look like they might require changes to things like the fastboot protocol. Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
* | | Merge "fs_mgr: increase verboseness on mount errors"Nick Kralevich2014-01-161-6/+12
|\ \ \ | |/ / |/| |
| * | fs_mgr: increase verboseness on mount errorsWilliam Roberts2014-01-151-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While debugging a mount error, the dmesg output was less than ideal. The error would be declared but why the mount failed, and what options were passed was not present. This patch ensures that the mount options and underlying errno are printed. Change-Id: I2b3a2c113149df878c0a8a10ef86fd9e4f909658
* | | Merge "restorecon /data/misc/media."Nick Kralevich2014-01-151-0/+1
|\ \ \ | |/ / |/| |
| * | restorecon /data/misc/media.Stephen Smalley2014-01-151-0/+1
|/ / | | | | | | | | | | | | Otherwise it will be mislabeled on upgrades with existing userdata. Change-Id: Ibde88d5d692ead45b480bb34cfe0831baeffbf94 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "Revert "fs_mgr: correct warning on unused function parameter""Nick Kralevich2014-01-151-1/+1
|\ \
| * | Revert "fs_mgr: correct warning on unused function parameter"Nick Kralevich2014-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build is broken. system/core/fs_mgr/fs_mgr.c:824:77: error: expected '(' before 'unused' const char *blk_device, long long length __attribute__(unused)) ^ system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry': system/core/fs_mgr/fs_mgr.c:824:56: warning: unused parameter 'length' [-Wunused-parameter] const char *blk_device, long long length __attribute__(unused)) ^ make: *** [out/target/product/generic_x86/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr.o] Error 1 make: *** Waiting for unfinished jobs.... This reverts commit 21095d0cae64c70b4ac7e90af7a6787019cc317a. Change-Id: I64f8c4d9c17c0e3bbf2eb427a2c0b81bbe66ec3a
* | | Merge "fs_mgr: correct warning on unused function parameter"Nick Kralevich2014-01-151-1/+1
|\ \ \ | |/ /
| * | fs_mgr: correct warning on unused function parameterWilliam Roberts2014-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | target thumb C: libfs_mgr <= system/core/fs_mgr/fs_mgr.c system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry': system/core/fs_mgr/fs_mgr.c:828:56: warning: unused parameter 'length' [-Wunused-parameter] const char *blk_device, long long length) Change-Id: Ide1bfa120c4f8d8e2f643929cb84c1be065e3310
* | | Merge "Copy the bionic -fstack-protector hack into libbacktrace."Elliott Hughes2014-01-151-0/+5
|\ \ \
| * | | Copy the bionic -fstack-protector hack into libbacktrace.Elliott Hughes2014-01-141-0/+5
|/ / / | | | | | | | | | | | | | | | aarch64 doesn't support -fstack-protector yet. Change-Id: Id1e589742ba074f59d3390d059248c9b371aff58
* | | Merge "Fix fastbootd build for 64-bit."Elliott Hughes2014-01-153-14/+16
|\ \ \
| * | | Fix fastbootd build for 64-bit.Elliott Hughes2014-01-143-14/+16
|/ / / | | | | | | | | | Change-Id: I04bef46f0125fd6a8fc0cb966bd257ad594aff1e
* | | Merge "Don't set LD_LIBRARY_PATH globally."Elliott Hughes2014-01-141-1/+0
|\ \ \
| * | | Don't set LD_LIBRARY_PATH globally.Elliott Hughes2014-01-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a 64-bit system, 64-bit processes will want one path, 32-bit processes another. The dynamic linker already provides the correct defaults for native code, and we've coupled the VM and dynamic linker so that LD_LIBRARY_PATH will be set correctly in any VM during startup if it's not being manually overridden. Change-Id: Icbffc0d451dbc242cdfb9267413d8bcac434e108
* | | | Merge "AArch64: Add atomic functions"Elliott Hughes2014-01-143-1/+247
|\ \ \ \ | |_|/ / |/| | |
| * | | AArch64: Add atomic functionsAshok Bhat2014-01-143-1/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds atomic functions for AArch64. The functions will be revisited later for potential optimizations using assembly or otherwise. This patch also introduces new 64-bit atomic functions for LP64 platforms. Change-Id: Id2127dd01cea65025f939e955d73d27e95d8687e Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | Merge "Create a bare bones host libbacktrace on mac."Christopher Ferris2014-01-143-16/+34
|\ \ \ \
| * | | | Create a bare bones host libbacktrace on mac.Christopher Ferris2014-01-133-16/+34
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This allows the libbacktrace library to compile for host on mac. Bug: 12474939 Change-Id: I32cbcf996e6fe9057e5065ba21f89086343704a0
generated by cgit v1.1 at 2025-03-14 05:30:54 +0000