Commit graph

15233 commits

Author SHA1 Message Date
JP Abgrall
031bff45d0 Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok" 2014-02-27 18:04:35 +00:00
Ying Wang
a90e346c24 am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit 'cd07521f464985373fc4fe13812b5f465373bda5':
  Revert "generic_x86: toggle 64bit binder ABI"
2014-02-27 09:22:03 -08:00
Ying Wang
cd07521f46 Merge "Revert "generic_x86: toggle 64bit binder ABI"" 2014-02-27 17:19:34 +00:00
Ying Wang
32d35a71ff Revert "generic_x86: toggle 64bit binder ABI"
This reverts commit e2525ade32.

Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f
2014-02-27 17:19:13 +00:00
Mark Salyzyn
4c65c20235 am 7fc3a06d: Merge "build: add logd"
* commit '7fc3a06d7fe307332e808712fc8d02c3ed995f80':
  build: add logd
2014-02-27 08:21:08 -08:00
Mark Salyzyn
7fc3a06d7f Merge "build: add logd" 2014-02-27 16:03:58 +00:00
JP Abgrall
352bbe5c9c DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
This enables tcpdump for 64bit builds.

This reverts commit 24f99bd4b3.

Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
2014-02-27 04:05:14 +00:00
JP Abgrall
24bbd72d69 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
2014-02-26 18:19:23 -08:00
JP Abgrall
5d0dd222ce Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad" 2014-02-27 02:17:11 +00:00
JP Abgrall
24f99bd4b3 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 5c68e265ac.

Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
2014-02-27 01:28:11 +00:00
Ying Wang
66a9b78970 Merge "Include privileged apps with app zip file." 2014-02-27 01:25:13 +00:00
Nick Kralevich
1884833c3a 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
2014-02-26 15:39:38 -08:00
Ying Wang
9aa715a579 Merge "Remove external/tcpdump from 64-bit build blacklist." 2014-02-26 22:23:46 +00:00
Ying Wang
5c68e265ac Remove external/tcpdump from 64-bit build blacklist.
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
2014-02-26 14:18:21 -08:00
Nick Kralevich
9edc9783d2 Merge "Add policy for MIPS emulator, fix x86 policy." 2014-02-26 21:37:29 +00:00
Ying Wang
bbe5f88e1d Merge "Conditionally include the 'samplecode' rules." 2014-02-26 19:58:59 +00:00
Ying Wang
48fbc42f93 Conditionally include the 'samplecode' rules.
Not sure goal 'samplecode' is still used by anybody these days.

Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
2014-02-26 11:55:38 -08:00
Robert Craig
59ec195a4d 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>
2014-02-26 12:00:14 -05:00
Stephen Smalley
1c0e1cde7b 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>
2014-02-26 09:12:55 -05:00
Primiano Tucci
6a8069d8d6 Add usage comment to explain how to limit modules in mmm.
68895a96 has introduced the possibility to limit the modules being
built by mmm. In many occasions this can save a lot of developement
time since it allows to build one target without processing all the
makefiles in the Android tree. Unfortunatelly this nice feature is
undocumented. This CL adds the one line documentation.

Change-Id: I6ded32c4774047599e9c44e5ea71c07e65731cda
2014-02-26 11:19:58 +00:00
Torne (Richard Coles)
630020883a Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS." 2014-02-26 11:04:03 +00:00
Ying Wang
66331624b5 Merge "Fix prebuilt library dependency for multilib build" 2014-02-26 02:33:30 +00:00
Ying Wang
58f462fccf 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
2014-02-25 18:32:27 -08:00
Elliott Hughes
9dba192b76 Merge "oprofile/daemon doesn't build for x86_64." 2014-02-26 02:02:30 +00:00
Elliott Hughes
0cfae9fdb5 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
2014-02-25 17:32:22 -08:00
Ying Wang
9057f619c3 Merge "Remove external/wpa_supplicant_8 and external/android-clat" 2014-02-26 01:21:12 +00:00
Ying Wang
a52f117073 Remove external/wpa_supplicant_8 and external/android-clat
from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
2014-02-25 17:15:47 -08:00
Elliott Hughes
25b5548522 Merge "Take libcore off the LP64 blacklist." 2014-02-26 00:18:04 +00:00
Ying Wang
f1ff3abd83 Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir" 2014-02-26 00:13:02 +00:00
Ying Wang
031e0fb308 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
2014-02-25 16:12:16 -08:00
Elliott Hughes
6749f6db16 Take libcore off the LP64 blacklist.
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
2014-02-25 15:54:26 -08:00
Nick Kralevich
e715487031 Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy." 2014-02-25 21:54:40 +00:00
Stephen Smalley
768ff518f0 Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Change-Id: I620d4aef84a5d4565abb1695db54ce1653612bce
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-25 13:49:57 -05:00
Torne (Richard Coles)
db7dcc210a Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
For host executables and shared libraries, the global LDFLAGS were being
inserted into the linker command line after the module-specific ones,
making it impossible to override the default settings. Change the order
to match target linker invocations.

