OSDN Git Service
Ying Wang [Fri, 28 Feb 2014 01:27:15 +0000 (17:27 -0800)]
am
c0adfb76: Select src arch for prebuilts.
* commit '
c0adfb76cdae425b4c03d85de184364edc33338f':
Select src arch for prebuilts.
Ying Wang [Thu, 27 Feb 2014 22:10:53 +0000 (14:10 -0800)]
Select src arch for prebuilts.
Change-Id: I2d08f923d28d59cfef93ff0bd9893352baaee60b
JP Abgrall [Thu, 27 Feb 2014 18:18:59 +0000 (10:18 -0800)]
am
6fd1eea0: am
4086cc6b: (-s ours) am
65f05c63: am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
6fd1eea001b70db1507f395957426462d42833a2':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:16:10 +0000 (18:16 +0000)]
am
4086cc6b: (-s ours) am
65f05c63: am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
4086cc6b81eb606a445cd7f7dbf0b3f857cc89fa':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:12:38 +0000 (18:12 +0000)]
am
65f05c63: am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
65f05c6327f3e99144a206b4d9b9d28f133a7108':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:09:15 +0000 (18:09 +0000)]
am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
a0bea538ae0511a24202d6b952b7e7bb8a606ac8':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:07:00 +0000 (10:07 -0800)]
am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
031bff45d051b0cdfcfdca4e35a3ab213e105fce':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:04:35 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
Ying Wang [Thu, 27 Feb 2014 17:32:13 +0000 (09:32 -0800)]
am
2fa191d7: am
3fd8a4fe: am
529a772e: am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
2fa191d77795e1dfb1985c7b9b08b491b33b1b3a':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:30:05 +0000 (17:30 +0000)]
am
3fd8a4fe: am
529a772e: am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
3fd8a4feae8c384ea04ce50452092a0079553f0e':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:26:41 +0000 (17:26 +0000)]
am
529a772e: am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
529a772eecc7a2ce1c916286d742f4f3a32e0d98':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:24:45 +0000 (17:24 +0000)]
am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
a90e346c24d498af57360bd92ff738a1480f0598':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:22:03 +0000 (09:22 -0800)]
am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
cd07521f464985373fc4fe13812b5f465373bda5':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:19:33 +0000 (17:19 +0000)]
Merge "Revert "generic_x86: toggle 64bit binder ABI""
Ying Wang [Thu, 27 Feb 2014 17:19:13 +0000 (17:19 +0000)]
Revert "generic_x86: toggle 64bit binder ABI"
This reverts commit
e2525ade32afa72c0e4fe12fc8fab939e41782e6.
Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f
Mark Salyzyn [Thu, 27 Feb 2014 16:35:42 +0000 (08:35 -0800)]
Mark Salyzyn [Thu, 27 Feb 2014 16:33:13 +0000 (16:33 +0000)]
am
7348edf7: am
b8424c79: am
4c65c202: am
7fc3a06d: Merge "build: add logd"
* commit '
7348edf7e9437639e505761805c2691a2dc04495':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:29:59 +0000 (16:29 +0000)]
am
b8424c79: am
4c65c202: am
7fc3a06d: Merge "build: add logd"
* commit '
b8424c7925a22b4297807cd8fa16bc5097adcc3e':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:26:54 +0000 (16:26 +0000)]
am
4c65c202: am
7fc3a06d: Merge "build: add logd"
* commit '
4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:21:08 +0000 (08:21 -0800)]
am
7fc3a06d: Merge "build: add logd"
* commit '
7fc3a06d7fe307332e808712fc8d02c3ed995f80':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:03:57 +0000 (16:03 +0000)]
Merge "build: add logd"
JP Abgrall [Thu, 27 Feb 2014 04:05:14 +0000 (04:05 +0000)]
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
This enables tcpdump for 64bit builds.
This reverts commit
24f99bd4b354789d7368cdee0c924e79e0a1517d.
Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
JP Abgrall [Thu, 27 Feb 2014 02:45:23 +0000 (18:45 -0800)]
am
ff23e760: am
46335a65: (-s ours) am
8c49ad68: am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
ff23e7600aac71894e026a15b0b559af9487d1d8':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:42:31 +0000 (02:42 +0000)]
am
46335a65: (-s ours) am
8c49ad68: am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
46335a658d1276b9a0bb7de1ad8f69ad0e0c37b2':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:25:04 +0000 (02:25 +0000)]
am
8c49ad68: am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
8c49ad68b0e35a85ff71dc8d5b6f195e07fb718a':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:21:22 +0000 (02:21 +0000)]
am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
24bbd72d694083c0cb51fdf719ba079080f31b62':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:19:23 +0000 (18:19 -0800)]
am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
5d0dd222cef421d5f5bbde0bed3d898e9ca505f1':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:17:11 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
Ying Wang [Thu, 27 Feb 2014 01:39:02 +0000 (17:39 -0800)]
am
70543d37: am
f7d12336: am
b3f2893f: am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
70543d378ed74debdc0fc3c84b3b269ebc713dfa':
Include privileged apps with app zip file.
Ying Wang [Thu, 27 Feb 2014 01:36:03 +0000 (01:36 +0000)]
am
f7d12336: am
b3f2893f: am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
f7d12336f5aacf715636519363651ab9050abf8f':
Include privileged apps with app zip file.
Ying Wang [Thu, 27 Feb 2014 01:31:48 +0000 (01:31 +0000)]
am
b3f2893f: am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
b3f2893f793085225f506d771d36c9d710bd0306':
Include privileged apps with app zip file.
Ying Wang [Thu, 27 Feb 2014 01:30:08 +0000 (01:30 +0000)]
am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
66a9b789703b7fac5f57fa318209dc8211f800f7':
Include privileged apps with app zip file.
JP Abgrall [Wed, 26 Feb 2014 22:59:40 +0000 (22:59 +0000)]
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
This is until aosp gets the latest libpcap+tcpdump currently only on internal.
This reverts commit
5c68e265ac2bfeb881f9cc87c50f8b947ddbd86c.
Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
Ying Wang [Thu, 27 Feb 2014 01:25:13 +0000 (01:25 +0000)]
Merge "Include privileged apps with app zip file."
Nick Kralevich [Tue, 17 Jan 2012 21:48:32 +0000 (13:48 -0800)]
build: add logd
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
Ying Wang [Wed, 26 Feb 2014 22:41:57 +0000 (14:41 -0800)]
am
4c285735: am
3156d4c4: am
45bde7bf: am
9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
* commit '
4c2857352958f08da9c27a3884700e325d206254':
Remove external/tcpdump from 64-bit build blacklist.
Nick Kralevich [Wed, 26 Feb 2014 22:41:56 +0000 (14:41 -0800)]
am
8e6f18d7: am
e9513f95: am
65f26a76: am
9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
* commit '
8e6f18d7d2bea51e296cd63425ee6766ce2632a2':
Add policy for MIPS emulator, fix x86 policy.
Ying Wang [Wed, 26 Feb 2014 22:39:06 +0000 (22:39 +0000)]
am
3156d4c4: am
45bde7bf: am
9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
* commit '
3156d4c425ba7a79a7b60266e6d4cd604521d4d7':
Remove external/tcpdump from 64-bit build blacklist.
Nick Kralevich [Wed, 26 Feb 2014 22:39:05 +0000 (22:39 +0000)]
am
e9513f95: am
65f26a76: am
9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
* commit '
e9513f95c930977086a2b3ec370646e500866652':
Add policy for MIPS emulator, fix x86 policy.
Ying Wang [Wed, 26 Feb 2014 22:34:56 +0000 (22:34 +0000)]
am
45bde7bf: am
9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
* commit '
45bde7bfad783e096075471b9a5d52b46dbaa27f':
Remove external/tcpdump from 64-bit build blacklist.
Nick Kralevich [Wed, 26 Feb 2014 22:34:55 +0000 (22:34 +0000)]
am
65f26a76: am
9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
* commit '
65f26a769ac3d3648c533e5e39ba6d1f3f1b3600':
Add policy for MIPS emulator, fix x86 policy.
Ying Wang [Wed, 26 Feb 2014 22:31:09 +0000 (22:31 +0000)]
am
9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
* commit '
9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b':
Remove external/tcpdump from 64-bit build blacklist.
Nick Kralevich [Wed, 26 Feb 2014 22:31:01 +0000 (22:31 +0000)]
am
9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
* commit '
9edc9783d21f59bc532e2b7b62ae2464ee976438':
Add policy for MIPS emulator, fix x86 policy.
Ying Wang [Wed, 26 Feb 2014 22:23:46 +0000 (22:23 +0000)]
Merge "Remove external/tcpdump from 64-bit build blacklist."
Ying Wang [Wed, 26 Feb 2014 22:18:21 +0000 (14:18 -0800)]
Remove external/tcpdump from 64-bit build blacklist.
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
Nick Kralevich [Wed, 26 Feb 2014 21:37:29 +0000 (21:37 +0000)]
Merge "Add policy for MIPS emulator, fix x86 policy."
Ying Wang [Wed, 26 Feb 2014 20:18:04 +0000 (12:18 -0800)]
am
557282db: am
332bbced: am
a8d273d3: am
bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
* commit '
557282dbc4db5bf2023c2e69a58a6f0d326280e2':
Conditionally include the 'samplecode' rules.
Ying Wang [Wed, 26 Feb 2014 20:15:01 +0000 (20:15 +0000)]
am
332bbced: am
a8d273d3: am
bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
* commit '
332bbced6d075eccdf54b00d4178afc59db6f096':
Conditionally include the 'samplecode' rules.
Ying Wang [Wed, 26 Feb 2014 20:11:56 +0000 (20:11 +0000)]
am
a8d273d3: am
bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
* commit '
a8d273d3ce1d062c55dd936ab17792c7494643ca':
Conditionally include the 'samplecode' rules.
Ying Wang [Wed, 26 Feb 2014 20:06:26 +0000 (20:06 +0000)]
am
bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
* commit '
bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
Conditionally include the 'samplecode' rules.
Ying Wang [Wed, 26 Feb 2014 19:58:58 +0000 (19:58 +0000)]
Merge "Conditionally include the 'samplecode' rules."
Ying Wang [Wed, 26 Feb 2014 19:55:38 +0000 (11:55 -0800)]
Conditionally include the 'samplecode' rules.
Not sure goal 'samplecode' is still used by anybody these days.
Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
Robert Craig [Wed, 26 Feb 2014 16:48:20 +0000 (11:48 -0500)]
Include privileged apps with app zip file.
Include apps that appear under /system/priv-app
to also be included with the zip of all the apps.
Change-Id: If4687cf4c471877f11d78b68bad96f1842e49d87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Stephen Smalley [Wed, 26 Feb 2014 13:49:39 +0000 (08:49 -0500)]
Add policy for MIPS emulator, fix x86 policy.
The qemud and /dev/qemu_pipe policy bits copied to generic
and generic_x86 by I620d4aef84a5d4565abb1695db54ce1653612bce
are required for generic_mips as well. In testing, we
further saw other denials for generic_mips that correspond
exactly to what is already allowed in the generic sepolicy, so
just inherit the sepolicy files from generic for now.
We could do likewise for the generic_x86 sepolicy for the files that are
identical with generic if desired, but that is not done by this change.
The generic_x86 sepolicy was missing a rule for /sys/qemu_trace
moved to the generic sepolicy by the prior change, so fix that omission.
The generic*64 variants will need something similar, either by inheriting
from one of the existing sepolicy directories as in the MIPS
case or by forking their own copies as in the x86 case.
Change-Id: Iec7c8825734a3f96f7db8ae1d10dce1f30b22bdf
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Torne (Richard Coles) [Wed, 26 Feb 2014 11:16:10 +0000 (03:16 -0800)]
am
62e30dcf: am
64cd1218: am
e665992c: am
63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
62e30dcf8bcc6318ac9691cfe63f94a76abf1b01':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Torne (Richard Coles) [Wed, 26 Feb 2014 11:14:19 +0000 (11:14 +0000)]
am
64cd1218: am
e665992c: am
63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
64cd12187e28cf6eadd686fd6c661126d753e5d6':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Torne (Richard Coles) [Wed, 26 Feb 2014 11:12:09 +0000 (11:12 +0000)]
am
e665992c: am
63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
e665992cb8b66bda2797ef8fa3a69c633864ca44':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Torne (Richard Coles) [Wed, 26 Feb 2014 11:09:29 +0000 (11:09 +0000)]
am
63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
630020883abc6c8b2c13876e3195ed6abcf4890f':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Torne (Richard Coles) [Wed, 26 Feb 2014 11:04:03 +0000 (11:04 +0000)]
Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
Ying Wang [Wed, 26 Feb 2014 02:46:25 +0000 (18:46 -0800)]
am
33fb2093: am
948c22b4: am
2aeff455: am
66331624: Merge "Fix prebuilt library dependency for multilib build"
* commit '
33fb2093283130eded4636427eaf1b87b52188dd':
Fix prebuilt library dependency for multilib build
Ying Wang [Wed, 26 Feb 2014 02:43:27 +0000 (02:43 +0000)]
am
948c22b4: am
2aeff455: am
66331624: Merge "Fix prebuilt library dependency for multilib build"
* commit '
948c22b4d46ed4025fc83920fb3995dd95b8193a':
Fix prebuilt library dependency for multilib build
Ying Wang [Wed, 26 Feb 2014 02:40:09 +0000 (02:40 +0000)]
am
2aeff455: am
66331624: Merge "Fix prebuilt library dependency for multilib build"
* commit '
2aeff4558783b70381efc7bf7bf93cce76f57122':
Fix prebuilt library dependency for multilib build
Ying Wang [Wed, 26 Feb 2014 02:38:31 +0000 (02:38 +0000)]
am
66331624: Merge "Fix prebuilt library dependency for multilib build"
* commit '
66331624b5422a608607a9924f174ba533573032':
Fix prebuilt library dependency for multilib build
Ying Wang [Wed, 26 Feb 2014 02:33:30 +0000 (02:33 +0000)]
Merge "Fix prebuilt library dependency for multilib build"
Ying Wang [Wed, 26 Feb 2014 02:26:29 +0000 (18:26 -0800)]
Fix prebuilt library dependency for multilib build
Also we don't need to include module_arch_supported.mk again, if we are
currently substituting the source build with LOCAL_PREBUILT_MODULE_FILE.
Change-Id: I444b0397d74c3153b398a050b762e49418062a86
Elliott Hughes [Wed, 26 Feb 2014 02:18:51 +0000 (18:18 -0800)]
am
eab6de4e: am
1615a101: am
4a122c96: am
9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
* commit '
eab6de4e3d6f5d5a865ba34294886dc5f1ad162d':
oprofile/daemon doesn't build for x86_64.
Elliott Hughes [Wed, 26 Feb 2014 02:15:54 +0000 (02:15 +0000)]
am
1615a101: am
4a122c96: am
9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
* commit '
1615a1013e311ca19e999ab7ff2c81ea9d9f4a69':
oprofile/daemon doesn't build for x86_64.
Elliott Hughes [Wed, 26 Feb 2014 02:12:52 +0000 (02:12 +0000)]
am
4a122c96: am
9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
* commit '
4a122c96f3abf0eb20c5b2c3db7cd067f5a919fb':
oprofile/daemon doesn't build for x86_64.
Elliott Hughes [Wed, 26 Feb 2014 02:07:18 +0000 (02:07 +0000)]
am
9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
* commit '
9dba192b76ee75c578a62dcef0160fc719a57914':
oprofile/daemon doesn't build for x86_64.
Elliott Hughes [Wed, 26 Feb 2014 02:02:30 +0000 (02:02 +0000)]
Merge "oprofile/daemon doesn't build for x86_64."
Ying Wang [Wed, 26 Feb 2014 01:46:07 +0000 (17:46 -0800)]
am
a914a0d7: am
08842ae7: am
12c909b2: resolved conflicts for merge of
9057f619 to klp-modular-dev-plus-aosp
* commit '
a914a0d7b26321571d37e569ee938a2ffe8d0324':
Remove external/wpa_supplicant_8 and external/android-clat
Ying Wang [Wed, 26 Feb 2014 01:43:50 +0000 (01:43 +0000)]
am
08842ae7: am
12c909b2: resolved conflicts for merge of
9057f619 to klp-modular-dev-plus-aosp
* commit '
08842ae767b03776224baa7164a1d7f294e5b166':
Remove external/wpa_supplicant_8 and external/android-clat
Ying Wang [Wed, 26 Feb 2014 01:40:44 +0000 (01:40 +0000)]
am
12c909b2: resolved conflicts for merge of
9057f619 to klp-modular-dev-plus-aosp
* commit '
12c909b20c2a1f8be74914186e54c4143ddc263e':
Remove external/wpa_supplicant_8 and external/android-clat
Ying Wang [Wed, 26 Feb 2014 01:37:45 +0000 (17:37 -0800)]
resolved conflicts for merge of
9057f619 to klp-modular-dev-plus-aosp
Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e
Elliott Hughes [Wed, 26 Feb 2014 01:32:22 +0000 (17:32 -0800)]
oprofile/daemon doesn't build for x86_64.
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.
Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
Ying Wang [Wed, 26 Feb 2014 01:21:11 +0000 (01:21 +0000)]
Merge "Remove external/wpa_supplicant_8 and external/android-clat"
Ying Wang [Wed, 26 Feb 2014 01:15:47 +0000 (17:15 -0800)]
Remove external/wpa_supplicant_8 and external/android-clat
from 64_bit_blacklist.mk.
They now build fine for 64-bit.
Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
Elliott Hughes [Wed, 26 Feb 2014 00:32:23 +0000 (16:32 -0800)]
am
9a1a9331: am
9f3e1d78: am
331272f9: am
25b55485: Merge "Take libcore off the LP64 blacklist."
* commit '
9a1a933129da6c6fa0bc12beb38798e4b47ee46f':
Take libcore off the LP64 blacklist.
Elliott Hughes [Wed, 26 Feb 2014 00:29:52 +0000 (00:29 +0000)]
am
9f3e1d78: am
331272f9: am
25b55485: Merge "Take libcore off the LP64 blacklist."
* commit '
9f3e1d788e32212cdac8e8c955c28d773bfe062b':
Take libcore off the LP64 blacklist.
Ying Wang [Wed, 26 Feb 2014 00:28:01 +0000 (16:28 -0800)]
am
aeab26e9: am
31dab4c4: am
4a0b06e8: am
f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
* commit '
aeab26e983604d5bcaee42faf7d778c6778fd7dd':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
Elliott Hughes [Wed, 26 Feb 2014 00:26:37 +0000 (00:26 +0000)]
am
331272f9: am
25b55485: Merge "Take libcore off the LP64 blacklist."
* commit '
331272f94bc85c5eb9853e726c024375f691ab59':
Take libcore off the LP64 blacklist.
Ying Wang [Wed, 26 Feb 2014 00:25:19 +0000 (00:25 +0000)]
am
31dab4c4: am
4a0b06e8: am
f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
* commit '
31dab4c45fc3457a4537f3cbceca572faa9a85ca':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
Elliott Hughes [Wed, 26 Feb 2014 00:22:49 +0000 (00:22 +0000)]
am
25b55485: Merge "Take libcore off the LP64 blacklist."
* commit '
25b5548522220940f50ab5b4dfb3e2e691ad913b':
Take libcore off the LP64 blacklist.
Ying Wang [Wed, 26 Feb 2014 00:21:06 +0000 (00:21 +0000)]
am
4a0b06e8: am
f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
* commit '
4a0b06e80871aad1bc8a8493bdd74b9ff30a9a2f':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
Ying Wang [Wed, 26 Feb 2014 00:18:21 +0000 (00:18 +0000)]
am
f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
* commit '
f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
Elliott Hughes [Wed, 26 Feb 2014 00:18:04 +0000 (00:18 +0000)]
Merge "Take libcore off the LP64 blacklist."
Ying Wang [Wed, 26 Feb 2014 00:13:01 +0000 (00:13 +0000)]
Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
Ying Wang [Tue, 25 Feb 2014 19:18:40 +0000 (11:18 -0800)]
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
So a library can export the proto's include path that can be used with
both archs in multilib build.
Change-Id: Ia0f92f0b40e39dc3fa426c69c52139a0a8f04077
Elliott Hughes [Tue, 25 Feb 2014 23:54:26 +0000 (15:54 -0800)]
Take libcore off the LP64 blacklist.
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
Nick Kralevich [Tue, 25 Feb 2014 22:08:54 +0000 (14:08 -0800)]
am
b4f4dc96: am
61b71bb2: am
b8d792d7: am
e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
* commit '
b4f4dc9685d1e09bc3b893706ddcdc4d42415551':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Nick Kralevich [Tue, 25 Feb 2014 22:07:14 +0000 (22:07 +0000)]
am
61b71bb2: am
b8d792d7: am
e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
* commit '
61b71bb211dc6c1d9cb85a25232d8b0234bfe13c':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Nick Kralevich [Tue, 25 Feb 2014 22:03:59 +0000 (22:03 +0000)]
am
b8d792d7: am
e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
* commit '
b8d792d734a1470aa96062fe284a5d288e7bbc30':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Nick Kralevich [Tue, 25 Feb 2014 21:58:45 +0000 (21:58 +0000)]
am
e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
* commit '
e715487031036ecc75bfedb94b2d6c9dbd3bc98d':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Nick Kralevich [Tue, 25 Feb 2014 21:54:39 +0000 (21:54 +0000)]
Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
Ying Wang [Tue, 25 Feb 2014 21:50:27 +0000 (13:50 -0800)]
am
2bc6328f: am
ead8944e: Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
* commit '
2bc6328ff7f1afc0aad4a0b18b1685d195306a6e':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
Ying Wang [Tue, 25 Feb 2014 21:47:15 +0000 (21:47 +0000)]
am
ead8944e: Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
* commit '
ead8944e8da9a4b6dbe344b8d93b2c6b2a730f68':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
Ying Wang [Tue, 25 Feb 2014 19:18:40 +0000 (11:18 -0800)]
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
So a library can export the proto's include path that can be used with
both archs in multilib build.
Change-Id: Ia0f92f0b40e39dc3fa426c69c52139a0a8f04077
Stephen Smalley [Tue, 25 Feb 2014 18:37:06 +0000 (13:37 -0500)]
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Change-Id: I620d4aef84a5d4565abb1695db54ce1653612bce
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Tsu Chiang Chuang [Tue, 25 Feb 2014 18:49:25 +0000 (10:49 -0800)]
am
43d52485: add exception to be able to build emulator_tests in conjunction with the sdk.
* commit '
43d524854acf54e7de065d71d649f047a3283210':
add exception to be able to build emulator_tests in conjunction with the sdk.
Tsu Chiang Chuang [Tue, 25 Feb 2014 18:37:58 +0000 (10:37 -0800)]
add exception to be able to build emulator_tests in conjunction with the
sdk.
Change-Id: Ic4c63c756c78da97657e08faa5b4b6891b951b03
OSDN Git Service
