Commit graph

1827 commits

Author SHA1 Message Date
Brian Swetland
d06df51bcd resolved conflicts for merge of 3b5214a6 to master
Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
2010-09-19 04:35:19 -07:00
Brian Swetland
3b5214a67f am 02863b95: add /vendor support
Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp

* commit '02863b957cfbfc302d3136ed78c0cba86accacd8':
  add /vendor support
2010-09-19 03:49:43 -07:00
Brian Swetland
02863b957c add /vendor support
- look in /vendor/firmware/... in addition to /system/etc/firmware/... for firmware loading
- add /vendor/bin to path before /system/bin
- add /vendor/lib to ldpath before /system/lib
- configure appropriate permissions for /system/vendor/bin
- symlink /vendor -> /system/vendor

Change-Id: I0c06ca1e38a44f0c7024cee6cea8907aa93a4532
2010-09-19 03:36:39 -07:00
Mathias Agopian
1f7bc6d1a9 am 06b21887: am 2da0032c: add graphics events to the eventlog definitions
Merge commit '06b21887e8f5719e9b421371b4a47ef371c972b5'

* commit '06b21887e8f5719e9b421371b4a47ef371c972b5':
  add graphics events to the eventlog definitions
2010-09-15 12:19:33 -07:00
Kenny Root
3000e4f9c4 am 1db75e7b: am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread
Merge commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860'

* commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860':
  Fetch peer credentials for local sockets
2010-09-15 12:17:44 -07:00
Brad Fitzpatrick
9a5c61a277 am 2c42e440: am 9915e3fd: Add dvm_lock_sample\'s new fields.
Merge commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987'

* commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987':
  Add dvm_lock_sample's new fields.
2010-09-15 12:17:19 -07:00
Brad Fitzpatrick
f254ddc761 am 0e6242f7: am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread
Merge commit '0e6242f7e2c1181d486ae8f86592619738574dd3'

* commit '0e6242f7e2c1181d486ae8f86592619738574dd3':
  Add missing lock in SocketListener.
2010-09-15 07:09:03 -07:00
Kenny Root
89b01a815e am c3fa6149: am f31d2ed1: Return false on socket read error
Merge commit 'c3fa6149284058b30e3eea5010c16d3133711afb'

* commit 'c3fa6149284058b30e3eea5010c16d3133711afb':
  Return false on socket read error
2010-09-15 07:08:42 -07:00
Mathias Agopian
06b21887e8 am 2da0032c: add graphics events to the eventlog definitions
Merge commit '2da0032c9447d0e259be31872e123559b5442d8f' into gingerbread-plus-aosp

* commit '2da0032c9447d0e259be31872e123559b5442d8f':
  add graphics events to the eventlog definitions
2010-09-14 15:14:00 -07:00
Mathias Agopian
2da0032c94 add graphics events to the eventlog definitions
by default this logging is turned off

Change-Id: Ic7e5fe2b377c4760e1673e7d19a69d34cc9333c9
2010-09-14 15:11:07 -07:00
Kenny Root
1db75e7b9b am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread
Merge commit '6fd75635d820754295557c300ccee89c643864cc' into gingerbread-plus-aosp

* commit '6fd75635d820754295557c300ccee89c643864cc':
  Fetch peer credentials for local sockets
2010-09-14 14:39:18 -07:00
Kenny Root
6fd75635d8 Merge "Fetch peer credentials for local sockets" into gingerbread 2010-09-14 14:37:08 -07:00
Kenny Root
30abb7234d Fetch peer credentials for local sockets
Fetch the PID, UID, and GID of the remote side of a local socket
connection in case any users of this library class want to check it.

Change-Id: Ia3230e6bc68ab6f93160df9f5996d2bf744b872c
2010-09-14 14:35:10 -07:00
Brad Fitzpatrick
2c42e4404b am 9915e3fd: Add dvm_lock_sample\'s new fields.
Merge commit '9915e3fd389519764436ad029ef2f172eb1cc0ca' into gingerbread-plus-aosp

* commit '9915e3fd389519764436ad029ef2f172eb1cc0ca':
  Add dvm_lock_sample's new fields.
2010-09-14 13:50:41 -07:00
Brad Fitzpatrick
9915e3fd38 Add dvm_lock_sample's new fields.
Change-Id: I2ec442834c38d3716695ab90bf0db220bd8dae27
2010-09-14 13:12:11 -07:00
Brad Fitzpatrick
0e6242f7e2 am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread
Merge commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6' into gingerbread-plus-aosp

* commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6':
  Add missing lock in SocketListener.
2010-09-14 10:46:35 -07:00
Brad Fitzpatrick
40c2b7cbed Merge "Add missing lock in SocketListener." into gingerbread 2010-09-14 10:44:15 -07:00
Kenny Root
c3fa614928 am f31d2ed1: Return false on socket read error
Merge commit 'f31d2ed1fd3a39a92bccc12eb66728594290ef3b' into gingerbread-plus-aosp

* commit 'f31d2ed1fd3a39a92bccc12eb66728594290ef3b':
  Return false on socket read error
2010-09-14 10:24:26 -07:00
Brad Fitzpatrick
86d01dec4b Add missing lock in SocketListener.
Change-Id: I3d97a06381fce67ef13b1ccdeaa4e8e2830ab2aa
2010-09-14 10:22:14 -07:00
Kenny Root
f31d2ed1fd Return false on socket read error
FrameworkListener was returning the errno from a function marked as
returning bool which caused an implicit conversion to true since we were
in an error block where errno was set to something non-zero.

This caused the clients that had errors to stick around forever and not
get removed from the set of file descriptors that SocketListener was
listening to.

Change-Id: Ia27a4cac47459f3a3c2bb6a7f66803a3165c894a
2010-09-14 09:55:22 -07:00
Brian Swetland
14200b4c3b am 5833769d: am 09dd3e57: make df more readable
Merge commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1'

* commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1':
  make df more readable
2010-09-11 18:42:53 -07:00
Brian Swetland
5833769d9a am 09dd3e57: make df more readable
Merge commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46' into gingerbread-plus-aosp

* commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46':
  make df more readable
2010-09-11 18:34:21 -07:00
Brian Swetland
09dd3e57b9 make df more readable
Filesystem             Size   Used   Free   Blksize
/dev                   164M    32K   164M   4096
/system                442M   117M   325M   4096
/cache                 492M     8M   483M   4096
/data                  984M    59M   925M   4096
/mnt/sdcard             12G    27M    12G   32768

Change-Id: I9a84b7b84ae528ee5cf0b1e92a8bee032b87703b
2010-09-11 18:19:35 -07:00
Jean-Baptiste Queru
0dd00036d2 am 1d10577e: manual merge from readonly-korg-master
Merge commit '1d10577e9b474a5099d0f5a09468c55a0324d876'

* commit '1d10577e9b474a5099d0f5a09468c55a0324d876':
  Don't alias 'stop' to 'kill -STOP'
2010-09-10 11:30:36 -07:00
Jean-Baptiste Queru
a5220b24d1 am 26ce6e0e: manual merge from readonly-korg-master
Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1'

* commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1':
  - Add drm and drmio service
2010-09-10 11:30:33 -07:00
Jean-Baptiste Queru
1d10577e9b manual merge from readonly-korg-master
Change-Id: Id4a09fa11fee4262d9b945369b595644cca6d330
2010-09-10 10:43:44 -07:00
Jean-Baptiste Queru
26ce6e0e16 manual merge from readonly-korg-master
Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
2010-09-10 10:43:36 -07:00
Jeff Hamilton
f41986bbc7 Don't alias 'stop' to 'kill -STOP'
Android has already has a stop command used
to stop the main runtime and the alias
interferes with testing tools that expect
stop to kill the runtime.

Change-Id: I02b7efb9203dc39e97f63eb702a54ff79935b316
2010-09-10 11:16:14 -05:00
Jean-Baptiste Queru
bb130ba799 Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM related data" 2010-09-09 14:13:01 -07:00
Brian Swetland
e6d8a5f1df am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread
Merge commit '8df3a4a554184afba71887995c5f0983ce81196f'

* commit '8df3a4a554184afba71887995c5f0983ce81196f':
  remount / as read-only only on post-fs to allow per-target config of /
2010-09-08 15:51:10 -07:00
Brian Swetland
8df3a4a554 am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread
Merge commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4' into gingerbread-plus-aosp

* commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4':
  remount / as read-only only on post-fs to allow per-target config of /
2010-09-08 15:08:16 -07:00
Brian Swetland
4012c0a46a Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread 2010-09-08 15:05:44 -07:00
Brian Swetland
56de7a1263 remount / as read-only only on post-fs to allow per-target config of /
Change-Id: Ia89dd2021e0f960201b4cee573227f0addd48431
2010-09-08 15:06:45 -07:00
Dan Bornstein
0159abaf08 am 1f43492e: am deb9188f: It seems that Windows actually does have a header for <stdbool.h>.
Merge commit '1f43492e48fb6630f3200a9b3887c76377f1850d'

