Commit graph

16603 commits

Author SHA1 Message Date
Nick Kralevich
7be1a5197f am 331f4d58: am cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file."
* commit '331f4d5863137e5fd5d59f9a407de2a7227a5c23':
  Restore generic_x86 sepolicy zygote.te file.
2014-06-17 13:50:14 +00:00
Nick Kralevich
331f4d5863 am cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file."
* commit 'cc7aebb8d30f01029f43be730c27c794b8f39aa6':
  Restore generic_x86 sepolicy zygote.te file.
2014-06-17 13:44:53 +00:00
Narayan Kamath
b60ccd6672 am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
  Make default 64-bit primary, 32-bit secondary
2014-06-17 10:05:13 +00:00
Narayan Kamath
ae65e2eb8d am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit 'd73ec26a19e82cefca45e3c80b37b015d423bda7':
  Make default 64-bit primary, 32-bit secondary
2014-06-17 09:56:18 +00:00
Nick Kralevich
cc7aebb8d3 Merge "Restore generic_x86 sepolicy zygote.te file." 2014-06-17 05:00:50 +00:00
Stephen Smalley
78eee96a72 Restore generic_x86 sepolicy zygote.te file.
I87d0976800557d73064e2da038315b0d019d7a60 removed zygote.te from
generic/sepolicy and generic/BoardConfig.mk but also incorrectly
removed it from generic_x86/BoardConfig.mk, even though
generic_x86/sepolicy/zygote.te still exists and contains rules
needed on the x86 emulator.  Otherwise the zygote fails with
execmem denials on the x86 emulator.

(x86 emulator is also broken currently due to yaffs2 /cache yielding
unlabeled denials, but that is unrelated to this change).

Change-Id: Ie36ed4ed7ba478a377f9a0d4383d006b49bde5cc
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-06-17 09:20:17 -04:00
Nick Kralevich
ad6107c3e9 Merge "Coalesce generic_x86 and generic sepolicy where possible." 2014-06-17 04:58:57 +00:00
Stephen Smalley
a49411f49b Coalesce generic_x86 and generic sepolicy where possible.
We originally forked a complete copy of generic/sepolicy into
generic_x86/sepolicy, but we can instead inherit from it and
merely add rules as needed under generic_x86/sepolicy.

Change-Id: I21e1a1425ce08676a8ea69685a4761db3bfde628
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-06-17 09:35:56 -04:00
Steve Moyer
97f49221ad Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master 2014-06-17 04:56:28 +00:00
Narayan Kamath
d73ec26a19 Merge "Make default 64-bit primary, 32-bit secondary" 2014-06-17 04:39:21 +00:00
Brian Carlstrom
d795046319 Make default 64-bit primary, 32-bit secondary
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
2014-06-16 23:59:43 -07:00
smain@google.com
5c1d21b458 am 95948b88: add script and style for toggling which IDE instructions to show.
* commit '95948b88ec17e5b0f5b9cdcc43b08989cec2a34a':
  add script and style for toggling which IDE instructions to show.
2014-06-17 03:24:12 +00:00
smain@google.com
95948b88ec add script and style for toggling which IDE instructions to show.
Change-Id: Ief094a4f58c7ebb4625948d6639fed713adcc0c7
2014-06-16 19:25:14 -07:00
Ying Wang
cc033aba81 am fe86a7c1: am a530bd40: Merge "Also include the binaries for the 2nd arch."
* commit 'fe86a7c1531ac85d634b7fde16ce008ca28118fb':
  Also include the binaries for the 2nd arch.
2014-06-16 23:53:39 +00:00
Ying Wang
d0052bc70a am e6b3692b: am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file"
* commit 'e6b3692b8357b52b0a67e12be450e1ccfda5ffb5':
  Explicit record the modules' built-file:installed-file
2014-06-16 23:53:38 +00:00
Ying Wang
696af13a67 am a307bbc7: am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file."
* commit 'a307bbc7dcc8ce533743ba829039de1f3f979beb':
  Put modules with install path to system/ to DATA/ in the zip file.
2014-06-16 23:53:37 +00:00
Ying Wang
fe86a7c153 am a530bd40: Merge "Also include the binaries for the 2nd arch."
* commit 'a530bd4025ddf5d37510fca9de62e2dec3f2d7cb':
  Also include the binaries for the 2nd arch.
