Merge commit '869cc685b171c5c0c1efbad5df693cfaebe0af43'
* commit '869cc685b171c5c0c1efbad5df693cfaebe0af43':
fix insmod reading more than one module parameter
Merge commit '84a60712ddf32fb98793e38ea8dd9703ae1290e2' into gingerbread-plus-aosp
* commit '84a60712ddf32fb98793e38ea8dd9703ae1290e2':
add meta-files about 3rd party projects
Invoking LOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF variadic macros
without the printf format string arg caused compilation errors because the
variable arg list (__VA_ARGS__) was eventually passed to
__android_log_assert() func in place of a required parameter. This error
only occured in debug builds because LOG_ASSERT() is a no-op in release
builds. This change allows debug builds to succeed.
Change-Id: I7e7b7de3e501133468ce083e0e0d6e699dd59667
Signed-off-by: Chris Pearson <christopherx.c.pearson@intel.com>
Merge commit '62a54f3b1343043528b7e93c1a4311a5e9d5f358'
* commit '62a54f3b1343043528b7e93c1a4311a5e9d5f358':
init: use tmpfs/ftruncate for properties backing store instead of ashmem
Merge commit 'beb72464ff8c501597cd7e098090f7d131dc5ccb'
* commit 'beb72464ff8c501597cd7e098090f7d131dc5ccb':
fastboot: make it so I can actually see the bootloader chatter
Merge commit '25b15be9120bcdaa0aba622c67ad2c835d9e91ca' into gingerbread-plus-aosp
* commit '25b15be9120bcdaa0aba622c67ad2c835d9e91ca':
init: use tmpfs/ftruncate for properties backing store instead of ashmem
Merge commit '63e5205cd2f693bbfa54411f2dd20354bd30ffd8' into gingerbread-plus-aosp
* commit '63e5205cd2f693bbfa54411f2dd20354bd30ffd8':
fastboot: make it so I can actually see the bootloader chatter
This removes the need for ashmem for early bringup and avoids an issue
with permissions enforcement.
Change-Id: I405b080660934d73048c79d614b6b2ebc43ab182
Signed-off-by: Brian Swetland <swetland@google.com>
libdiskconfig depends deeply on some Linux-specific things like
/usr/include/linux/fs.h which don't exist on other OSes. Disable
building the host library for those platforms.
Change-Id: Ibccdfaa65be788f049ea3c1500f884c8d541e60b
Merge commit '0796f618775b34e14ff624bcfca828d55183b4c5'
* commit '0796f618775b34e14ff624bcfca828d55183b4c5':
DBUS is not fully implemented. Disable it for now
- prefix bootloader messages with (bootloader)
- remove the fancy right justified no newline business
Change-Id: Ica16ebe6a25971db423c5db06300a280d93faf3e
Signed-off-by: Brian Swetland <swetland@google.com>
Merge commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9'
* commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9':
Add a HAVE define for pthread_setname_np().
Merge commit '57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6' into gingerbread-plus-aosp
* commit '57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6':
Add a HAVE define for pthread_setname_np().
This is to allow using a thread that is capable of calling through JNI to Java code
to report USB device attached/removed events.
Change-Id: Ia58592607a2c1f4357b31072044f5db5617d7f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Due to conflicts with recent WebKit, we need to call it
HAVE_ANDROID_PTHREAD_SETNAME_NP.
https://review.source.android.com/#change,15227 has the original
change, which was reverted after the conflict was found.
Change-Id: I7111960a16505558338756dba91eb50cadb582ff
Include <stddef.h> to get definition of size_t. Remove inclusion
of <stdint.h>, which doesn't seem to be needed.
Change-Id: Ib7ff231b5ec4b8c672084801fbb294a50cb7c3d7
Merge commit 'a8c7404956b4370162a87ae09b851266a4933b54'
* commit 'a8c7404956b4370162a87ae09b851266a4933b54':
Set explicit timeout on USB control transfer
Merge commit '931bdcc09a3d805cf25033951adb95c8e5159e46' into gingerbread-plus-aosp
* commit '931bdcc09a3d805cf25033951adb95c8e5159e46':
Set explicit timeout on USB control transfer
