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
Colin Cross
4600d80cef
am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"
...
* commit 'e1095e1da12de9d6dc219f497f7c19d1c1f7a41b':
Modify BYD's USB Vendor ID
2014-01-03 12:58:31 -08:00
Colin Cross
e1095e1da1
Merge "Modify BYD's USB Vendor ID"
2014-01-03 20:53:22 +00:00
Nick Kralevich
dd82e96a33
am 4bacd1fb: am 4af0c74e: am 8be1ccff: am fcf3d207: Merge "adb: configure /system file permission with fs_config"
...
* commit '4bacd1fb6b278ce5efd1752d2c6fb363eef68add':
adb: configure /system file permission with fs_config
2014-01-03 19:11:42 +00:00
Nick Kralevich
4bacd1fb6b
am 4af0c74e: am 8be1ccff: am fcf3d207: Merge "adb: configure /system file permission with fs_config"
...
* commit '4af0c74e94fef611e8371bb0556de2a9023700ca':
adb: configure /system file permission with fs_config
2014-01-03 19:08:40 +00:00
Nick Kralevich
4af0c74e94
am 8be1ccff: am fcf3d207: Merge "adb: configure /system file permission with fs_config"
...
* commit '8be1ccff87cad2a71a4db2f3f827b428e0d26d81':
adb: configure /system file permission with fs_config
2014-01-03 19:05:58 +00:00
Nick Kralevich
8be1ccff87
am fcf3d207: Merge "adb: configure /system file permission with fs_config"
...
* commit 'fcf3d207c51f1e734137a08ae2fdb1bb37a50b87':
adb: configure /system file permission with fs_config
2014-01-03 11:04:02 -08:00
Nick Kralevich
fcf3d207c5
Merge "adb: configure /system file permission with fs_config"
2014-01-03 18:58:13 +00:00
Narayan Kamath
95986aae91
Fix a sporadic build breakage.
...
The issue here is that the makefile sets LOCAL_LDFLAGS
and asks for -llog without declaring a dependency on it.
This will cause build breakages if liblog hasn't already
been built yet.
Change-Id: Ia38761cda44a38b6c2a88902d6108cbe64a328ce
2014-01-03 15:40:37 +00:00
Narayan Kamath
4884402449
am f7a35ea4: am a0342af7: am 2264bd23: am 4958d85d: Merge "Change a debug log to a verbose log."
...
* commit 'f7a35ea46a8b574cf673faecfe176a9af86768e7':
Change a debug log to a verbose log.
2014-01-03 09:47:36 +00:00
Narayan Kamath
f7a35ea46a
am a0342af7: am 2264bd23: am 4958d85d: Merge "Change a debug log to a verbose log."
...
* commit 'a0342af79d3fe6cf35e1e241e3aa2d8dc230f864':
Change a debug log to a verbose log.
2014-01-03 09:45:33 +00:00
Narayan Kamath
a0342af79d
am 2264bd23: am 4958d85d: Merge "Change a debug log to a verbose log."
...
* commit '2264bd23a69874ac4f2de125c25b46485c5a544e':
Change a debug log to a verbose log.
2014-01-03 09:44:22 +00:00
Narayan Kamath
2264bd23a6
am 4958d85d: Merge "Change a debug log to a verbose log."
...
* commit '4958d85d23c03fdde6b3b44793aa2738caef9717':
Change a debug log to a verbose log.
2014-01-03 01:42:57 -08:00
Narayan Kamath
4958d85d23
Merge "Change a debug log to a verbose log."
2014-01-03 09:30:29 +00:00
Nick Kralevich
d09eee892f
am 05bfe7fb: am ceb1c5cd: am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"
...
* commit '05bfe7fb95540bae6a42a745fe3bcc1d39a67a7c':
toolbox-ls: re-introduce clobbered error message
2014-01-03 05:50:02 +00:00
Nick Kralevich
05bfe7fb95
am ceb1c5cd: am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"
...
* commit 'ceb1c5cdf0e484f7c2763b3c4ac1fe8b39a55be6':
toolbox-ls: re-introduce clobbered error message
2014-01-03 05:46:51 +00:00
Nick Kralevich
ceb1c5cdf0
am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"
...
* commit '49264407de7b033fb30cdf3fac8919d75b5ea206':
toolbox-ls: re-introduce clobbered error message
2014-01-03 05:43:59 +00:00
Nick Kralevich
49264407de
am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"
...
* commit '7139b0c7f8b3c86c866096cb8621a0d866af1614':
toolbox-ls: re-introduce clobbered error message
2014-01-02 21:18:04 -08:00
Nick Kralevich
7139b0c7f8
Merge "toolbox-ls: re-introduce clobbered error message"
2014-01-03 05:13:28 +00:00
Liang Cheng
20d33f4d99
adb: configure /system file permission with fs_config
...
adbd changes the permissions of files uploaded by copying
owner's permission to group and other. This causes kernel
load failure if any changes are made to kernel modules
followed by ``adb push'' or ``adb sync'' because file mode
644 would become 666.
The change uses fs_config to get the target mode of files.
In addition, the SELinux file label is set incorrectly
on synced files. Set the label properly.
Change-Id: I354db848f39adfbf189d7e8d3b028e8d763c772f
Signed-off-by: Liang Cheng <licheng@nvidia.com>
Bug: 12264775
2014-01-02 20:26:18 -08:00
William Roberts
ded3464a10
toolbox-ls: re-introduce clobbered error message
...
commit 403b1955
clobbered the error message on lstat()
calls.
Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
2014-01-03 02:52:34 +00:00
Elliott Hughes
d0dfd00270
am 3e30f6af: am 090928b1: am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."
...
* commit '3e30f6afa042f3bba4822dc5d1ef267ed4b9d722':
Switch ARM back to libcorkscrew temporarily.
2014-01-02 23:39:38 +00:00
Elliott Hughes
3e30f6afa0
am 090928b1: am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."
...
* commit '090928b11b02d4a724f90eca65346918c44b144c':
Switch ARM back to libcorkscrew temporarily.
2014-01-02 23:36:23 +00:00
Elliott Hughes
090928b11b
am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."
...
* commit 'a345b25371aa49ebaa4f3b36bb664ba4cf600e60':
Switch ARM back to libcorkscrew temporarily.
2014-01-02 23:33:33 +00:00
Elliott Hughes
a345b25371
am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."
...
* commit 'dfc48139c9afc8366184a1a7bc2f3762c0c82ea2':
Switch ARM back to libcorkscrew temporarily.
2014-01-02 15:31:13 -08:00
Elliott Hughes
dfc48139c9
Merge "Switch ARM back to libcorkscrew temporarily."
2014-01-02 23:26:51 +00:00
Elliott Hughes
3c67fe9039
Switch ARM back to libcorkscrew temporarily.
...
We're seeing major stack trace generation performance
regression and want to find out whether it's libunwind.
Bug: 12181612
Change-Id: I3866ea956859f5cbdfe4f1ee6f20a2b6d39962c4
2014-01-02 15:25:21 -08:00
Nick Kralevich
cb1f0147d7
am 88d040a3: am 3df76c0c: am 6bec36ec: am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."
...
* commit '88d040a32feac727a7e11658198c32d9cc563d8e':
Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
2014-01-02 21:08:36 +00:00
Nick Kralevich
88d040a32f
am 3df76c0c: am 6bec36ec: am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."
...
* commit '3df76c0c738e0205cf287dbdf6ebe3b75d765b87':
Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
2014-01-02 21:06:32 +00:00
Nick Kralevich
3df76c0c73
am 6bec36ec: am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."
...
* commit '6bec36ecc92af488f0193e03c386eaab409ca17c':
Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
2014-01-02 21:04:21 +00:00
Nick Kralevich
6bec36ecc9
am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."
...
* commit '5b8abdf6278a4142736d918d1371d10c54c91db3':
Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
2014-01-02 13:03:03 -08:00
Nick Kralevich
5b8abdf627
Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."
2014-01-02 20:58:35 +00:00
Mark Salyzyn
46abc52296
liblog: Add liblog test suite
...
Change-Id: Ia6d6821e8546e0eccacab812d39d529ea0372c6a
2014-01-02 12:54:07 -08:00
Mark Salyzyn
a1062c728a
logcat: Incorporate liblog reading API
...
Change-Id: I1e1a55d13ac55350e8d54bfe92b392de07f26a5d
2014-01-02 12:54:06 -08:00
Mark Salyzyn
a63f927ce1
debuggerd: Incorporate liblog reading API
...
Change-Id: Ic26e9dba3b45c827d122b03e34cc4a5bd48f7deb
2014-01-02 12:54:06 -08:00
Mark Salyzyn
6c1b07fbbd
liblog: Interface to support abstracting log read
...
Change-Id: Iedc55c1316029b4bb72f51cc656b53b0e3f90aee
2014-01-02 12:53:53 -08:00
Narayan Kamath
a1ff801e5f
Change a debug log to a verbose log.
...
Unlike ALOGV, messages from ALOGD are logged on
all configurations. Not finding an entry in a zip
file is a "normal" occurrence so using an ALOGD
message for it amounts to spam.
Change-Id: I2c60d11e8a750be5106afd65c3c5e335f53f01b6
2014-01-02 19:41:00 +00:00
Colin Cross
dab375bcba
am 764daa33: am 21ff8257: am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"
...
* commit '764daa33c06b5fd699bf0c8162b18dd39b00795a':
ueventd: fix a busy loop while reading uevents
2013-12-30 18:08:59 +00:00
Colin Cross
764daa33c0
am 21ff8257: am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"
...
* commit '21ff8257c6ea4af11ab29553bad96ff3a87ba224':
ueventd: fix a busy loop while reading uevents
2013-12-28 20:19:21 +00:00
Colin Cross
21ff8257c6
am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"
...
* commit 'bb96da432b129cfa2a680910cda00b6c469caeee':
ueventd: fix a busy loop while reading uevents
2013-12-28 20:16:15 +00:00
Colin Cross
bb96da432b
am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"
...
* commit '268cc54089cbdeb0c2ea955448bb16a0858c4538':
ueventd: fix a busy loop while reading uevents
2013-12-28 12:13:22 -08:00
Colin Cross
268cc54089
Merge "ueventd: fix a busy loop while reading uevents"
2013-12-28 20:09:53 +00:00
Colin Cross
3dd470552c
am 469035b8: am fed48bb6: am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain."
...
* commit '469035b83546a847a1f12c1feca50a1c7e5e1062':
Run the console service shell in the shell domain.
2013-12-27 20:28:52 +00:00
Colin Cross
469035b835
am fed48bb6: am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain."
...
* commit 'fed48bb6de631402876f246d47d87ea1255e83d0':
Run the console service shell in the shell domain.
2013-12-27 20:26:20 +00:00
Colin Cross
fed48bb6de
am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain."
...
* commit '6604f2d1ef5e78e7f129f94abe7a763dd0e0dd1d':
Run the console service shell in the shell domain.
2013-12-27 20:23:09 +00:00
Colin Cross
6604f2d1ef
am 2dcc2759: Merge "Run the console service shell in the shell domain."
...
* commit '2dcc275936aefbb5badf3b4822d492260077144d':
Run the console service shell in the shell domain.
2013-12-27 12:21:24 -08:00
Colin Cross
2dcc275936
Merge "Run the console service shell in the shell domain."
2013-12-27 20:16:49 +00:00