Change-Id: Icd5f6f83df9f27a5be97ddb197ee245c1ab8c2be
2014-02-25 13:33:30 +00:00
Ying Wang
0e0c48796d Merge "generic_x86: toggle 64bit binder ABI" 2014-02-24 18:05:34 +00:00
Ying Wang
eb9b62e08d Merge "Make -rpath-link work with multilib." 2014-02-22 00:38:43 +00:00
Ying Wang
9fb3526648 Make -rpath-link work with multilib.
Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783
2014-02-21 16:20:20 -08:00
Tim Murray
254a88b957 Merge "Switch to LLVM 3.4 prebuilts in AOSP." 2014-02-21 21:52:15 +00:00
Colin Cross
b3bc61365b Merge "arm64: don't build emulator" 2014-02-20 22:49:32 +00:00
Colin Cross
15b1c8377d arm64: don't build emulator
There is no emulator kernel yet, so don't try to build the emulator.

Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764
2014-02-20 14:39:09 -08:00
Ying Wang
9aadde6734 Merge "Include $(BUILD_COPY_HEADERS) in upper-level makefiles" 2014-02-20 22:24:09 +00:00
Ying Wang
bf4a8d3069 Include $(BUILD_COPY_HEADERS) in upper-level makefiles
This makes sure copy_headers.mk only be included onces, no matter
it's for the 1st arch or the 2nd arch.

Change-Id: I80a558fbdb52861f176bd27a21c302069a5cc3ce
2014-02-20 13:54:43 -08:00
Ying Wang
9335001d5d Merge "Strip all symbols on x86" 2014-02-20 18:31:07 +00:00
Ying Wang
e72beb53a8 Merge "Remove dead code." 2014-02-20 18:30:51 +00:00
Ying Wang
f9538ea626 Merge "Add missing $(combo_2nd_arch_prefix)s to mips." 2014-02-20 04:31:29 +00:00
Elliott Hughes
369b3326f3 Add missing $(combo_2nd_arch_prefix)s to mips.
Change-Id: I91a5f2d92cc964cbaeb1c07f27eb56ea1a0d53cc
2014-02-19 20:29:25 -08:00
Ying Wang
3da7b96a39 Remove dead code.
It seems the code was meant to add the toolchain to ANDROID_BUILD_PATHS
and then export to PATH by lunch.
But now we export the toolchain to PATH explicitly in envsetup.sh and
the code is unnecessary.
This reduces the places to change when we upgrade the gcc version.
It also fixed the bug that the mips toolchain was always exported
regardless of the target arch.

Change-Id: Iee3b895b4c4e0df8971c27c01b9ecbd591848b12
2014-02-19 18:25:55 -08:00
C. Sean Young
b47c863ec7 Strip all symbols on x86
Strip all of the non-dynamic symbols on x86 targets,
instead of just the debug symbols.

Change-Id: Id799a6a8c8b0e8bf70977328e42e5efa23762f25
2014-02-19 12:53:43 -08:00
Ying Wang
5aa50c6637 Merge "Fix x86 config file to support 2nd ARCH build" 2014-02-19 18:19:22 +00:00
Ying Wang
3d9c1c1a53 Merge "Switch x86_64 to gcc-4.8" 2014-02-19 18:17:52 +00:00