Commit graph

1357 commits

Author SHA1 Message Date
Nick Kralevich
dd26bb3a00 Get rid of warnings when compiled with -Wformat-security
Change-Id: I2bfc6582a8198b22af08e4b8d58f532dc138cc02
2010-05-13 15:38:49 -07:00
The Android Open Source Project
0253ffdee4 am d00eba45: merge from open-source master
Merge commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba' into kraken

* commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba':
  Add a printf format.
2010-05-12 10:54:09 -07:00
The Android Open Source Project
d00eba4587 merge from open-source master
Change-Id: I8e7903bcd3fe7ddf88b63462dc9123f12b779c64
2010-05-12 09:32:54 -07:00
christian.bejram
28a8dab590 Add a printf format.
This makes sure that data sent through logwrapper
is interpreted as strings

Change-Id: Ifafa7c3a39433743250aeb76da3c4d9cce05a13f
2010-05-10 14:47:56 -07:00
Nick Kralevich
42d38127d2 Merge "Allow pixelflinger to work when NX (No Execute) is enabled." into kraken 2010-05-10 10:28:56 -07:00
Brad Fitzpatrick
b20e98511d am 25ffaff6: am 86b12152: fix windows SDK build
Merge commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d' into kraken

* commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d':
  fix windows SDK build
2010-05-10 09:49:48 -07:00
Brad Fitzpatrick
c279d3c542 am 218faa30: am e43c2483: More fixes to Binder perf regression from Eclair
Merge commit '218faa30d547e549c1efbf9bacf23cc56c8bf481' into kraken

* commit '218faa30d547e549c1efbf9bacf23cc56c8bf481':
  More fixes to Binder perf regression from Eclair
2010-05-10 09:49:46 -07:00
Brad Fitzpatrick
25ffaff6b1 am 86b12152: fix windows SDK build
Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into froyo-plus-aosp

* commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a':
  fix windows SDK build
2010-05-10 09:43:55 -07:00
Brad Fitzpatrick
218faa30d5 am e43c2483: More fixes to Binder perf regression from Eclair
Merge commit 'e43c248316d0faa7bdc23de823b068c2aa3520ab' into froyo-plus-aosp

* commit 'e43c248316d0faa7bdc23de823b068c2aa3520ab':
  More fixes to Binder perf regression from Eclair
2010-05-10 09:43:44 -07:00
Brad Fitzpatrick
86b121523d fix windows SDK build
Change-Id: I2c563b20197803cafa91214aeff2c06fc0c75580
2010-05-08 11:51:13 -07:00
Nick Kralevich
beeeee705b Allow pixelflinger to work when NX (No Execute) is enabled.
Instead of allocating memory from the (non executable) heap,
allocate memory using mspace and ensure that we use mprotect
to mark it as PROT_EXEC.  This allows pixelflinger to
continue to work even when NX protections are enabled.

Testing: Using the ApiDemos market app, verify that
Apidemos -> Graphics -> OpenGL ES -> GLSurfaceView
works when "adb shell setprop debug.egl.hw 0" is set.

Change-Id: Ib569cd2543c6fa25688ee76325a712bc2347450b
2010-05-07 16:35:52 -07:00
Brad Fitzpatrick
e43c248316 More fixes to Binder perf regression from Eclair
Re-use the file descriptor to change the cgroups.  There's a fast path
in the kernel for the case where the value's already uncahnged.  Also,
this is okay because the kernel ignores the write offset.  This is
essentially a ioctl-ish/datagram interface, despite being a fd we're
writing to.

This reduces Dalvik->Dalvik void/void Binder calls on Sapphire from
~1.2 to ~0.8 ms.  This is a bit slower than the ~0.7 ms we get
avoiding the write altogether.

strace confirms:

[pid  1557] ioctl(21, 0xc0186201 <unfinished ...>
[pid  1556] <... ioctl resumed> , 0x45399cd0) = 0
[pid  1556] write(22, "1556", 4)        = 4
[pid  1556] ioctl(21, 0xc0186201 <unfinished ...>
[pid  1555] <... ioctl resumed> , 0x45299cd0) = 0
[pid  1555] write(22, "1555", 4)        = 4
[pid  1555] ioctl(21, 0xc0186201 <unfinished ...>
[pid  1554] <... ioctl resumed> , 0x45199cd0) = 0
[pid  1554] write(22, "1554", 4)        = 4

