Christopher Ferris
ae998c7117
am 0298da56: am 492b0ca4: am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."
...
* commit '0298da56f410ba0f6a1f1f44deb8e2224f9fc49d':
Fix the ucontext for mips/x86.
2014-01-07 23:53:18 +00:00
Christopher Ferris
0298da56f4
am 492b0ca4: am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."
...
* commit '492b0ca4b127a217305b4adf6f26a627a288f6bf':
Fix the ucontext for mips/x86.
2014-01-07 22:52:32 +00:00
Christopher Ferris
492b0ca4b1
am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."
...
* commit '1e424d8ef54c4056416d19b54ef016304c957fe1':
Fix the ucontext for mips/x86.
2014-01-07 22:50:22 +00:00
Christopher Ferris
1e424d8ef5
am 0afaf7f4: Merge "Fix the ucontext for mips/x86."
...
* commit '0afaf7f4dde98ff554b69d05ed87ceab4ec611aa':
Fix the ucontext for mips/x86.
2014-01-07 14:47:55 -08:00
Christopher Ferris
0afaf7f4dd
Merge "Fix the ucontext for mips/x86."
2014-01-07 22:43:44 +00:00
Christopher Ferris
ddc4f093f7
Fix the ucontext for mips/x86.
...
Remove the mips ucontext definition, there is no need for it any more.
Fix the mips/x86 ucontext copy code to copy the entire uc_mcontext data
across.
Fix a potential memory leak too.
Change-Id: I4272022da5281ed881e2d59a3e19e7f33c01aceb
2014-01-07 14:36:03 -08:00
Elliott Hughes
b0e40722f4
am ea91fb97: am 1858c2a2: am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"
...
* commit 'ea91fb976ab842f3f41d9f3f25e988d70e51a77c':
Dwarf backtrace for MIPS
2014-01-07 20:16:27 +00:00
Elliott Hughes
ea91fb976a
am 1858c2a2: am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"
...
* commit '1858c2a2ebb9284dfbc3f2bcc52d9179d1d44a26':
Dwarf backtrace for MIPS
2014-01-07 20:14:53 +00:00
Elliott Hughes
1858c2a2eb
am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"
...
* commit 'ba5f5fdd774223b3a801626cde014637e0fb04ec':
Dwarf backtrace for MIPS
2014-01-07 20:12:32 +00:00
Elliott Hughes
ba5f5fdd77
am e21d03ce: Merge "Dwarf backtrace for MIPS"
...
* commit 'e21d03ce3722582980be2c84ffbc6b6ccf55e258':
Dwarf backtrace for MIPS
2014-01-07 12:09:55 -08:00
Elliott Hughes
e21d03ce37
Merge "Dwarf backtrace for MIPS"
2014-01-07 20:04:58 +00:00
Colin Cross
1241d5b9d2
am b1b187f7: am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* commit 'b1b187f7c870a5267ef9d7a4476e281cd6ccffc7':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 20:56:50 +00:00
Todd Poynor
d3ade367c1
am 7eea6200: am 950909c3: init.rc: start lmkd
...
* commit '7eea6200cbb7a90b056cd7c2d0d84815c2fe0458':
init.rc: start lmkd
2014-01-06 20:56:49 +00:00
Todd Poynor
01c6a06f09
Merge commit '85679224' into manualmerge
2014-01-06 12:41:38 -08:00
Colin Cross
b1b187f7c8
am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* commit '748ab31ffbe3268249a8ef3dadbf6a79bd8df389':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 20:29:07 +00:00
Todd Poynor
7eea6200cb
am 950909c3: init.rc: start lmkd
...
* commit '950909c301e316783e5b4687dbc422ed845cb69a':
init.rc: start lmkd
2014-01-06 20:29:06 +00:00
Todd Poynor
85679224ae
am 58d58072: Add lmkd low memory killer daemon
...
* commit '58d58072894521874df8c90c0084fd50cf16b7fc':
Add lmkd low memory killer daemon
2014-01-06 20:29:06 +00:00
Colin Cross
748ab31ffb
am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* commit 'd8f74f1b3e40d64fafcd327066428235f0312c47':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 20:26:16 +00:00
Colin Cross
d8f74f1b3e
am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* commit '491ecd0b7275a98b7fda9b1e807724f7f06b1469':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 12:23:30 -08:00
Colin Cross
491ecd0b72
Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* changes:
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 20:18:34 +00:00
DanielMo
c1b6b153dc
adb: Add USB vendor ID for YotaDevices
...
Change-Id: Id8bec8a35edd0d21ae52e8469f7a65b5f4433bc2
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:40 -08:00
DanielMo
402c2b9888
adb: Add USB vendor ID for TechFaith
...
Change-Id: Ied42e4d011b736ee990ed75e7d81bc6a16db47f9
2014-01-06 12:16:40 -08:00
DanielMo
d0057c006b
adb: Add USB vendor ID for Rockchip
...
Change-Id: Iea3f7cc6ed463684fe30a73c39445b3ca36854d9
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
fdd189c64e
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
...
Change-Id: Ic7f7c984db19050d2ce4da8ae87683ce42dc9094
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
63f0f5117b
adb: Add USB vendor ID for Allwinner
...
Change-Id: Ic77d5f71c9e329e33cd31fa0854e692ad794a609
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
d5dab6d5f8
adb: Add USB vendor ID for Amlogic
...
Change-Id: I35fad82214f2b5a82b0150821326aaea15784de1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
Volker Moesker
319d8c1d1f
added Gigaset's USB vendor ID
...
Change-Id: Iebb0f352eec4530ee1e972527fc76bbb9dad5cc3
Signed-off-by: Volker Moesker <volker.moesker@gigaset.com>
2014-01-06 12:16:29 -08:00
Colin Cross
293717c364
adb: alphabetically sort usb vendors lists
...
Sort the lists of usb vendor ids alphabetically to reduce future
conflicts.
Change-Id: I682c18a1d97adf3a4aa9c00de9fed932c83e4646
2014-01-06 12:12:39 -08:00
Colin Cross
3c37fae4a4
liblog: fix build again
...
log_read.c has to be in the target sources on all platforms, but
never needs to be in the host sources.
Change-Id: Ie0829f3f1daf16d151c401653dbef603b1c2f59d
2014-01-03 18:58:56 -08:00
Mark Salyzyn
c96a44888a
liblog: drop use of sys/cdefs.h
...
Change-Id: I44ea5d6b572e3712c301e6ebf4b34e6225d7e18b
2014-01-03 17:40:20 -08:00
Mark Salyzyn
105a83e854
Merge "Revert "liblog: Add liblog test suite""
2014-01-04 01:01:33 +00:00
Mark Salyzyn
20727babc7
Revert "liblog: Add liblog test suite"
...
This reverts commit 46abc52296
.
Change-Id: Iced83fdfa7de061c0495920ea28a9468023706d3
2014-01-04 00:41:16 +00:00
Mark Salyzyn
5feea68908
liblog: git_master@964770 build problem
...
- darwin does not get log reader
Change-Id: I64eb69a6099a88d2acf501de725c35741fd7e551
2014-01-03 16:32:42 -08:00
Todd Poynor
950909c301
init.rc: start lmkd
...
Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
2014-01-04 00:29:10 +00:00
Todd Poynor
58d5807289
Add lmkd low memory killer daemon
...
Move kernel low memory killer logic to new daemon lmkd. ActivityManager
communicates with this daemon over a named socket.
Change-Id: Ie957da7e9b1f7150e23c689fdadf23ff260b47be
(cherry picked from commit 3948f80f2a
)
2014-01-04 00:01:38 +00:00
Mark Salyzyn
7cc2336316
Merge changes Ia6d6821e,I1e1a55d1,Ic26e9dba,Iedc55c13
...
* changes:
liblog: Add liblog test suite
logcat: Incorporate liblog reading API
debuggerd: Incorporate liblog reading API
liblog: Interface to support abstracting log read
2014-01-03 22:49:35 +00:00
Rom Lemarchand
e3f0c079b3
am 79b6b7f0: am 1892fe66: am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"
...
* commit '79b6b7f0fdb14fcd8c336ed8f1c0a5b481bb8697':
move sync headers from include to libsync
2014-01-03 21:42:21 +00:00
Rom Lemarchand
79b6b7f0fd
am 1892fe66: am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"
...
* commit '1892fe66ea4df6d4b6ea7fe3849295f79adcfbf2':
move sync headers from include to libsync
2014-01-03 21:39:31 +00:00
Rom Lemarchand
1892fe66ea
am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"
...
* commit 'c8d7d2d6b99f405ea3fcada0d2407baee23873f6':
move sync headers from include to libsync
2014-01-03 21:35:54 +00:00
Rom Lemarchand
c8d7d2d6b9
am 5234147c: Merge "move sync headers from include to libsync"
...
* commit '5234147c1e5cade7ecf98c12c8a7d7de6cd429ed':
move sync headers from include to libsync
2014-01-03 13:33:07 -08:00
Rom Lemarchand
5234147c1e
Merge "move sync headers from include to libsync"
2014-01-03 21:27:46 +00:00
Rom Lemarchand
ddc20de148
move sync headers from include to libsync
...
Make sw_sync.h private
Change-Id: I0b120ebe81fd4a191b7aa4b6a8de4f64d16e2b3e
2014-01-03 21:27:05 +00:00
Elliott Hughes
398e6353cc
am 60298601: am 687ec9b5: am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."
...
* commit '60298601c5cabb1a9985733dd0cc3845cc3da581':
Fix a sporadic build breakage.
2014-01-03 21:19:15 +00:00
Elliott Hughes
60298601c5
am 687ec9b5: am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."
...
* commit '687ec9b5e143aa92de008efcaa7b5750eeab87ef':
Fix a sporadic build breakage.
2014-01-03 21:16:45 +00:00
Elliott Hughes
687ec9b5e1
am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."
...
* commit 'a166bea18ffd304163bddec4701904d91541f527':
Fix a sporadic build breakage.
2014-01-03 21:14:46 +00:00
Elliott Hughes
a166bea18f
am f5447b0e: Merge "Fix a sporadic build breakage."
...
* commit 'f5447b0eb9cd2157f4935477f05d4c92dcda37c8':
Fix a sporadic build breakage.
2014-01-03 13:12:12 -08:00
Elliott Hughes
f5447b0eb9
Merge "Fix a sporadic build breakage."
2014-01-03 21:08:01 +00:00
Colin Cross
0d123f21e1
am 2bd34772: am 42fb1783: am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"
...
* commit '2bd34772340174e844bd4ff1f3e2096d5a7e2cf8':
Modify BYD's USB Vendor ID
2014-01-03 21:06:41 +00:00
Colin Cross
2bd3477234
am 42fb1783: am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"
...
* commit '42fb1783a67a46bd00f946002b6bbc7116d9bc78':
Modify BYD's USB Vendor ID
2014-01-03 21:03:31 +00:00
Colin Cross
42fb1783a6
am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"
...
* commit '4600d80cef73af052cbba25c7af0d7abfda6e08b':
Modify BYD's USB Vendor ID
2014-01-03 21:01:24 +00:00