OSDN Git Service
Brian Carlstrom [Wed, 18 Jun 2014 20:46:53 +0000 (20:46 +0000)]
am
8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '
8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
Remove some uses of the deprecated WITH_HOST_DALVIK.
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
Brian Carlstrom [Wed, 18 Jun 2014 20:44:10 +0000 (20:44 +0000)]
Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
Ian Rogers [Wed, 11 Jun 2014 23:30:04 +0000 (16:30 -0700)]
Remove some uses of the deprecated WITH_HOST_DALVIK.
Bug:
13751317.
Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3
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.
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.
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
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>
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 13:39:05 +0000 (13:39 +0000)]
Merge "Restore generic_x86 sepolicy zygote.te file."
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
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: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 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
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
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 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: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 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."
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: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."
Ying Wang [Fri, 13 Jun 2014 01:42:53 +0000 (18:42 -0700)]
Trim down BUILD_FINGERPRINT.
Bug:
15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
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".
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.
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
Elliott Hughes [Thu, 12 Jun 2014 23:51:42 +0000 (23:51 +0000)]
Merge "Remove useless stuff from "AndroidConfig.h"."
Elliott Hughes [Thu, 12 Jun 2014 22:17:31 +0000 (15:17 -0700)]
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
Ying Wang [Wed, 11 Jun 2014 17:02:27 +0000 (17:02 +0000)]
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
Ying Wang [Wed, 11 Jun 2014 02:27:44 +0000 (02:27 +0000)]
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.
Ying Wang [Wed, 11 Jun 2014 01:15:43 +0000 (01:15 +0000)]
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."
Ying Wang [Wed, 11 Jun 2014 01:07:14 +0000 (01:07 +0000)]
am
c34f37c7: Merge "Allow to opt out both multilib in native test."
* commit '
c34f37c7b5d26e58a9666fc277379111a7c2ea4f':
Allow to opt out both multilib in native test.
Ying Wang [Wed, 11 Jun 2014 00:24:10 +0000 (00:24 +0000)]
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.
Ying Wang [Tue, 10 Jun 2014 23:28:52 +0000 (23:28 +0000)]
am
a45a5d27: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
* commit '
a45a5d27972070895001571b7912655b0bd0931c':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
Ying Wang [Tue, 10 Jun 2014 22:25:53 +0000 (22:25 +0000)]
am
02f98a26: Merge "Fix loophole in module expansion."
* commit '
02f98a26c9e305077f11a5e2f81494dd3a0a2a2c':
Fix loophole in module expansion.
Ying Wang [Wed, 11 Jun 2014 02:25:43 +0000 (02:25 +0000)]
Merge "Check existence of both 64-bit and 32-bit module variants."
Ying Wang [Wed, 11 Jun 2014 02:23:29 +0000 (19:23 -0700)]
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
Ying Wang [Wed, 11 Jun 2014 16:59:50 +0000 (16:59 +0000)]
Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
Ying Wang [Wed, 11 Jun 2014 01:03:22 +0000 (01:03 +0000)]
Merge "Allow to opt out both multilib in native test."
Ying Wang [Wed, 11 Jun 2014 00:52:20 +0000 (17:52 -0700)]
Allow to opt out both multilib in native test.
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.
Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
Ying Wang [Wed, 11 Jun 2014 00:21:04 +0000 (00:21 +0000)]
Merge "Don't rename host libraries if only one arch is build."
Ying Wang [Wed, 11 Jun 2014 00:18:08 +0000 (17:18 -0700)]
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
Ying Wang [Tue, 10 Jun 2014 23:25:38 +0000 (23:25 +0000)]
Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted"
Ying Wang [Tue, 10 Jun 2014 23:21:50 +0000 (16:21 -0700)]
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
Ying Wang [Wed, 11 Jun 2014 01:12:28 +0000 (01:12 +0000)]
Merge "Revert "Don't rename host libraries if only one arch is build.""
Ying Wang [Wed, 11 Jun 2014 01:12:18 +0000 (01:12 +0000)]
Revert "Don't rename host libraries if only one arch is build."
This reverts commit
b1f7fb7a508bb6b093c8b37d65adc9a5a0836e6e.
Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
Ying Wang [Tue, 10 Jun 2014 22:18:55 +0000 (22:18 +0000)]
Merge "Fix loophole in module expansion."
Ying Wang [Tue, 10 Jun 2014 21:21:20 +0000 (14:21 -0700)]
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
Ying Wang [Tue, 10 Jun 2014 20:33:04 +0000 (20:33 +0000)]
am
6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '
6cc4598d18c660d4e253970bc875be5fa08c770b':
Add global variable HOST_LIBRARY_PATH.
Ying Wang [Tue, 10 Jun 2014 20:31:23 +0000 (20:31 +0000)]
Merge "Add global variable HOST_LIBRARY_PATH."
Elliott Hughes [Tue, 10 Jun 2014 19:25:57 +0000 (19:25 +0000)]
am
47cdacd5: Merge "Remove libportable from core_base.mk."
* commit '
47cdacd5e633c8256a5dd32c769b5469882fc0aa':
Remove libportable from core_base.mk.
Elliott Hughes [Tue, 10 Jun 2014 19:23:53 +0000 (19:23 +0000)]
Merge "Remove libportable from core_base.mk."
Elliott Hughes [Tue, 10 Jun 2014 19:19:01 +0000 (12:19 -0700)]
Remove libportable from core_base.mk.
Change-Id: I3fae0625c68db885bd2fba502d31fe3c524d4f47
Ying Wang [Tue, 10 Jun 2014 19:04:56 +0000 (12:04 -0700)]
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
Ying Wang [Tue, 10 Jun 2014 16:31:39 +0000 (16:31 +0000)]
am
c3838620: Merge "Switch to 32-bit-by-default host multilib build."
* commit '
c383862020034b3db4e365aaf501a84a35e85ffe':
Switch to 32-bit-by-default host multilib build.
Ying Wang [Tue, 10 Jun 2014 16:26:42 +0000 (16:26 +0000)]
Merge "Switch to 32-bit-by-default host multilib build."
Ying Wang [Mon, 9 Jun 2014 19:31:12 +0000 (12:31 -0700)]
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
Ying Wang [Mon, 9 Jun 2014 22:57:48 +0000 (22:57 +0000)]
am
c0275247: Merge "build native tests for 32-bit and 64-bit"
* commit '
c02752473f958cb1b23ca2f7d3fd1973b665e3c4':
build native tests for 32-bit and 64-bit
Ying Wang [Mon, 9 Jun 2014 22:52:59 +0000 (22:52 +0000)]
Merge "build native tests for 32-bit and 64-bit"
Ying Wang [Mon, 9 Jun 2014 21:47:40 +0000 (21:47 +0000)]
am
5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit '
5ad17493cdb329087459ef7cddaed20cb1bba707':
Support .asm being compiled by yasm targeted for x86.
Ying Wang [Mon, 9 Jun 2014 21:43:56 +0000 (21:43 +0000)]
Merge "Support .asm being compiled by yasm targeted for x86."
Stephen Hines [Fri, 6 Jun 2014 21:17:40 +0000 (21:17 +0000)]
am
1a8f0d3b: Merge "Move comment out of recipe section"
* commit '
1a8f0d3b6dc316034e1e3b28702fead4108ec8d3':
Move comment out of recipe section
Stephen Hines [Fri, 6 Jun 2014 21:07:24 +0000 (21:07 +0000)]
Merge "Move comment out of recipe section"
Stephen Hines [Fri, 6 Jun 2014 19:51:47 +0000 (12:51 -0700)]
Move comment out of recipe section
If we keep a comment in the recipe, it prints out whenever that component
gets built.
Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
Ying Wang [Fri, 6 Jun 2014 18:24:31 +0000 (18:24 +0000)]
am
d0f0918b: Merge "Reenable ccache."
* commit '
d0f0918b8fa2a1794050a3cecf3ad3943ad378ab':
Reenable ccache.
Ying Wang [Fri, 6 Jun 2014 18:21:09 +0000 (18:21 +0000)]
Merge "Reenable ccache."
Ying Wang [Fri, 6 Jun 2014 18:17:34 +0000 (11:17 -0700)]
Reenable ccache.
The previous commit
994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.
Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
Ying Wang [Fri, 6 Jun 2014 02:05:47 +0000 (19:05 -0700)]
Support .asm being compiled by yasm targeted for x86.
Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
Tim Murray [Wed, 4 Jun 2014 19:05:45 +0000 (19:05 +0000)]
am
e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
* commit '
e564c0cbd08c728d84e62308c741b30f3bd542f8':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Tim Murray [Wed, 4 Jun 2014 19:00:38 +0000 (19:00 +0000)]
Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
Qiwen Zhao [Wed, 4 Jun 2014 18:27:18 +0000 (18:27 +0000)]
am
e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
* commit '
e8e7ebbde46df2a4dafc4c90a53abd911d1255ec':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
Qiwen Zhao [Wed, 4 Jun 2014 18:21:21 +0000 (11:21 -0700)]
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
This reverts commit
a5abefbbb527490dd76e34780dc2bfc6ed6a437d.