OSDN Git Service
Colin Cross [Wed, 18 Jun 2014 20:24:56 +0000 (20:24 +0000)]
am
b110da5f: am
9d8854e3: Merge "build: delete 64-bit blacklist"
* commit '
b110da5f2bf9cf105dd675648075d13c942d1892':
build: delete 64-bit blacklist
Colin Cross [Wed, 18 Jun 2014 20:20:58 +0000 (20:20 +0000)]
am
9d8854e3: Merge "build: delete 64-bit blacklist"
* commit '
9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44':
build: delete 64-bit blacklist
Ying Wang [Wed, 18 Jun 2014 18:41:01 +0000 (18:41 +0000)]
am
5d88b3d7: am
c4262982: Merge "Use the correct MKBOOTIMG."
* commit '
5d88b3d7d615995c6b1909992347fe0b5692492e':
Use the correct MKBOOTIMG.
Ying Wang [Wed, 18 Jun 2014 18:36:56 +0000 (18:36 +0000)]
am
c4262982: Merge "Use the correct MKBOOTIMG."
* commit '
c426298280cea52af693ce76fe8643012ebe54b2':
Use the correct MKBOOTIMG.
smain@google.com [Wed, 18 Jun 2014 16:34:40 +0000 (16:34 +0000)]
am
38404199: Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
* commit '
384041992c734be6ec8d2469d071c3358fd15a77':
revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right
Elliott Hughes [Wed, 18 Jun 2014 00:55:33 +0000 (00:55 +0000)]
am
09a4cac1: am
7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '
09a4cac12e3b040fb6d18490ff444b2fdd6cb451':
Removed /system/bin prefix from gdbclient.
Elliott Hughes [Wed, 18 Jun 2014 00:50:43 +0000 (00:50 +0000)]
am
7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '
7cc3174d9ca26c3170e201dd73f8d83bcfe27cf3':
Removed /system/bin prefix from gdbclient.
Deepanshu Gupta [Wed, 18 Jun 2014 00:25:30 +0000 (00:25 +0000)]
am
aaa502bc: am
e662adf7: am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
aaa502bc9ee796c4121cc275834f083b85b4e71e':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:15:39 +0000 (00:15 +0000)]
am
e662adf7: am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
e662adf748be5d8df6056f4cf5da2c821bc27c59':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:10:39 +0000 (00:10 +0000)]
am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
2a7f1c59300ee462b63e3065f65f24291ca78043':
Integrate build_font.py [DO NOT MERGE]
Brian Carlstrom [Tue, 17 Jun 2014 23:34:52 +0000 (23:34 +0000)]
am
edbc4595: am
d51730a6: Merge "Help catch common 32/64-bit errors."
* commit '
edbc4595b817aef5f620e78dc283d8cc8fccff2a':
Help catch common 32/64-bit errors.
Brian Carlstrom [Tue, 17 Jun 2014 23:31:00 +0000 (23:31 +0000)]
am
d51730a6: Merge "Help catch common 32/64-bit errors."
* commit '
d51730a64fac296f42f28ac84feca02a9ee6ef15':
Help catch common 32/64-bit errors.
Colin Cross [Wed, 18 Jun 2014 20:17:06 +0000 (20:17 +0000)]
Merge "build: delete 64-bit blacklist"
Colin Cross [Wed, 18 Jun 2014 04:35:44 +0000 (21:35 -0700)]
build: delete 64-bit blacklist
The last projects in the blacklist have been fixed, delete the code.
Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
Ying Wang [Wed, 18 Jun 2014 18:32:29 +0000 (18:32 +0000)]
Merge "Use the correct MKBOOTIMG."
Ying Wang [Wed, 18 Jun 2014 18:31:21 +0000 (11:31 -0700)]
Use the correct MKBOOTIMG.
Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2
Brian Carlstrom [Tue, 17 Jun 2014 23:26:28 +0000 (23:26 +0000)]
Merge "Help catch common 32/64-bit errors."
Brian Carlstrom [Tue, 17 Jun 2014 21:36:05 +0000 (14:36 -0700)]
Help catch common 32/64-bit errors.
(cherry picked from commit
cf5ea762e015bc044d251814d9062ef1df4dd49f)
Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0
Elliott Hughes [Wed, 18 Jun 2014 00:46:13 +0000 (00:46 +0000)]
Merge "Removed /system/bin prefix from gdbclient."
Brigid Smith [Wed, 28 May 2014 21:36:43 +0000 (14:36 -0700)]
Removed /system/bin prefix from gdbclient.
Now a program run through gdbclient will not automatically have
/system/bin added to its path, so programs not in /system/bin will no
longer need to be prefixed with ../../.
The following now works as an example:
adb shell gdbserver :5039 /system/xbin/crasher
bg
gdbclient /system/xbin/crasher :5039 /system/xbin/crasher
And the following now no longer works:
adb shell gdbserver :5039 /system/xbin/crasher
bg
gdbclient ../../system/xbin/crasher :5039 /system/xbin/crasher
Change-Id: I299b66d03915aeb1dc300e43a81c9a51f0bd7dec
smain@google.com [Wed, 18 Jun 2014 16:30:50 +0000 (16:30 +0000)]
Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
smain@google.com [Wed, 18 Jun 2014 03:02:53 +0000 (20:02 -0700)]
revisions to the next/prev page link layout.
make "next" link in footer align left, remove previous link in footer,
add doc title to next link in footer, move g+ to the right
Change-Id: Id7c18a1a1a42344e96d0fa17c35908eb87d62612
Deepanshu Gupta [Wed, 18 Jun 2014 00:05:31 +0000 (00:05 +0000)]
Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
smain@google.com [Tue, 17 Jun 2014 19:07:05 +0000 (19:07 +0000)]
am
3b77ab5a: fix xss vulnerabilities bug:
15597152 bug:
15405607
* commit '
3b77ab5a01f1c3297bed32d9c7fac68a61bf3d20':
fix xss vulnerabilities bug:
15597152 bug:
15405607
smain@google.com [Tue, 17 Jun 2014 18:57:27 +0000 (11:57 -0700)]
fix xss vulnerabilities
bug:
15597152
bug:
15405607
Change-Id: I10582d5cd767b977fc2af0f2cf2642802feeffab
Steve Moyer [Tue, 17 Jun 2014 17:39:26 +0000 (17:39 +0000)]
am
97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master
* commit '
97f49221add746c1a385a4086054682e7d3a3353':
DO NOT MERGE: Combine emulator test projects into a single apk
Nick Kralevich [Tue, 17 Jun 2014 16:56:57 +0000 (16:56 +0000)]
am
2eb95ac2: am
ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible."
* commit '
2eb95ac202429d930545043d742ab443bedbf357':
Coalesce generic_x86 and generic sepolicy where possible.
Nick Kralevich [Tue, 17 Jun 2014 16:51:14 +0000 (16:51 +0000)]
am
ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible."
* commit '
ad6107c3e9901ce520eedcad7770a3a9e4f327d8':
Coalesce generic_x86 and generic sepolicy where possible.
Nick Kralevich [Tue, 17 Jun 2014 13:50:14 +0000 (13:50 +0000)]
am
331f4d58: am
cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file."
* commit '
331f4d5863137e5fd5d59f9a407de2a7227a5c23':
Restore generic_x86 sepolicy zygote.te file.
Nick Kralevich [Tue, 17 Jun 2014 13:44:53 +0000 (13:44 +0000)]
am
cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file."
* commit '
cc7aebb8d30f01029f43be730c27c794b8f39aa6':
Restore generic_x86 sepolicy zygote.te file.
Narayan Kamath [Tue, 17 Jun 2014 10:05:13 +0000 (10:05 +0000)]
am
ae65e2eb: am
d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit '
ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
Make default 64-bit primary, 32-bit secondary
Narayan Kamath [Tue, 17 Jun 2014 09:56:18 +0000 (09:56 +0000)]
am
d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit '
d73ec26a19e82cefca45e3c80b37b015d423bda7':
Make default 64-bit primary, 32-bit secondary
Nick Kralevich [Tue, 17 Jun 2014 13:39:05 +0000 (13:39 +0000)]
Merge "Restore generic_x86 sepolicy zygote.te file."
Stephen Smalley [Tue, 17 Jun 2014 13:20:17 +0000 (09:20 -0400)]
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>
Nick Kralevich [Tue, 17 Jun 2014 16:42:01 +0000 (16:42 +0000)]
Merge "Coalesce generic_x86 and generic sepolicy where possible."
Stephen Smalley [Mon, 16 Jun 2014 16:36:49 +0000 (12:36 -0400)]
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>
Steve Moyer [Tue, 17 Jun 2014 17:34:43 +0000 (17:34 +0000)]
Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master
Narayan Kamath [Tue, 17 Jun 2014 09:50:40 +0000 (09:50 +0000)]
Merge "Make default 64-bit primary, 32-bit secondary"
Brian Carlstrom [Mon, 16 Jun 2014 23:51:42 +0000 (16:51 -0700)]
Make default 64-bit primary, 32-bit secondary
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
smain@google.com [Tue, 17 Jun 2014 03:24:12 +0000 (03:24 +0000)]
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.
smain@google.com [Tue, 17 Jun 2014 02:24:25 +0000 (19:24 -0700)]
add script and style for toggling which IDE instructions to show.
Change-Id: Ief094a4f58c7ebb4625948d6639fed713adcc0c7
Ying Wang [Mon, 16 Jun 2014 23:53:39 +0000 (23:53 +0000)]
am
fe86a7c1: am
a530bd40: Merge "Also include the binaries for the 2nd arch."
* commit '
fe86a7c1531ac85d634b7fde16ce008ca28118fb':
Also include the binaries for the 2nd arch.
Ying Wang [Mon, 16 Jun 2014 23:53:38 +0000 (23:53 +0000)]
am
e6b3692b: am
c17e0f92: Merge "Explicit record the modules\' built-file:installed-file"
* commit '
e6b3692b8357b52b0a67e12be450e1ccfda5ffb5':
Explicit record the modules' built-file:installed-file
Ying Wang [Mon, 16 Jun 2014 23:53:37 +0000 (23:53 +0000)]
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.
Ying Wang [Mon, 16 Jun 2014 23:50:26 +0000 (23:50 +0000)]
am
a530bd40: Merge "Also include the binaries for the 2nd arch."
* commit '
a530bd4025ddf5d37510fca9de62e2dec3f2d7cb':
Also include the binaries for the 2nd arch.
Ying Wang [Mon, 16 Jun 2014 23:50:25 +0000 (23:50 +0000)]
am
c17e0f92: Merge "Explicit record the modules\' built-file:installed-file"
* commit '
c17e0f92c570931ece4ae9c7ca27ecef5734113f':
Explicit record the modules' built-file:installed-file
Ying Wang [Mon, 16 Jun 2014 23:50:25 +0000 (23:50 +0000)]
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.
dcashman [Mon, 16 Jun 2014 23:04:18 +0000 (23:04 +0000)]
am
5bb6eeb9: am
d9c312b5: Merge "Allow all domains access to /dev/qemu_trace."
* commit '
5bb6eeb9de791086d9129c49aeabcff65df845da':
Allow all domains access to /dev/qemu_trace.
dcashman [Mon, 16 Jun 2014 22:59:28 +0000 (22:59 +0000)]
am
d9c312b5: Merge "Allow all domains access to /dev/qemu_trace."
* commit '
d9c312b51ae404f3c0a49997b5cb9ed6ad84df86':
Allow all domains access to /dev/qemu_trace.
Elliott Hughes [Mon, 16 Jun 2014 22:23:27 +0000 (22:23 +0000)]
am
0f41ad79: am
1ffda9be: Merge "Remove unused hosts."
* commit '
0f41ad79932bf7e69d3bfab73f8ecf3c28956727':
Remove unused hosts.
Elliott Hughes [Mon, 16 Jun 2014 22:18:50 +0000 (22:18 +0000)]
am
1ffda9be: Merge "Remove unused hosts."
* commit '
1ffda9be60c64337085bbc65b2a0658b7c1c79b9':
Remove unused hosts.
Ying Wang [Mon, 16 Jun 2014 23:42:55 +0000 (23:42 +0000)]
Merge "Explicit record the modules' built-file:installed-file"
Ying Wang [Mon, 19 May 2014 20:03:36 +0000 (13:03 -0700)]
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
Ying Wang [Fri, 16 May 2014 03:45:39 +0000 (20:45 -0700)]
Put modules with install path to system/ to DATA/ in the zip file.
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
dcashman [Mon, 16 Jun 2014 22:53:22 +0000 (22:53 +0000)]
Merge "Allow all domains access to /dev/qemu_trace."
dcashman [Mon, 16 Jun 2014 21:17:05 +0000 (14:17 -0700)]
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
Elliott Hughes [Mon, 16 Jun 2014 22:13:39 +0000 (22:13 +0000)]
Merge "Remove unused hosts."
Elliott Hughes [Mon, 16 Jun 2014 21:48:59 +0000 (14:48 -0700)]
Remove unused hosts.
Nobody is using freebsd-x86 or linux-ppc.
Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e
dcashman [Mon, 16 Jun 2014 18:03:01 +0000 (18:03 +0000)]
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."
dcashman [Mon, 16 Jun 2014 17:57:56 +0000 (17:57 +0000)]
am
357842b1: Merge "Revert "Allow all domains access to /dev/qemu_trace.""
* commit '
357842b109db31c85aebb8d1c9f70885fe1cb07c':
Revert "Allow all domains access to /dev/qemu_trace."
Robert Ly [Mon, 16 Jun 2014 17:53:40 +0000 (17:53 +0000)]
am
908a05a1: fix hero image offset in css
* commit '
908a05a1ee87bdf6d4f27355d0a0d648ab8f8da0':
fix hero image offset in css
Robert Ly [Mon, 16 Jun 2014 17:47:50 +0000 (10:47 -0700)]
fix hero image offset in css
Change-Id: I7633a852166ca8781f753f7f63829a3394f38773
dcashman [Mon, 16 Jun 2014 17:23:52 +0000 (17:23 +0000)]
am
cd978db2: am
96df14d6: Merge "Allow all domains access to /dev/qemu_trace."
* commit '
cd978db20ed0d8dffb1686ef23b968d70561f7cf':
Allow all domains access to /dev/qemu_trace.
dcashman [Mon, 16 Jun 2014 17:18:35 +0000 (17:18 +0000)]
am
96df14d6: Merge "Allow all domains access to /dev/qemu_trace."
* commit '
96df14d6b665b394fbc26108820cbfba8033bed0':
Allow all domains access to /dev/qemu_trace.
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Ying Wang [Mon, 16 Jun 2014 16:33:45 +0000 (16:33 +0000)]
am
13a476c4: am
2f1f30a9: Merge "Trim down BUILD_FINGERPRINT."
* commit '
13a476c40c0354220829efe29224845da78b6326':
Trim down BUILD_FINGERPRINT.
Ying Wang [Mon, 16 Jun 2014 16:29:27 +0000 (16:29 +0000)]
am
2f1f30a9: Merge "Trim down BUILD_FINGERPRINT."
* commit '
2f1f30a9b1d60e09115237db4052cac5c50ff4d5':
Trim down BUILD_FINGERPRINT.
Ying Wang [Mon, 16 Jun 2014 23:42:40 +0000 (23:42 +0000)]
Merge "Put modules with install path to system/ to DATA/ in the zip file."
dcashman [Mon, 16 Jun 2014 17:53:19 +0000 (17:53 +0000)]
Merge "Revert "Allow all domains access to /dev/qemu_trace.""
dcashman [Mon, 16 Jun 2014 17:45:16 +0000 (10:45 -0700)]
Revert "Allow all domains access to /dev/qemu_trace."
This reverts commit
b1b12f8ad49ecbba7dd6b9db2a0ca8fafa532d82.
dcashman [Fri, 13 Jun 2014 22:30:57 +0000 (15:30 -0700)]
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
Ying Wang [Mon, 16 Jun 2014 23:43:14 +0000 (23:43 +0000)]
Merge "Also include the binaries for the 2nd arch."
Ying Wang [Mon, 16 Jun 2014 22:14:45 +0000 (15:14 -0700)]
Also include the binaries for the 2nd arch.
Also include the binaries for the 2nd arch when building module
packages.
Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
dcashman [Mon, 16 Jun 2014 17:14:47 +0000 (17:14 +0000)]
Merge "Allow all domains access to /dev/qemu_trace."
Ying Wang [Mon, 16 Jun 2014 16:22:47 +0000 (16:22 +0000)]
Merge "Trim down BUILD_FINGERPRINT."
Joe Fernandez [Sun, 15 Jun 2014 22:01:31 +0000 (22:01 +0000)]
am
fc0f5453: Android TV - small CSS fixes for TV landing page
* commit '
fc0f54534270ed005c8929769844b12c9de773c9':
Android TV - small CSS fixes for TV landing page
Joe Fernandez [Sun, 15 Jun 2014 21:53:08 +0000 (14:53 -0700)]
Android TV - small CSS fixes for TV landing page
Change-Id: I672b5299e71d840ccc53561e540c33ede14cbcf7
Robert Ly [Sun, 15 Jun 2014 21:34:02 +0000 (21:34 +0000)]
am
e7eeb400: add support for microsites
* commit '
e7eeb4002938fdc52820fb8aa02896d536c82a9e':
add support for microsites
Robert Ly [Wed, 4 Jun 2014 02:35:24 +0000 (19:35 -0700)]
add support for microsites
Change-Id: If41551747df098f679bdf18fe3460b727fc094fb
Ying Wang [Fri, 13 Jun 2014 01:42:53 +0000 (18:42 -0700)]
Trim down BUILD_FINGERPRINT.
Bug:
15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
smain@google.com [Sat, 14 Jun 2014 00:55:36 +0000 (00:55 +0000)]
am
9cb34eae: add margin for paras in sidebox
* commit '
9cb34eae761d18d54df115ab416862850ff070f2':
add margin for paras in sidebox
smain@google.com [Sat, 14 Jun 2014 00:47:43 +0000 (17:47 -0700)]
add margin for paras in sidebox
Change-Id: I15ec01da9dc1130552743aad3543b3ea14d2bbb4
smain@google.com [Sat, 14 Jun 2014 00:39:38 +0000 (00:39 +0000)]
am
20ef3823: add About pages to the quicknav and tweak new h1 styles and move training navbar down so the page title can span the page width before wrapping
* commit '
20ef3823691b341d2a8d7c30af331371dbe8425f':
add About pages to the quicknav and tweak new h1 styles and move training navbar down so the page title can span the page width before wrapping
smain@google.com [Fri, 13 Jun 2014 23:05:28 +0000 (16:05 -0700)]
add About pages to the quicknav and
tweak new h1 styles and move training navbar down
so the page title can span the page width before wrapping
Change-Id: I517c29d8ee3a2d7347ae50ca47005b51c174fa1c
smain@google.com [Fri, 13 Jun 2014 22:15:10 +0000 (22:15 +0000)]
am
b0580df3: Merge "template changes for new sdk download pages; remove tools/ page. companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274" into klp-modular-dev
* commit '
b0580df3088172caa82847605ec39822aa7c26b0':
template changes for new sdk download pages; remove tools/ page. companion to: I7e883a2647d7c487570c4abdba9df5d72a52b274
smain@google.com [Fri, 13 Jun 2014 22:15:09 +0000 (22:15 +0000)]
am
77a6812d: Merge "add About secondary nav bar and delete the Wear custom header" into klp-modular-dev
* commit '
77a6812dd844d586ded060e14bbbeccff7bd0338':
add About secondary nav bar and delete the Wear custom header
smain@google.com [Fri, 13 Jun 2014 22:12:29 +0000 (22:12 +0000)]
Merge "add About secondary nav bar and delete the Wear custom header" into klp-modular-dev
smain@google.com [Fri, 13 Jun 2014 22:06:23 +0000 (15:06 -0700)]
add About secondary nav bar
and delete the Wear custom header
Change-Id: If7ac93556586d369a2dbf7e1fc4044473ace7bc9
Adam Lesinski [Fri, 13 Jun 2014 20:47:33 +0000 (20:47 +0000)]
am
e20af003: Merge "Add drm framework library to core_tiny" into klp-modular-dev
* commit '
e20af003e443ff2fd38a446613ecc28f0d10330a':
Add drm framework library to core_tiny
Elliott Hughes [Thu, 12 Jun 2014 23:58:12 +0000 (23:58 +0000)]
am
553c289a: am
624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
* commit '
553c289afdbdd774e689898df4e8246fdf68182e':
Remove useless stuff from "AndroidConfig.h".
Elliott Hughes [Thu, 12 Jun 2014 23:53:57 +0000 (23:53 +0000)]
am
624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
* commit '
624220c18a6fd4cabbc75344248eb770985df93c':
Remove useless stuff from "AndroidConfig.h".
Deepanshu Gupta [Wed, 28 May 2014 01:07:49 +0000 (18:07 -0700)]
Integrate build_font.py [DO NOT MERGE]
Execute the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.
Also edited the list of font directories to include in the build.
Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit
887cd0c71e756d295f6879e6b3f34753b9d67ce8)
Nick Kralevich [Thu, 12 Jun 2014 21:10:20 +0000 (21:10 +0000)]
am
003f84fb: am
c80e876c: Merge "Add service_contexts to embedded.mk."
* commit '
003f84fbbbffa0eb0b6958a2f7f4a120206decc8':
Add service_contexts to embedded.mk.
Nick Kralevich [Thu, 12 Jun 2014 21:03:37 +0000 (21:03 +0000)]
am
c80e876c: Merge "Add service_contexts to embedded.mk."
* commit '
c80e876cd2eab6452313a98c6ddeca403510784c':
Add service_contexts to embedded.mk.
Dirk Dougherty [Thu, 12 Jun 2014 20:08:07 +0000 (20:08 +0000)]
am
a6913b5c: Adjust heading sizes and weights.
* commit '
a6913b5c22b8eac6b5b62099c3a848a1e712d675':
Adjust heading sizes and weights.
Dirk Dougherty [Thu, 12 Jun 2014 00:28:38 +0000 (17:28 -0700)]
Adjust heading sizes and weights.
Change-Id: Ib8b764bcb6c7d610e05bd6e38f8ee01a34dd5ce9
Scott Main [Thu, 12 Jun 2014 19:04:36 +0000 (19:04 +0000)]
am
c29b3f58: changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
* commit '
c29b3f58b0edc60ecaaedb652475fdad4ffe7bfd':
changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
Adam Lesinski [Fri, 13 Jun 2014 20:43:27 +0000 (20:43 +0000)]
Merge "Add drm framework library to core_tiny" into klp-modular-dev
Nick Kralevich [Thu, 12 Jun 2014 21:00:30 +0000 (21:00 +0000)]
Merge "Add service_contexts to embedded.mk."
Riley Spahn [Tue, 10 Jun 2014 00:24:18 +0000 (17:24 -0700)]
Add service_contexts to embedded.mk.
Add service_contexts to embedded.mk to support MAC checks in the
service manager.
Bug:
12909011
Change-Id: I31f4f4e1acb2be8167f2f11f93c936c18303135a