Commit graph

58207 commits

Author SHA1 Message Date
Chung-yih Wang
8b0fb371c1 Merge branch 'readonly-p4-donut' into donut 2009-04-14 18:46:50 -07:00
Chung-yih Wang
98c297f244 AI 146260: Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10

Automated import of CL 146260
2009-04-14 18:45:32 -07:00
Mathias Agopian
61d8e487e6 Merge commit 'goog/master' into master_gl 2009-04-10 14:26:14 -07:00
Mathias Agopian
1d3faaf72f Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:31 -07:00
Andy McFadden
33d50dc785 Merge branch 'readonly-p4-master' 2009-04-08 19:26:45 -07:00
Andy McFadden
b33d3415b6 AI 145220: Added "-d" flag to ls.
Now you can "ls -l -d <directory>" to see directory perms.

Automated import of CL 145220
2009-04-08 19:25:35 -07:00
Dianne Hackborn
477b430700 Improvements to get events: -p, better output.
Add new -p option to easily get the output showing which events are reported by the devices.

Improve the reported events output a bit by including a name for each event type.

Extend help text to include a description of each options, so I don't have to look in the source code next time. :)
2009-04-08 15:43:31 -07:00
Wink Saville
83eb023a09 Merge branch 'readonly-p4-master' 2009-04-02 11:02:19 -07:00
Wink Saville
89efdc9c7f AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:57 -07:00
Wink Saville
7bdfb165ad AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:03 -07:00
The Android Open Source Project
455a6dffd4 Merge branch 'open_source' into google_internal 2009-03-29 08:55:26 -07:00
Nick Pelly
0b022b8942 AI 143248: am: CL 142809 am: CL 142808 Don't run hcid through logwrapper.
Original author: npelly
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143248
2009-03-27 15:39:15 -07:00
The Android Open Source Project
7be77b5ba8 Merge commit 'korg/cupcake' 2009-03-27 15:31:14 -07:00
Doug Kwan
e49f9c9238 Automated import from //branches/master/...@142981,142981 2009-03-26 14:14:15 -07:00
Nick Pelly
01161168aa Automated import from //branches/donutburger/...@142809,142809 2009-03-25 18:00:56 -07:00
Nick Pelly
8fbedcf73c Automated import from //branches/cupcake/...@142808,142808 2009-03-25 17:02:32 -07:00
Dianne Hackborn
f441e1e9c4 Automated import from //branches/donutburger/...@140818,140818 2009-03-24 18:36:55 -07:00
Dianne Hackborn
161b03c7ec Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:50 -07:00
The Android Open Source Project
3207e48071 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:09:00 -07:00
The Android Open Source Project
b1487e4c58 auto import //branches/master/...@140412 2009-03-18 22:20:28 -07:00
The Android Open Source Project
f614d64d4b auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:49 -07:00
Jean-Baptiste Queru
83b65486be Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	init/devices.c
	libpixelflinger/Android.mk
2009-03-18 09:29:29 -07:00
The Android Open Source Project
e037fd7e19 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:37 -07:00
The Android Open Source Project
2015549667 auto import from //branches/cupcake/...@137873 2009-03-11 12:12:01 -07:00
The Android Open Source Project
e4749f30e5 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:15 -07:00
The Android Open Source Project
dd7bc3319d auto import from //depot/cupcake/@135843 2009-03-03 19:32:55 -08:00
The Android Open Source Project
e54eebbf1a auto import from //depot/cupcake/@135843 2009-03-03 18:29:04 -08:00
The Android Open Source Project
a1e1c1b106 auto import from //depot/cupcake/@132589 2009-03-03 14:04:41 -08:00
The Android Open Source Project
c2d26a164f auto import from //depot/cupcake/@137055 2009-03-02 22:54:47 -08:00
The Android Open Source Project
3e292b9716 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:35 -08:00
The Android Open Source Project
261ed7551e auto import from //branches/cupcake/...@132276 2009-02-19 10:57:36 -08:00
The Android Open Source Project
1b8e5a6b14 auto import from //branches/cupcake/...@131421 2009-02-13 12:57:54 -08:00
The Android Open Source Project
13f797da7f auto import from //branches/cupcake/...@130745 2009-02-10 15:44:07 -08:00
The Android Open Source Project
4a4c9f6f98 Merge branch 'cupcake' 2009-01-22 00:16:17 -08:00
The Android Open Source Project
dcf3ce247e auto import from //branches/cupcake/...@127436 2009-01-22 00:13:45 -08:00
The Android Open Source Project
1b6345894e Merge branch 'cupcake' 2009-01-20 14:05:44 -08:00
The Android Open Source Project
8ac3a13816 auto import from //branches/cupcake/...@127101 2009-01-20 14:04:01 -08:00
android-build SharedAccount
439f6ca123 auto import from //branches/cupcake/...@126645 2009-01-15 16:22:10 -08:00
The Android Open Source Project
2eef60297a auto import from //branches/cupcake/...@126645 2009-01-15 16:12:14 -08:00
The Android Open Source Project
038862e152 Merge branch 'cupcake' 2009-01-09 18:04:23 -08:00
The Android Open Source Project
5ae090ed94 auto import from //branches/cupcake/...@125939 2009-01-09 17:51:25 -08:00
Brian Swetland
5a326952d7 fix TINY ANDROID build
A better fix would be to banish this qemu tracing stuff from libhardware
and also banish it from non-emulator builds, but this at least gets the
minimal build building again.
2008-12-23 22:29:27 -08:00
Jean-Baptiste Queru
77d0c65b95 Merge commit 'remotes/korg/cupcake'
Conflicts:
	init/devices.c
	logwrapper/logwrapper.c
	mountd/AutoMount.c
2008-12-19 08:15:15 -08:00
The Android Open Source Project
35237d1358 Code drop from //branches/cupcake/...@124589 2008-12-17 18:08:08 -08:00
Jean-Baptiste Queru
829dd45fe9 Build for ARMv4T
Modify a few files in the system to use the macros introduced in
<machine/cpu-features.h> in order to build for ARMv4T.
2008-12-04 12:11:15 -08:00
Ivan Djelic
165de92bf1 show error message when exec fails during service startup 2008-12-02 17:58:36 -08:00
Xiaopeng Yang
5bb44c8ea2 Create sound device nodes in /dev/snd/. 2008-12-02 17:54:51 -08:00
Android Code Review
7186a800c0 Merge 2008-12-03 00:56:26 +00:00
Android Code Review
2f688cf94d Merge 2008-11-26 21:14:16 +00:00
Jay Freeman (saurik)
e520d03616 Added support for loop@/path/to/filename to init's mount.
In keeping with the pattern of mtd@partition, I have added loop@path as a way to specify a loopback device. This way you can do things like mount directories in /system using cramfs from a file otherwise on /system (just one example oof how I'm using it). I specifically went with loop@ rather than adding this feature as a flag as the flags system is designed to set bits in the flags argument to mount: using loop@ fit the model in a much simpler manner and actually feels "correct".

This is a better version of the previously submitted 4045 that also refactors the mtd@ case. The reason for this is that I received comments that I should check for errors and return errors rather that do work in the case of success and fall through, but the mtd@ case wasn't doing that either and it became awkward to design the function so that it was half in one style of error handling and half in another. I also made certain to use inequality comparisons for Unix's -1 error returns rather than checking for -1, refactored my large if statement so as not to have danling parentheses, and disassocited the loop device on mount failure.
2008-11-20 18:38:36 +00:00