Ying Wang
ae5a1e1447
Try to catch more misuse of $(my-dir).
...
(cherry picked from commit 79e8319b2e
)
Change-Id: I779af79c83de2ad1944269dd5bd31d65ff844064
2014-03-18 15:11:44 -07:00
Ying Wang
8824386987
am 5462f7f9
: am 255ea2bd
: Merge "Remove unused LOCAL_ASSET_FILES."
...
* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
Remove unused LOCAL_ASSET_FILES.
2014-03-18 18:44:05 +00:00
Ying Wang
594f2a4261
Remove unused LOCAL_ASSET_FILES.
...
Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
2014-03-18 11:31:09 -07:00
Andrew Hsieh
23371f350a
am d14f3cc7
: am 5384c187
: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
...
* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
2014-03-18 00:09:32 +00:00
Andrew Hsieh
73d800e519
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
...
Add llvm libc++ static and shared libraries
Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
2014-03-17 20:30:45 +08:00
Ying Wang
8196f6159e
am a660d06e
: am 1cda15d3
: Merge "Don\'t modify LOCAL_STRIP_MODULE"
...
* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
Don't modify LOCAL_STRIP_MODULE
2014-03-16 20:08:32 +00:00
Ying Wang
1cda15d323
Merge "Don't modify LOCAL_STRIP_MODULE"
2014-03-16 20:02:56 +00:00
Ying Wang
e1889af2d5
Don't modify LOCAL_STRIP_MODULE
...
LOCAL_STRIP_MODULE will be reused in multilib build.
Change-Id: I3512efb360c7eaafad02859723ab4368778effed
2014-03-16 12:43:49 -07:00
Colin Cross
f6da0820b3
am 6e92ade0
: am db24577b
: Merge "Work in progress to enable build system support for Clang."
...
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
Work in progress to enable build system support for Clang.
2014-03-16 00:00:20 +00:00
Colin Cross
db24577bbd
Merge "Work in progress to enable build system support for Clang."
2014-03-15 23:54:03 +00:00
Tim Murray
b5f333bbef
Work in progress to enable build system support for Clang.
...
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07:00
Dianne Hackborn
6668799e7b
resolved conflicts for merge of 264d4001
to klp-dev-plus-aosp
...
Change-Id: Ib95e5f6a6a5a613395a13a9df3d283348576d241
2014-03-13 17:35:26 -07:00
Andrew Hsieh
2fceaccc30
am de8edc8a
: am 933e8940
: Merge "Fix HOST_TOOLCHAIN_PREFIX"
...
* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
Fix HOST_TOOLCHAIN_PREFIX
2014-03-14 00:26:58 +00:00
Andrew Hsieh
933e8940d0
Merge "Fix HOST_TOOLCHAIN_PREFIX"
2014-03-14 00:19:19 +00:00
Narayan Kamath
dc8541686c
Revert "Remove external/chromium from the 64 bit blacklist."
...
This reverts commit 27bf51144a
.
Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
2014-03-13 11:26:26 -07:00
Narayan Kamath
c88d174010
Remove external/chromium from the 64 bit blacklist.
...
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.
This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.
Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
2014-03-13 11:26:26 -07:00
Ben Cheng
b0f8c44069
OProfile is no longer compiled now.
...
BUG: 13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
2014-03-13 11:26:26 -07:00
Narayan Kamath
bde97f477b
Amend 64 bit blacklist.
...
- external/skia now builds on arm64, frameworks/base/libs/hwui
depends on it.
- external/bluetooth/bluedroid builds on 64 bit, though there
isn't any obvious way to test it without real hardware.
- frameworks/ml now builds, as does external/srec
- frameworks/opt, frameworks/ex and frameworks/wilhelm don't
build because of their dependency on frameworks/av.
frameworks/av should probably be dropped out of the blacklist
and replaced by individual markers on targets that we want
for 64 bit (we don't want all of them for arm64).
Change-Id: I9735108840fcba21ac8918bedf0d6de8989de086
2014-03-13 11:26:26 -07:00
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
Narayan Kamath
cc8d6dab9a
Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
2014-03-13 09:29:52 +00:00
Narayan Kamath
c00ab8e012
Revert "Remove external/chromium from the 64 bit blacklist."
...
This reverts commit 27bf51144a
.
Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
2014-03-13 09:29:22 +00:00
Narayan Kamath
252496247f
Merge "Remove external/chromium from the 64 bit blacklist."
2014-03-13 09:05:32 +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
d5cd1e2ecf
Add TARGET_2ND_ARCH to dumpvar
...
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
2014-03-12 11:13:41 -07:00
Narayan Kamath
27bf51144a
Remove external/chromium from the 64 bit blacklist.
...
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.
This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.
Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
2014-03-12 14:43:38 +00:00
Andrew Hsieh
cbe162e914
Fix HOST_TOOLCHAIN_PREFIX
...
Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format. Fix it so we can try out new host toolchain, eg.
HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make
Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
2014-03-12 19:27:59 +08:00
Dianne Hackborn
264d4001e7
am 7503e736
: 4.4.3 is MR2, version boogaloo!
...
* commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc':
4.4.3 is MR2, version boogaloo!
2014-03-11 23:22:38 +00:00
Dianne Hackborn
7503e736eb
4.4.3 is MR2, version boogaloo!
...
Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
2014-03-11 14:54:09 -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
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
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
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
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
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
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