* commit '1f43492e48fb6630f3200a9b3887c76377f1850d':
  It seems that Windows actually does have a header for <stdbool.h>.
2010-09-07 14:48:32 -07:00
Dan Bornstein
1f43492e48 am deb9188f: It seems that Windows actually does have a header for <stdbool.h>.
Merge commit 'deb9188f4f64d5d475ae28e0cc9eecc6c1f61312' into gingerbread-plus-aosp

* commit 'deb9188f4f64d5d475ae28e0cc9eecc6c1f61312':
  It seems that Windows actually does have a header for <stdbool.h>.
2010-09-07 13:15:51 -07:00
Colin Cross
3eaa4e52d3 am 49b8124a: am 17dcc5c5: Use makedev helper for device major and minor numbers
Merge commit '49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19'

* commit '49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19':
  Use makedev helper for device major and minor numbers
2010-09-03 14:13:05 -07:00
Colin Cross
49b8124a17 am 17dcc5c5: Use makedev helper for device major and minor numbers
Merge commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874' into gingerbread-plus-aosp

* commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874':
  Use makedev helper for device major and minor numbers
2010-09-03 13:29:54 -07:00
Colin Cross
17dcc5c57d Use makedev helper for device major and minor numbers
Major and minor numbers can be greater than 255.  Major numbers
are 12 bits, and minor numbers are 20 bits.  Supporting major
and minor numbers > 255 allows the use of the extended block
device for extra mmc partitions.

Change-Id: I4c42bfe0781069e8e4cb13ebe26e860cdc03f866
2010-09-03 12:27:01 -07:00
Jason Sams
14b91a829a Merge "Remove ACC which has been replaced with llvm. Free up space in build." 2010-09-03 11:48:52 -07:00
Dan Bornstein
dad578642b am 556f09c4: am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.
Merge commit '556f09c426084b62c34742ee0810fc97ae37abf7'

* commit '556f09c426084b62c34742ee0810fc97ae37abf7':
  It seems that Windows actually does have a header for <stdbool.h>.
2010-09-01 17:19:17 -07:00
Dan Bornstein
deb9188f4f It seems that Windows actually does have a header for <stdbool.h>.
Change-Id: I25d7846c066135f0af1fef2995bcb86397b23226
2010-09-01 17:03:43 -07:00
Dan Bornstein
556f09c426 am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.
Merge commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c' into gingerbread-plus-aosp

* commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c':
  It seems that Windows actually does have a header for <stdbool.h>.
2010-09-01 16:51:24 -07:00
Dan Bornstein
f74af26d18 It seems that Windows actually does have a header for <stdbool.h>.
Change-Id: I443929d07972389a8c9837926a4b7df37bd6a16a
2010-09-01 16:21:09 -07:00
Jason Sams
54adc5e8a1 Remove ACC which has been replaced with llvm.
Free up space in build.

Change-Id: Ic5cc48bacca47b45809b9bc649ae5b629b7427ed
2010-09-01 12:33:06 -07:00
Nick Kralevich
c34f195149 am 095a6a6e: am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
Merge commit '095a6a6ecb8039067c077db381bd02abc2496422'

* commit '095a6a6ecb8039067c077db381bd02abc2496422':
  get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
2010-08-31 17:50:15 -07:00
Nick Kralevich
095a6a6ecb am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
Merge commit '739cd9d2d4718913889a15d95c840506a2af04d1' into gingerbread-plus-aosp

* commit '739cd9d2d4718913889a15d95c840506a2af04d1':
  get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
2010-08-31 17:47:49 -07:00
Nick Kralevich
739cd9d2d4 Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread 2010-08-31 17:45:04 -07:00
Nick Kralevich
4688ac5b73 get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
Change-Id: If365bd88f735d425f37d61bcd5a6903f99f6a454
2010-08-31 09:44:43 -07:00
Dmitry Shmidt
4358544a3f toolbox: top: Add processor field
Change-Id: I9f8e45a963a0773f27ddcd1d249aecac1ab9152e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-08-30 16:39:14 -07:00
Nick Kralevich
cb020611f9 am c1858e5c: (-s ours) am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a from master branch
Merge commit 'c1858e5cefbd643737e978cbbca3f264d04d2d1b'

* commit 'c1858e5cefbd643737e978cbbca3f264d04d2d1b':
  do not merge: cherry-picked 44db990d3a from master branch
2010-08-30 14:37:03 -07:00