Elliott Hughes
7cc3174d9c
Merge "Removed /system/bin prefix from gdbclient."
2014-06-17 20:49:57 +00:00
Brigid Smith
0a2712d349
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
2014-06-17 15:42:54 -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
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
Nick Kralevich
2eb95ac202
am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible."
...
* commit 'ad6107c3e9901ce520eedcad7770a3a9e4f327d8':
Coalesce generic_x86 and generic sepolicy where possible.
2014-06-17 16:51: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
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
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
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
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
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
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
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
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
Ying Wang
5181a36bce
Trim down BUILD_FINGERPRINT.
...
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
2014-06-13 18:02:44 -07:00
Elliott Hughes
553c289afd
am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
...
* commit '624220c18a6fd4cabbc75344248eb770985df93c':
Remove useless stuff from "AndroidConfig.h".
2014-06-12 23:53:57 +00:00
Nick Kralevich
003f84fbbb
am c80e876c: Merge "Add service_contexts to embedded.mk."
...
* commit 'c80e876cd2eab6452313a98c6ddeca403510784c':
Add service_contexts to embedded.mk.
2014-06-12 21:03:37 +00: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
2d4a27ee6c
am d707b5aa: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
...
* commit 'd707b5aa74730103a1978b2b47713b24bd2a7017':
AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
2014-06-11 17:02:27 +00:00
Ying Wang
6b46819353
am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants."
...
* commit 'cc2a47bf64b87f228b10c8f83b1575eee2aa1e76':
Check existence of both 64-bit and 32-bit module variants.
2014-06-11 02:27:44 +00:00
Ying Wang
c72592b7bd
am b2ba5636: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
...
* commit 'b2ba5636f187e7d2f3d2f0497bfaca68c5c7b06c':
Revert "Don't rename host libraries if only one arch is build."
2014-06-11 01:15:43 +00:00
Ying Wang
fd76c34a17
am c34f37c7: Merge "Allow to opt out both multilib in native test."
...
* commit 'c34f37c7b5d26e58a9666fc277379111a7c2ea4f':
Allow to opt out both multilib in native test.
2014-06-11 01:07:14 +00:00
Ying Wang
49d9a894dc
am cec9dc14: Merge "Don\'t rename host libraries if only one arch is build."
...
* commit 'cec9dc14185dd1df6704a4af226ffbb2a1b9cd87':
Don't rename host libraries if only one arch is build.
2014-06-11 00:24:10 +00:00