2014-06-16 23:50:26 +00:00
Ying Wang
e6b3692b83 am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file"
* commit 'c17e0f92c570931ece4ae9c7ca27ecef5734113f':
  Explicit record the modules' built-file:installed-file
2014-06-16 23:50:25 +00:00
Ying Wang
a307bbc7dc am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file."
* commit 'fcb077ea018da08e02fa3791089f7760f4bf1869':
  Put modules with install path to system/ to DATA/ in the zip file.
2014-06-16 23:50:25 +00:00
dcashman
cac1fc6dd5 am 5bb6eeb9: am d9c312b5: Merge "Allow all domains access to /dev/qemu_trace."
* commit '5bb6eeb9de791086d9129c49aeabcff65df845da':
  Allow all domains access to /dev/qemu_trace.
2014-06-16 23:04:18 +00:00
dcashman
5bb6eeb9de am d9c312b5: Merge "Allow all domains access to /dev/qemu_trace."
* commit 'd9c312b51ae404f3c0a49997b5cb9ed6ad84df86':
  Allow all domains access to /dev/qemu_trace.
2014-06-16 22:59:28 +00:00
Elliott Hughes
53caaaf6f8 am 0f41ad79: am 1ffda9be: Merge "Remove unused hosts."
* commit '0f41ad79932bf7e69d3bfab73f8ecf3c28956727':
  Remove unused hosts.
2014-06-16 22:23:27 +00:00
Elliott Hughes
0f41ad7993 am 1ffda9be: Merge "Remove unused hosts."
* commit '1ffda9be60c64337085bbc65b2a0658b7c1c79b9':
  Remove unused hosts.
2014-06-16 22:18:50 +00:00
Ying Wang
c17e0f92c5 Merge "Explicit record the modules' built-file:installed-file" 2014-06-16 22:13:20 +00:00
Ying Wang
74c9850c79 Explicit record the modules' built-file:installed-file
- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
2014-06-16 16:41:48 -07:00
Ying Wang
03270b97ca Put modules with install path to system/ to DATA/ in the zip file.
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
2014-06-16 16:41:23 -07:00
dcashman
d9c312b51a Merge "Allow all domains access to /dev/qemu_trace." 2014-06-16 21:55:56 +00:00
dcashman
38a261a82b Allow all domains access to /dev/qemu_trace.
/dev/qemu_trace is used by memcheck on qemu to get memory allocation events
from all processes on the system.  Allow all domains to access this device, and
other qemu-specific devices.

Addresses the following denials:
type=1400 audit(1402674828.500:3): avc:  denied  { read write } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.500:4): avc:  denied  { open } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:5): avc:  denied  { read write } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:6): avc:  denied  { open } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:7): avc:  denied  { read write } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:8): avc:  denied  { open } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:9): avc: denied { read write } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:10): avc: denied { open } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.180:11): avc: denied { read write } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:12): avc: denied { read write } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:13): avc: denied { open } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:14): avc: denied { open } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:15): avc: denied { read write } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:16): avc: denied { open } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:17): avc: denied { read write } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:18): avc: denied { open } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.860:22): avc: denied { read write } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.870:23): avc: denied { open } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file

Bug: 15570479
Change-Id: I87d0976800557d73064e2da038315b0d019d7a60
2014-06-16 14:17:05 -07:00
Elliott Hughes
1ffda9be60 Merge "Remove unused hosts." 2014-06-16 19:18:38 +00:00
Elliott Hughes
bfe62fc30c Remove unused hosts.
Nobody is using freebsd-x86 or linux-ppc.

Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e
2014-06-16 14:48:59 -07:00
dcashman
f1d5f8805c am 8dea5006: am 357842b1: Merge "Revert "Allow all domains access to /dev/qemu_trace.""
* commit '8dea5006c53e105f5a7181e5d915d88462de69ae':
  Revert "Allow all domains access to /dev/qemu_trace."
2014-06-16 18:03:01 +00:00
dcashman
8dea5006c5 am 357842b1: Merge "Revert "Allow all domains access to /dev/qemu_trace.""
* commit '357842b109db31c85aebb8d1c9f70885fe1cb07c':
  Revert "Allow all domains access to /dev/qemu_trace."
2014-06-16 17:57:56 +00:00
Robert Ly
e1b39896fe am 908a05a1: fix hero image offset in css
* commit '908a05a1ee87bdf6d4f27355d0a0d648ab8f8da0':
  fix hero image offset in css