BUG=2660235

Change-Id: Ia9f9e1d5b792eaebc9560f89931faf6df0cf9c0d
2010-05-07 15:57:44 -07:00
Dima Zavin
7f2ad58a6d adb: Add Qualcomm USB id
Change-Id: I044a77f14d7a90e9dff191919e4aeb39723ea429
Signed-off-by: Dima Zavin <dima@android.com>
2010-05-07 10:05:21 -07:00
Brad Fitzpatrick
4e226a5006 am ba9025ce: am 253e27ac: Optimize set_sched_policy(), which gets called in every binder call.
Merge commit 'ba9025ce958bf07f843c2301fa60b6a5499f20ca' into kraken

* commit 'ba9025ce958bf07f843c2301fa60b6a5499f20ca':
  Optimize set_sched_policy(), which gets called in every binder call.
2010-05-06 12:43:07 -07:00
Brad Fitzpatrick
ba9025ce95 am 253e27ac: Optimize set_sched_policy(), which gets called in every binder call.
Merge commit '253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad' into froyo-plus-aosp

* commit '253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad':
  Optimize set_sched_policy(), which gets called in every binder call.
2010-05-06 12:39:30 -07:00
Brad Fitzpatrick
253e27acb6 Optimize set_sched_policy(), which gets called in every binder call.
- use static /dev/cpuctl filenames, rather than sprintf() on the fly
- use a custom formatter instead of sprintf() for the tid number

This is a simplified version of Dan's original
Ifc9c81f74fe65f0695ead53b30194bc6adf00da0 to be less risky for Froyo.

Bug: 2660235
Change-Id: I744bbc2ec01fd2569612c814a497df40a933b622
2010-05-06 11:14:09 -07:00
Dan Bornstein
7a9f4c2690 am 83b97a6a: am 458f0633: For issue #2651381, allow library prelinking.
Merge commit '83b97a6a267a4ed9806191277289870156b2c372' into kraken

* commit '83b97a6a267a4ed9806191277289870156b2c372':
  For issue #2651381, allow library prelinking.
2010-05-05 17:51:53 -07:00
Dan Bornstein
83b97a6a26 am 458f0633: For issue #2651381, allow library prelinking.
Merge commit '458f06335a73438865bf633aeff399cbaedb71e1' into froyo-plus-aosp

* commit '458f06335a73438865bf633aeff399cbaedb71e1':
  For issue #2651381, allow library prelinking.
2010-05-05 17:50:07 -07:00
The Android Open Source Project
cc42a2d6f4 am 44bce0fb: merge from open-source master
Merge commit '44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3' into kraken

* commit '44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3':
  cpu-features.h is only available for ARM
2010-05-05 16:05:53 -07:00
The Android Open Source Project
44bce0fb57 merge from open-source master
Change-Id: Ic4cfffc3c8d465224b062cef7bcfe5827441057c
2010-05-05 16:03:52 -07:00
Dan Bornstein
458f06335a For issue #2651381, allow library prelinking.
Change-Id: I4933c968b84eaca2441c76c4b5a29de48fa093ef
2010-05-05 09:39:27 -07:00
Bruce Beare
2bef93cc20 cpu-features.h is only available for ARM
Change-Id: I1e8001a1875bfd9cebfe18dfd757556b55c8213c
2010-05-04 15:35:09 -07:00
The Android Open Source Project
3b9255e3f5 am e57d8918: merge from open-source master
Merge commit 'e57d89186def9dfabe39cec7a91397079514dc2a' into kraken

* commit 'e57d89186def9dfabe39cec7a91397079514dc2a':
  fix sim build
  Fix LDM addressing mode disassembly
  Add documentation for some adb environmental variables.
  NEON shortcut for flat colour blending into 16-bit
  Adds UXTB16 support to Pixelflinger
