JP Abgrall
7e09b998c3
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-03-13 11:26:26 -07:00
JP Abgrall
470125849d
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-03-13 11:26:26 -07:00
Ying Wang
f3ba9484b5
Remove external/tcpdump from 64-bit build blacklist.
...
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
2014-03-13 11:26:26 -07:00
Elliott Hughes
1c71a43aef
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-03-13 11:26:26 -07:00
Ying Wang
579ea43d87
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-03-13 11:26:26 -07:00
Elliott Hughes
7813000d49
Take libcore off the LP64 blacklist.
...
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
2014-03-13 11:26:26 -07:00
Colin Cross
9bdcdff615
HACK: add 64-bit directory blacklist
...
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-03-13 11:26:26 -07:00
Colin Cross
c92f1407a1
add support for module supported or unsupported target architectures
...
Add four new variables for module makefiles:
LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for
one or more architectures. Any architecture not in the list will be
not attempt to build the module. The expected use case is prebuilts
that are only suitable for a single architecture, or modules like llvm
that need per-architecture support.
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be
built for one or more architectures.
LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN
are the same, but warn that the arch is not supported, which is useful
for modules that are critical but not yet working.
The logic for whether or not to build an architecture is fairly
complicated, so this patch consolidates it into module_arch_supported.mk
Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-03-13 11:26:04 -07:00
Dmitriy Ivanov
96ad54d132
am d842e6d6
: am c62d6f76
: Merge "Add TARGET_2ND_ARCH to dumpvar"
...
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
Add TARGET_2ND_ARCH to dumpvar
2014-03-13 15:54:41 +00:00
Ying Wang
895520a782
am 446f00c9
: am ce156811
: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
...
* commit '446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
2014-03-13 01:55:11 +00:00
Ian Rogers
bf9670a38b
am 21060b30
: am 775d15e0
: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
...
* commit '21060b30993b975084ea7a7c35a6df23cf0e5ea7':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
2014-03-13 01:54:43 +00:00
Ian Rogers
dae5ebc949
am bc39fd5c
: am f1e697be
: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
...
* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-13 01:54:41 +00:00
Dmitriy Ivanov
d842e6d6c3
am c62d6f76
: Merge "Add TARGET_2ND_ARCH to dumpvar"
...
* commit 'c62d6f7622f567ba9a0acf54a80d118f85e741b4':
Add TARGET_2ND_ARCH to dumpvar
2014-03-12 11:46:05 -07:00
Dmitriy Ivanov
c62d6f7622
Merge "Add TARGET_2ND_ARCH to dumpvar"
2014-03-12 18:40:43 +00:00
Dmitriy Ivanov
d5cd1e2ecf
Add TARGET_2ND_ARCH to dumpvar
...
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
2014-03-12 11:13:41 -07:00
Ian Rogers
7d5d35d465
am a520bfbe
: am 4783dc7a
: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
* commit 'a520bfbeb65b307da42abb079911311096fef20c':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-11 18:52:52 +00:00
Ying Wang
04691b3947
am 61cf1df7
: am 60ef9d5b
: Merge "jdk error message should not mention the version"
...
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
jdk error message should not mention the version
2014-03-11 18:52:31 +00:00
Clay Murphy
34306a6dc2
am 25f47659
: am 05192e5a
: Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
...
* commit '25f47659d7cc0e7b9d65ab8ce070fc7b00c4976c':
Docs: replacing analytics ID from D.A.C. Bug: 11476435
2014-03-11 18:52:28 +00:00
Ben Cheng
555118df54
am 21ef9705
: (-s ours) am f230bcf4
: Merge "OProfile is no longer compiled now."
...
* commit '21ef9705b67bc8c2666a30bf71db0ba5125c93f2':
OProfile is no longer compiled now.
2014-03-11 18:51:14 +00:00
Nicolas Geoffray
e7be6ffa98
am db48d145
: am 247dd0c4
: Merge "Do not remove the generated .hpp file from yacc."
...
* commit 'db48d145841afb9b9b6d1c124191a1681d6b4f39':
Do not remove the generated .hpp file from yacc.
2014-03-11 18:29:45 +00:00
Nicolas Geoffray
6b92a7018e
am b11697d3
: am 68d38154
: Merge "Remove host-prefix command line argument to dex2oat."
...
* commit 'b11697d30778db51d476aedd28b0e2c65eb241e3':
Remove host-prefix command line argument to dex2oat.
2014-03-11 18:29:12 +00:00
Andrew Hsieh
f25a976fa6
am 12493c89
: am 6808c260
: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
...
* commit '12493c892e59d826eec41caea6bc90a5778bb672':
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
2014-03-11 18:28:59 +00:00
Victoria Lease
e19b86cbbd
am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
2014-03-11 18:28:39 +00:00
Nicolas Geoffray
5ebef36646
am d85ef325
: am 460ed38a
: Merge "Extend YACC and LEX handling to .yy and .ll files."
...
* commit 'd85ef325de805996050170b3ce1cc199cba7c980':
Extend YACC and LEX handling to .yy and .ll files.
2014-03-11 18:28:25 +00:00
Primiano Tucci
358b310709
am ff157c76
: am 368faf83
: Merge "Add usage comment to explain how to limit modules in mmm."
...
* commit 'ff157c76c9d7d524236e7bfc3ef7cab53dd91818':
Add usage comment to explain how to limit modules in mmm.
2014-03-11 18:28:17 +00:00
Narayan Kamath
24ce94dc22
am e8bb5c3a
: (-s ours) am 0d08449c
: Merge "Amend 64 bit blacklist."
...
* commit 'e8bb5c3a54c1bcf798689ad664233e34af059f4c':
Amend 64 bit blacklist.
2014-03-11 18:28:12 +00:00
Ying Wang
009f48b00f
am a6230641
: am 26bcd640
: Merge "Try to catch more misuse of ."
...
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
Try to catch more misuse of $(my-dir).
2014-03-11 18:17:42 +00:00
Ben Cheng
9b6fd60cf6
am d86da81f
: am 2bd77d5e
: Merge "Make gdbclient smarter for gdb[server] setup."
...
* commit 'd86da81fc49bcde9a5328779d13783a744ebadbb':
Make gdbclient smarter for gdb[server] setup.
2014-03-11 18:17:11 +00:00
Ying Wang
8ec7041127
am 8e286fbf
: am cf1b7d4b
: Merge "Select src arch for prebuilts."
...
* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
Select src arch for prebuilts.
2014-03-11 18:16:49 +00:00
JP Abgrall
4200387486
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
2014-03-11 18:16:28 +00:00
Ying Wang
e2b42b34e1
am a90e346c
: am cd07521f
: Merge "Revert "generic_x86: toggle 64bit binder ABI""
...
* commit 'a90e346c24d498af57360bd92ff738a1480f0598':
Revert "generic_x86: toggle 64bit binder ABI"
2014-03-11 18:16:25 +00:00
Mark Salyzyn
5e9a4fa67b
am 4c65c202
: am 7fc3a06d
: Merge "build: add logd"
...
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
2014-03-11 18:16:24 +00:00
JP Abgrall
04ec197801
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
2014-03-11 18:16:03 +00:00
Ying Wang
9638890678
am 66a9b789
: Merge "Include privileged apps with app zip file."
...
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
Include privileged apps with app zip file.
2014-03-11 18:16:01 +00:00
Ying Wang
e26a58ae1d
am 9aa715a5
: (-s ours) Merge "Remove external/tcpdump from 64-bit build blacklist."
...
* commit '9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b':
Remove external/tcpdump from 64-bit build blacklist.
2014-03-11 18:15:54 +00:00
Nick Kralevich
a705e44d0b
am 9edc9783
: Merge "Add policy for MIPS emulator, fix x86 policy."
...
* commit '9edc9783d21f59bc532e2b7b62ae2464ee976438':
Add policy for MIPS emulator, fix x86 policy.
2014-03-11 18:08:37 +00:00
Ying Wang
84ee17bd65
am bbe5f88e
: Merge "Conditionally include the \'samplecode\' rules."
...
* commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
Conditionally include the 'samplecode' rules.
2014-03-11 18:08:18 +00:00
Torne (Richard Coles)
bbc3a3eda3
am 63002088
: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
...
* commit '630020883abc6c8b2c13876e3195ed6abcf4890f':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
2014-03-11 18:08:03 +00:00
Ying Wang
d98291e74e
am 66331624
: Merge "Fix prebuilt library dependency for multilib build"
...
* commit '66331624b5422a608607a9924f174ba533573032':
Fix prebuilt library dependency for multilib build
2014-03-11 18:07:57 +00:00
Elliott Hughes
f0ba6b18a8
am 9dba192b
: (-s ours) Merge "oprofile/daemon doesn\'t build for x86_64."
...
* commit '9dba192b76ee75c578a62dcef0160fc719a57914':
oprofile/daemon doesn't build for x86_64.
2014-03-11 18:07:55 +00:00
Ying Wang
6450eccc1e
am 9057f619
: (-s ours) Merge "Remove external/wpa_supplicant_8 and external/android-clat"
...
* commit '9057f619c319f30c95a3dfeb73904a6bbe2b891e':
Remove external/wpa_supplicant_8 and external/android-clat
2014-03-11 18:02:01 +00:00
Elliott Hughes
adb8114f0d
am 25b55485
: (-s ours) Merge "Take libcore off the LP64 blacklist."
...
* commit '25b5548522220940f50ab5b4dfb3e2e691ad913b':
Take libcore off the LP64 blacklist.
2014-03-11 17:56:15 +00:00
Ying Wang
64255e639b
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
2014-03-11 17:12:21 +00:00
Nick Kralevich
05cc2e26c4
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.
2014-03-11 17:12:16 +00:00
Ying Wang
446f00c9e1
am ce156811
: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
...
* commit 'ce156811797d7594b712120c5d969e329d70b1e3':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
2014-03-10 19:05:27 -07:00
Ying Wang
ce15681179
Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
2014-03-11 02:03:07 +00:00
Ying Wang
ba8b377d89
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
...
Still keep WITHOUT_CLANG, which enables both.
Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
2014-03-10 18:59:12 -07:00
Ying Wang
aa6c50aaae
am 0e0c4879
: Merge "generic_x86: toggle 64bit binder ABI"
...
* commit '0e0c48796d9d0ebe415b1ccc9f67ae95f9c716c9':
generic_x86: toggle 64bit binder ABI
2014-03-11 00:38:38 +00:00
Ian Rogers
21060b3099
am 775d15e0
: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
...
* commit '775d15e001d48d72a1b76982b1b5faa1eb37158f':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
2014-03-10 16:59:07 -07:00
Ian Rogers
775d15e001
Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
2014-03-10 23:55:32 +00:00