Riley Andrews
24912dc446
resolved conflicts for merge of fa6f2543 to master
...
Change-Id: I04ce82e5d245e90e2cc62b76d688ec902c1a471d
2014-06-26 20:49:46 -07:00
Riley Andrews
fa6f25432b
am 23340d8a: am 10f8cd1d: Merge changes Ia15b2110,I5498c725
...
* commit '23340d8adac7bf68a6e47064ab7b48c1e227a077':
Add ability to adjust init log level at runtime.
Improve init's debug printing.
2014-06-27 03:42:33 +00:00
Daniel Rosenberg
f67d6bd3c0
Moved symlink back up.
...
Moving the vendor symlink down was causing issues with some devices.
Moved it back up, and adjusted mount to remove symlinks if necessary.
Change-Id: I77126d77cfbef32250012bea3960c99b55db4cbb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-06-26 22:07:37 +00:00
Riley Andrews
1bbef88e80
Add ability to adjust init log level at runtime.
...
+ Add a new property, sys.init_log_level, which can be set after init
bootstrap. This will control the level at which init does prints to klog.
Change-Id: Ia15b2110157b5e6b713785ece9b0fb94889be6c8
2014-06-26 15:05:20 -07:00
Daniel Rosenberg
f530c93c4a
Added support for vendor partition and image
...
Modified fastboot to flash vendor.img as well. Moved symlink
for /vendor to occur after mounting partitions. Changed mount
to also create the mount point.
Change-Id: I78e1ba24e6bb8b4af96a67ee0569af579439e682
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-06-24 21:51:31 +00:00
Riley Andrews
6bd4588d65
resolved conflicts for merge of 079c637f to master
...
Change-Id: Iab9a857026de954d7497d6b0eaf3751d2d3904c7
2014-06-23 15:20:51 -07:00
Riley Andrews
079c637f3d
am 5b45e08a: am 7950fc47: Merge "Add ability to boot from charger mode."
...
* commit '5b45e08aabd6dcbab527d221584fe348c73c70d4':
Add ability to boot from charger mode.
2014-06-23 21:40:54 +00:00
Riley Andrews
e4b7b294f3
Add ability to boot from charger mode.
...
Add the ability to boot up directly from charger mode, instead of forcing
charger mode to initiate a full restart to launch 'full' android. This
should shave a few seconds off of boot time on supported devices (just
manta for now).
Change-Id: Ieec4494d929e92806e039f834d78b9002afd15c4
2014-06-20 16:43:00 -07:00
Riley Andrews
aab0d57d18
am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"
...
* commit '94fa20058fbd0e4f7e3c6d1381cdb9718dd90cde':
Make indentation sane in init.rc
2014-06-20 01:35:47 +00:00
Riley Andrews
6dfdc7cd0c
Make indentation sane in init.rc
...
Change-Id: Ic632fbe1423eeef7ec958877d74db7b87fc385c6
2014-06-19 17:13:30 -07:00
Riley Andrews
53f24c2f94
am aab0d57d: am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"
...
* commit 'aab0d57d18b202d059fec57c832d6443faff6ee3':
Make indentation sane in init.rc
2014-06-20 01:39:27 +00:00
Ying Wang
fd9cfb4c22
am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
...
* commit '68d97430dd2cc25bb753df748d859415520a7dcb':
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 23:03:48 +00:00
Ying Wang
2359b3c162
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
...
(cherry picked from commit 7011a85606 )
Change-Id: I025fe1f64c87fd406b3a3bf3d20fd3b78be8a940
2014-06-18 15:43:29 -07:00
Ying Wang
7011a85606
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
...
Change-Id: I4686c1239aa5ed361c918ce4e7a5abf9a1552ab4
2014-06-14 09:11:58 -07:00
Nick Kralevich
8ffe8eac5b
am f8cb68e1: am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"
...
* commit 'f8cb68e15ba242200e3525fffa2f969960e18a50':
Create /data/dalvik-cache/profiles
2014-06-12 23:17:38 +00:00
Nick Kralevich
f8cb68e15b
am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"
...
* commit '3bff77a8f90e673dbf41d97b7b842a3e4a6986bf':
Create /data/dalvik-cache/profiles
2014-06-12 23:12:45 +00:00
Nick Kralevich
511998fcdb
am 44aadc4d: am 1eebf538: am 59d16c9e: Merge "make console shell run as GID=shell"
...
* commit '44aadc4daf926155bf06bcf9d8f2daa96f861cdf':
make console shell run as GID=shell
2014-06-12 19:46:43 +00:00
Nick Kralevich
44aadc4daf
am 1eebf538: am 59d16c9e: Merge "make console shell run as GID=shell"
...
* commit '1eebf538d3e5465bbec84d86017bb9ca250a052b':
make console shell run as GID=shell
2014-06-12 19:43:07 +00:00
Nick Kralevich
f2cb352412
make console shell run as GID=shell
...
Change-Id: I240bec07b04de1b26eef14e4f590af56c1aaa276
2014-06-12 12:33:21 -07:00
Nick Kralevich
875dc8f3f3
Merge "Create /data/dalvik-cache/profiles"
2014-06-10 21:55:12 +00:00
Nick Kralevich
347ee511e4
Create /data/dalvik-cache/profiles
...
Make sure /data/dalvik-cache/profiles gets the correct
permissions and SELinux context, and ownership is properly
assigned to the system UID.
Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
2014-06-11 18:32:57 -07:00
Robin Lee
a54b7ca156
am b7c07da2: am 33154817: am 46fbaf06: Merge "Create world-searchable /data/misc/user directory"
...
* commit 'b7c07da2f4606ca36b93c2b9221e43e6ebe68831':
Create world-searchable /data/misc/user directory
2014-06-05 17:30:13 +00:00
Robin Lee
b7c07da2f4
am 33154817: am 46fbaf06: Merge "Create world-searchable /data/misc/user directory"
...
* commit '33154817e274a4c7c381e2f5ef73ead7093e3985':
Create world-searchable /data/misc/user directory
2014-06-05 17:26:31 +00:00
Robin Lee
46fbaf062f
Merge "Create world-searchable /data/misc/user directory"
2014-06-05 17:07:43 +00:00
Dave Allison
664bdde0f1
am 01546ff2: am dec41a38: am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit '01546ff208cec5ac15f81cc84f507fb8c9a51d98':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 21:10:00 +00:00
Dave Allison
01546ff208
am dec41a38: am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit 'dec41a388d58ae515c83df4ec084c1e38edb427a':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 21:06:24 +00:00
Dave Allison
dec41a388d
am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit '967729b7ca675d6f2c895a1bd56216a62b217e50':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 19:57:50 +00:00
Dave Allison
967729b7ca
Merge "Add LD_PRELOAD for libsigchain.so to the environment"
2014-05-29 19:51:42 +00:00
Nick Kralevich
e7fd4078a2
am 7206eccb: am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"
...
* commit '7206eccbd904508a199c7ec302d7395b3b674968':
Remove dmesg_restrict
2014-05-28 18:02:27 +00:00
Torne (Richard Coles)
f9ff246dd7
am 4f3ad823: am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit '4f3ad823eaf97fcbcbb1afac67371aff76677b1d':
Add UID and directory for RELRO sharing support.
2014-05-28 18:02:24 +00:00
Nick Kralevich
7206eccbd9
am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"
...
* commit 'c4ffa5f62ef256ff286122d0ceea61364aa67e13':
Remove dmesg_restrict
2014-05-28 13:14:54 +00:00
Nick Kralevich
c4ffa5f62e
am c290bed0: Merge "Remove dmesg_restrict"
...
* commit 'c290bed0350cded5620ed8dbb68b1cfb07d9828c':
Remove dmesg_restrict
2014-05-28 13:11:38 +00:00
Nick Kralevich
c290bed035
Merge "Remove dmesg_restrict"
2014-05-28 13:09:34 +00:00
Torne (Richard Coles)
4f3ad823ea
am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit 'a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9':
Add UID and directory for RELRO sharing support.
2014-05-28 10:20:55 +00:00
Torne (Richard Coles)
a8329a36ca
am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
Add UID and directory for RELRO sharing support.
2014-05-28 10:17:44 +00:00
Nick Kralevich
1a6184baf3
Remove dmesg_restrict
...
dmesg_restrict is too coarse of a control. In Android's case,
we want to allow the shell user to see dmesg output, but disallow
others from seeing it.
Rather than rely on dmesg_restrict, use SELinux to control access
to dmesg instead. See corresponding change in external/sepolicy .
Bug: 10020939
Change-Id: I9d4bbbd41cb02b707cdfee79f826a39c1ec2f177
2014-05-27 16:51:11 -07:00
Torne (Richard Coles)
234f696ea7
Add UID and directory for RELRO sharing support.
...
Define a UID to be used by the process responsible for creating shared
RELRO files for the WebView native library, and create a directory owned
by that UID to use to store the files.
Bug: 13005501
Change-Id: I5bbb1e1035405e5534b2681f554fe16f74e3da1a
2014-05-27 14:00:29 +01:00
Narayan Kamath
ef386b3fb0
am b5d6c188: am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit 'b5d6c18859424d86339ce895a42084a9c08552fd':
Add a zygote 64/32 bit config.
2014-05-27 11:13:44 +00:00
Narayan Kamath
b5d6c18859
am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit '9196f5f2df7890100e8968983680e196e944bd05':
Add a zygote 64/32 bit config.
2014-05-27 11:10:11 +00:00
Narayan Kamath
9196f5f2df
am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit '5fe6fcc35d10c88dd55213dc5b2303ea73c1883b':
Add a zygote 64/32 bit config.
2014-05-27 11:04:38 +00:00
Jaewan Kim
373d9fa082
Support static IP config on Ethernet
...
Bug: 7606609
Bug: 8687763
Change-Id: I1d76b5783e8511a8e3f5d981e6b4b9fb4fbecdf4
2014-05-22 00:00:35 +00:00
Narayan Kamath
7cdbbcabda
Add a zygote 64/32 bit config.
...
64 bit zygote is the "primary" and the system server is run
as a 64 bit process.
Change-Id: Ie1c2b0809faa92937bc407dd66e7a606ebb4f8f3
2014-05-21 11:20:42 +01:00
Dave Allison
50b6a4b1b7
Add LD_PRELOAD for libsigchain.so to the environment
...
To remove the need to modify the bionic dynamic linker, add the
signal chaining library as a preload in the environment. This
will be picked up by the dynamic linker and will override
sigaction and sigprocmask to allow for signal chaining.
Change-Id: I6e2d0628b009bd01e0ed9aed0b311871b9c8363a
2014-05-15 20:35:11 -07:00
Narayan Kamath
8c56cebd44
am 08a15076: am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."
...
* commit '08a1507603d63f07cfce65ead701330e1fe89894':
Change app_process reference to app_process32.
2014-05-15 10:34:38 +00:00
Narayan Kamath
08a1507603
am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."
...
* commit 'a5f7aca82e63942e9449804fd11eb11aec710419':
Change app_process reference to app_process32.
2014-05-15 09:45:29 +00:00
Narayan Kamath
a5f7aca82e
am 75a8eeb1: Merge "Change app_process reference to app_process32."
...
* commit '75a8eeb1ecf9f748b1d53e5ff3a5e138a0cdbebd':
Change app_process reference to app_process32.
2014-05-15 09:41:36 +00:00
Narayan Kamath
75a8eeb1ec
Merge "Change app_process reference to app_process32."
2014-05-15 09:36:33 +00:00
Sreeram Ramachandran
066c9b5a00
am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
...
* commit '9743f09724162186fb280627c3c125a55534a219':
Introduce fwmarkd: a service to set the fwmark of sockets.
2014-05-14 19:51:37 +00:00
Sreeram Ramachandran
9743f09724
am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
...
* commit '09eaad793a8cec9196255d740ecb89a1426c0bf7':
Introduce fwmarkd: a service to set the fwmark of sockets.
2014-05-14 19:48:10 +00:00
Sreeram Ramachandran
e38d470714
Introduce fwmarkd: a service to set the fwmark of sockets.
...
(cherry picked from commit d5121e212c1f53b1cb6458ee83be892d94fdfef3)
Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
2014-05-14 11:12:42 -07:00