2014-06-16 17:53:40 +00:00
Robert Ly
908a05a1ee fix hero image offset in css
Change-Id: I7633a852166ca8781f753f7f63829a3394f38773
2014-06-16 10:47:50 -07:00
dcashman
3aeceecddf am cd978db2: am 96df14d6: Merge "Allow all domains access to /dev/qemu_trace."
* commit 'cd978db20ed0d8dffb1686ef23b968d70561f7cf':
  Allow all domains access to /dev/qemu_trace.
2014-06-16 17:23:52 +00:00
dcashman
cd978db20e am 96df14d6: Merge "Allow all domains access to /dev/qemu_trace."
* commit '96df14d6b665b394fbc26108820cbfba8033bed0':
  Allow all domains access to /dev/qemu_trace.
2014-06-16 17:18:35 +00:00
Steve Moyer
16e2e04730 DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-06-16 09:53:34 -07:00
Ying Wang
4d386c8e04 am 13a476c4: am 2f1f30a9: Merge "Trim down BUILD_FINGERPRINT."
* commit '13a476c40c0354220829efe29224845da78b6326':
  Trim down BUILD_FINGERPRINT.
2014-06-16 16:33:45 +00:00
Ying Wang
13a476c40c am 2f1f30a9: Merge "Trim down BUILD_FINGERPRINT."
* commit '2f1f30a9b1d60e09115237db4052cac5c50ff4d5':
  Trim down BUILD_FINGERPRINT.
2014-06-16 16:29:27 +00:00
Ying Wang
fcb077ea01 Merge "Put modules with install path to system/ to DATA/ in the zip file." 2014-06-16 15:49:03 +00:00
dcashman
357842b109 Merge "Revert "Allow all domains access to /dev/qemu_trace."" 2014-06-16 15:49:03 +00:00
dcashman
097e840b06 Revert "Allow all domains access to /dev/qemu_trace."
This reverts commit b1b12f8ad4.
2014-06-16 10:45:16 -07:00
dcashman
b1b12f8ad4 Allow all domains access to /dev/qemu_trace.
/dev/qemu_trace is used by memcheck on qemu to get memory allocation events
from all processes on the system.  Allow all domains to access this device, and
other qemu-specific devices..

Addresses the following denials:
type=1400 audit(1402674828.500:3): avc:  denied  { read write } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.500:4): avc:  denied  { open } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:5): avc:  denied  { read write } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:6): avc:  denied  { open } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:7): avc:  denied  { read write } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:8): avc:  denied  { open } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:9): avc: denied { read write } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:10): avc: denied { open } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.180:11): avc: denied { read write } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:12): avc: denied { read write } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:13): avc: denied { open } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:14): avc: denied { open } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:15): avc: denied { read write } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:16): avc: denied { open } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:17): avc: denied { read write } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:18): avc: denied { open } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.860:22): avc: denied { read write } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.870:23): avc: denied { open } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file

Bug: 15570479
Change-Id: I4999a1eb5c25b4238c53fe1e989bcf5fed1ae355
2014-06-16 10:10:38 -07:00
Ying Wang
a530bd4025 Merge "Also include the binaries for the 2nd arch." 2014-06-16 15:40:29 +00:00
Ying Wang
ec45d37242 Also include the binaries for the 2nd arch.
Also include the binaries for the 2nd arch when building module
packages.

Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
2014-06-16 16:42:10 -07:00
dcashman
96df14d6b6 Merge "Allow all domains access to /dev/qemu_trace." 2014-06-16 15:34:52 +00:00
Ying Wang
2f1f30a9b1 Merge "Trim down BUILD_FINGERPRINT." 2014-06-16 15:34:52 +00:00
Joe Fernandez
cbade38515 am fc0f5453: Android TV - small CSS fixes for TV landing page
* commit 'fc0f54534270ed005c8929769844b12c9de773c9':
  Android TV - small CSS fixes for TV landing page
2014-06-15 22:01:31 +00:00
Joe Fernandez
fc0f545342 Android TV - small CSS fixes for TV landing page
Change-Id: I672b5299e71d840ccc53561e540c33ede14cbcf7
2014-06-15 14:53:08 -07:00
Robert Ly
cbc14812af am e7eeb400: add support for microsites
* commit 'e7eeb4002938fdc52820fb8aa02896d536c82a9e':
  add support for microsites
2014-06-15 21:34:02 +00:00