Brian Carlstrom
d51730a64f
Merge "Help catch common 32/64-bit errors."
2014-06-17 20:56:23 +00:00
Brian Carlstrom
338d1e7f33
Help catch common 32/64-bit errors.
...
(cherry picked from commit cf5ea762e015bc044d251814d9062ef1df4dd49f)
Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0
2014-06-17 15:23:49 -07: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
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
cc7aebb8d3
Merge "Restore generic_x86 sepolicy zygote.te file."
2014-06-17 05:00:50 +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
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
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
Ying Wang
c17e0f92c5
Merge "Explicit record the modules' built-file:installed-file"
2014-06-16 22:13:20 +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
fcb077ea01
Merge "Put modules with install path to system/ to DATA/ in the zip file."
2014-06-16 15:49:03 +00: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
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
Ying Wang
5181a36bce
Trim down BUILD_FINGERPRINT.
...
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
2014-06-13 18:02:44 -07:00
Dan Albert
50031de36e
Remove -Bsymbolic from builds.
...
This is causing issues when tools like asan try to wrap calls like
malloc. See the referenced bug for more details.
Bug: 15432753
Change-Id: I15e8eab5b773afd02dc14c78500cf8246a617718
2014-06-13 10:24:12 -07:00
Nick Kralevich
c80e876cd2
Merge "Add service_contexts to embedded.mk."
2014-06-12 05:34:11 +00:00
Riley Spahn
8b834ecedb
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
2014-06-12 20:45:58 +00:00
Elliott Hughes
624220c18a
Merge "Remove useless stuff from "AndroidConfig.h"."
2014-06-12 03:32:07 +00:00
Elliott Hughes
e82d33d997
Remove useless stuff from "AndroidConfig.h".
...
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.
Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
2014-06-12 15:36:52 -07:00
Martin Blumenstingl
374e114d16
Document the worker_threads option.
...
Change-Id: I44775493bedc0c7224c2c4ef06330bdb1430a1b6
2014-06-11 23:03:44 +02:00
Andrey Belous
a2b0f685bb
delete duplicate variable definition
...
CALLED_FROM_SETUP and BUILD_SYSTEM set in get_build_var before make execution
no need to set them before calling get_build_var function
Change-Id: Ia79e11e5e3aa5c7fd337b989c16d50750b6c1442
Signed-off-by: Andrey Belous <belous.andrey@gmail.com>
2014-06-11 14:00:55 -04:00
Ying Wang
cc2a47bf64
Merge "Check existence of both 64-bit and 32-bit module variants."
2014-06-10 22:20:24 +00:00
Ying Wang
ff3a904522
Check existence of both 64-bit and 32-bit module variants.
...
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.
Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
2014-06-10 19:23:29 -07:00
Ying Wang
d707b5aa74
Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
2014-06-10 22:15:14 +00:00
Ying Wang
b2ba5636f1
Merge "Revert "Don't rename host libraries if only one arch is build.""
2014-06-10 22:08:45 +00:00
Ying Wang
532f1127af
Revert "Don't rename host libraries if only one arch is build."
...
This reverts commit b1f7fb7a50
.
Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
2014-06-11 01:12:18 +00:00
Ying Wang
b1f7fb7a50
Don't rename host libraries if only one arch is build.
...
This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.
Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
2014-06-10 17:18:08 -07:00
Ying Wang
c34f37c7b5
Merge "Allow to opt out both multilib in native test."
2014-06-10 22:15:14 +00:00
Ying Wang
ad10cc76b6
Allow to opt out both multilib in native test.
...
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.
Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
2014-06-10 17:52:20 -07:00
Ying Wang
a45a5d2797
Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted"
2014-06-10 22:15:14 +00:00
Ying Wang
6e85f8b0de
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
...
Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.
Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
2014-06-10 16:24:31 -07:00
Ying Wang
cec9dc1418
Merge "Don't rename host libraries if only one arch is build."
2014-06-10 22:15:14 +00:00
Ying Wang
02f98a26c9
Merge "Fix loophole in module expansion."
2014-06-10 21:59:54 +00:00
Ying Wang
e1b867dde7
Fix loophole in module expansion.
...
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.
With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.
Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
2014-06-10 14:30:30 -07:00
Ying Wang
6cc4598d18
Merge "Add global variable HOST_LIBRARY_PATH."
2014-06-10 20:31:23 +00:00
Elliott Hughes
47cdacd5e6
Merge "Remove libportable from core_base.mk."
2014-06-10 19:23:53 +00:00
Elliott Hughes
4e8c6991e5
Remove libportable from core_base.mk.
...
Change-Id: I3fae0625c68db885bd2fba502d31fe3c524d4f47
2014-06-10 12:19:01 -07:00
Ying Wang
c4595868c4
Add global variable HOST_LIBRARY_PATH.
...
With multilib host build, the build system installs host
shared libraries to different directories depending on a
library's bitness:
- HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit;
- 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit;
- If you don't care the bitness of the libraries and just want whatever
version the librareies are built by default, use HOST_LIBRARY_PATH.
Bug:13751317
Change-Id:Id4c818941dc4ea35d795767c76f698529bd6aebb
2014-06-10 12:04:56 -07:00
Ying Wang
c383862020
Merge "Switch to 32-bit-by-default host multilib build."
2014-06-10 16:26:42 +00:00
Ying Wang
2713fcebba
Switch to 32-bit-by-default host multilib build.
...
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.
Bug: 13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
2014-06-09 17:48:05 -07:00