2010-05-03 16:33:47 -07:00
The Android Open Source Project
e57d89186d merge from open-source master
Change-Id: Ibc1c58aa757910f2b00acf6883127dd027f01d73
2010-05-03 16:32:46 -07:00
Jean-Baptiste Queru
9b6c850d24 fix sim build
Change-Id: Ide300eafbcbbc6dfae25fe86188302c6676c4a3b
2010-05-03 12:31:13 -07:00
Martyn Capewell
f42d2fac2b Fix LDM addressing mode disassembly
The Pixelflinger disassembler does not handle LDM addressing modes correctly,
assuming that the P and U bits in the instruction mean the same in both LDM and
STM. This results in the disassembler producing sequences like:

  stmfd r13!, {r4-r11, r14}
  ...
  ...
  ...
  ldmea r13!, {r4-r11, r14}

This small patch fixes it by EORing the P and U bits with the Load/Store bit.

Change-Id: Ic7a1556642c4e29415fc3697019f1239b6c26fc2
2010-04-29 09:13:48 -07:00
Jean-Baptiste Queru
86abd5fcab Merge "Adds UXTB16 support to Pixelflinger" 2010-04-29 09:11:37 -07:00
Jean-Baptiste Queru
8ecf93485f Merge "NEON shortcut for flat colour blending into 16-bit" 2010-04-29 08:47:51 -07:00
Tim
cd64315f72 Add documentation for some adb environmental variables.
The ADB_TRACE one is particularly important.

Change-Id: I125a5930c43065c8cf505eea40d20e3f209bc858
2010-04-29 07:41:50 -07:00
The Android Open Source Project
7e113e396d am 9a22c68e: merge from open-source master
Merge commit '9a22c68e8697a2ec86cd238a87a32ea42d7f8d39' into kraken

* commit '9a22c68e8697a2ec86cd238a87a32ea42d7f8d39':
  Fixing spelling errors in adb docs
  Make adb's daemon-port on the host machine configurable.
  adb: remove obsolete adb.connected system property.
  Add Pantech's USB vendor ID to adb.
  Added Kyocera's VID (0x0482), upon their request.
  adb: Add five second timeout for USB writes on Linux host.
  Add missing newlines to adb usage message
  adb: do not mix printf() with write() when writing to stdout.
  Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request.
  Added USB vendor id of Sharp, based on Sharp's request.
2010-04-28 13:01:23 -07:00
The Android Open Source Project
9a22c68e86 merge from open-source master
Change-Id: Id824d3427cb4808a8768f14e7b46c0eaf5e02e73
2010-04-28 12:58:12 -07:00
Brian Carlstrom
26bb6e92ba Fixing spelling errors in adb docs
Change-Id: I9376717165a01e207034f84a31f85335d3740f18
2010-04-28 11:38:39 -04:00
Stefan Hilzinger
a84a42eb20 Make adb's daemon-port on the host machine configurable.
This is the first CL of a somewhat larger effort which, among other things,
will involve changing the emulator and ddms to talk to adb running on a
configurable port.

The port can be configured using environment variable ANDROID_ADB_SERVER_PORT.

Further CLs will also address the set of ports used for the local transport.

Change-Id: Ib2f431801f0adcd9f2dd290a28005644a36a780a
2010-04-28 11:38:34 -04:00
Mike Lockwood
23e64161be adb: remove obsolete adb.connected system property.
This was used for adb networking, which no longer exists.
This code also failed when adb was not running as root.

Change-Id: Ied86fb1930094d5ae5009684d25e15385fd31d03
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-28 11:35:10 -04:00
Xavier Ducrohet
4f660699bf Add Pantech's USB vendor ID to adb.
Change-Id: I5334f46ee52ca1bd8067860701aef7b93296bedb
2010-04-28 11:34:01 -04:00
Takeshi Kishimoto
c22b9bf1a8 Added Kyocera's VID (0x0482), upon their request.
Change-Id: I8f2f2a02c22d618c0b42d4f287d88a98af3ac4fa
2010-04-28 11:33:49 -04:00
Mike Lockwood
505bd6e5fc adb: Add five second timeout for USB writes on Linux host.
This helps us recover when things go wrong during automated testing.

Change-Id: I006dbfaff7f70d51398ff12fbddcaee751453b78
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-28 11:33:13 -04:00
Brian Carlstrom
805c4a7030 Add missing newlines to adb usage message 2010-04-28 11:32:53 -04:00
Mike Lockwood
c519c00c36 adb: do not mix printf() with write() when writing to stdout.
Change-Id: I3598cc951778080bec9a21d646656d5aba57120a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-28 11:32:20 -04:00
Takeshi Kishimoto
16f1550b51 Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request. 2010-04-28 11:31:50 -04:00
Takeshi Kishimoto
17273091e9 Added USB vendor id of Sharp, based on Sharp's request.
Sharp's vendor id: 0x04dd
2010-04-28 11:31:37 -04:00
Nick Kralevich
88f29fefa8 fix build on darwin.
Change-Id: I655b92f0a09bc4bc1b2b277b24ca24c081b4da94
2010-04-26 17:00:14 -07:00
Nick Kralevich
8e274f3476 Merge "make libacc run with execute stack protections enabled." into kraken 2010-04-26 08:55:41 -07:00
Raphael
ecf835e291 am a00a69e0: am b419c35c: Fix adb, fastboot to compile in Windows SDK under Linux.
Merge commit 'a00a69e07d959f73495e42637fe1f493eb01193d' into kraken

* commit 'a00a69e07d959f73495e42637fe1f493eb01193d':
  Fix adb, fastboot to compile in Windows SDK under Linux.
2010-04-23 17:19:01 -07:00
Raphael
a00a69e07d am b419c35c: Fix adb, fastboot to compile in Windows SDK under Linux.
Merge commit 'b419c35c660d7421e18a9efef38eca11966b44c7' into froyo-plus-aosp

* commit 'b419c35c660d7421e18a9efef38eca11966b44c7':
  Fix adb, fastboot to compile in Windows SDK under Linux.
2010-04-23 17:14:45 -07:00
Raphael
b419c35c66 Fix adb, fastboot to compile in Windows SDK under Linux.
(Merged from master Change I3d0e4cab)

Change-Id: Ib3fd566bdaf09d5893a6b0c66168c76c6b0d92eb
2010-04-23 13:07:17 -07:00
Nick Kralevich
093ba25991 make libacc run with execute stack protections enabled.
libacc was allocating memory using malloc for executable pages.
When running on a system where the stack and heap are not
executable, using malloc for executable pages will result in
a segfault.

This change modifies libacc to allow the code to run, even
if the system is running with executable stack and heap disabled.

Change-Id: Ia74e3d83750c09b7eefd865ff059db920093040d
2010-04-23 09:53:09 -07:00
Colin Cross
33680b106d init: Use a relative symlink for ueventd to init
make doesn't seem to handle the absolute symlink from
$OUT/root/sbin/ueventd to /init well - it follows the link during
dependency resolution, decides $OUT/root/sbin/ueventd doesn't exist
because /init doesn't exist, and relinks it every time.

Change-Id: I9ca1c14fe5fa80634f51ffc51a7c73146d29d42e
2010-04-22 13:34:16 -07:00
Colin Cross
ebd4613bfc init: Fix init spinning once init.rc is complete
When the init process ran out of actions to execute, cur_action was
NULL and action_queue_empty() was true, but cur_command was still
set.  This patch clears cur_command when a new action is retreived,
and only depends on cur_action and action_queue_empty() to determine
the poll timeout.

Change-Id: Iaa95063c8c267a5b1ada9f20363b99c433e61ac4
2010-04-22 11:52:23 -07:00
Colin Cross
ec35336102 Merge changes Iea53050d,Iea6c5601,I451ebc4f,I4f876571,I6b4c10f8,I298f575c,I459cfbfe,Id11bb7cd,I679059da into kraken
* changes:
  init: Add ueventd.rc parsing to ueventd
  init: Move uevent handling to an external ueventd process
  init: Split parser into generic parser and init parser
  init: Allow services to start before property triggers are up
  init: Add wait command and mount wait flag
  init: Move list and log handling to list.h and log.h
  init: reap exited child processes on signal_init
  init: create symlinks to block device nodes
  init: Handle commands in event queue loop
2010-04-21 21:17:54 -07:00