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
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
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
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
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
Ian Rogers
aa54033b46
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
...
Change-Id: I945128b3087b28f62467c7123b759e3514027574
2014-03-10 16:49:41 -07:00
Ian Rogers
c61a9425cd
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
This reverts commit 668427c941
.
Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
2014-03-10 23:27:01 +00:00
Ian Rogers
668427c941
Define __STDC_LIMIT_MACROS globally to work around host build differences.
...
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
2014-03-10 15:30:39 -07:00
Chris Wren
22e3835e33
jdk error message should not mention the version
...
the version is checked elsewhere
Bug: 13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
2014-03-10 12:25:31 -07:00
Ying Wang
2c5666fc4d
am eb9b62e0
: Merge "Make -rpath-link work with multilib."
...
* commit 'eb9b62e08d25ec9067a3f47634a2b8cf750230d8':
Make -rpath-link work with multilib.
2014-03-10 18:06:15 +00:00
Tim Murray
c3ba600f58
am 254a88b9
: Merge "Switch to LLVM 3.4 prebuilts in AOSP."
...
* commit '254a88b9578883f3138be6991c7bcdb8393af188':
Switch to LLVM 3.4 prebuilts in AOSP.
2014-03-10 18:06:06 +00:00
Ying Wang
f5ad2b9253
resolved conflicts for merge of 9aadde67
to klp-dev-plus-aosp
...
Change-Id: I6102f1f092dd4c1d131e5cc6f4180c2fbdc93b53
2014-03-07 15:07:51 -08:00
Ying Wang
4438454b2a
am 9335001d
: Merge "Strip all symbols on x86"
...
* commit '9335001d5d15777522455d5f593a9a69719b12b7':
Strip all symbols on x86
2014-03-07 22:59:40 +00:00
Ying Wang
6df34fbc84
am e72beb53
: Merge "Remove dead code."
...
* commit 'e72beb53a8f0644d65c3e218677e287c109d67c6':
Remove dead code.
2014-03-07 22:59:37 +00:00
Ying Wang
dcbe985a6d
am f9538ea6
: Merge "Add missing s to mips."
...
* commit 'f9538ea6261f373bdb993bc5d0a503b4ecbc0c22':
Add missing $(combo_2nd_arch_prefix)s to mips.
2014-03-07 19:41:11 +00:00
Ying Wang
0ee468fe30
am 5aa50c66
: Merge "Fix x86 config file to support 2nd ARCH build"
...
* commit '5aa50c6637f88213661b29facaf05f072316dec0':
Fix x86 config file to support 2nd ARCH build
2014-03-07 19:40:41 +00:00
Ying Wang
5f6fa379bc
am 3d9c1c1a
: Merge "Switch x86_64 to gcc-4.8"
...
* commit '3d9c1c1a537ead6071165ea661507e0a9250dc4a':
Switch x86_64 to gcc-4.8
2014-03-07 19:40:40 +00:00
Colin Cross
dd494f8df7
am 4febec12
: Merge "x86: set -msse2 for all builds"
...
* commit '4febec12272a90456c5216cc10ccc059ba11552d':
x86: set -msse2 for all builds
2014-03-07 19:40:12 +00:00
Narayan Kamath
a5dee12770
am 2bea94ba
: Merge "Fix up android.core CTS tests."
...
* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
Fix up android.core CTS tests.
2014-03-07 19:39:28 +00:00
Narayan Kamath
632e4a8edd
am 70a4a6a3
: Merge "changing the rules following java package renaming for external/apache-harmony."
...
* commit '70a4a6a3323885b0f2701b9a6fe3d2eea2152a23':
changing the rules following java package renaming for external/apache-harmony.
2014-03-07 19:39:27 +00:00
Narayan Kamath
61955de13c
am d4dc88b0
: Merge "Adding apache-harmony to cts."
...
* commit 'd4dc88b0f5be3670187f2fe3bb659aaeec032d3a':
Adding apache-harmony to cts.
2014-03-07 19:39:26 +00:00
Narayan Kamath
ffe76b1792
am 92e99b12
: Merge "add jsr166 tests to cts. Bug: 10390711"
...
* commit '92e99b128d170b28972ac3910090734e803c93e5':
add jsr166 tests to cts. Bug: 10390711
2014-03-07 19:39:26 +00:00
Stephen Hines
baa20999de
am 051e28fe
: Merge "Fix incorrect x86 build rules."
...
* commit '051e28fe2128a284ec7987f903f02b9f5826391b':
Fix incorrect x86 build rules.
2014-03-07 19:38:32 +00:00
Colin Cross
0ae55418f6
am a9baf879
: Merge "fix build"
...
* commit 'a9baf8795e5d770a2e0ee7da22781701842932bd':
fix build
2014-03-07 19:33:34 +00:00
Colin Cross
e87b349acf
am 3bbaab31
: Merge changes I2514f66f,I71fed98d
...
* commit '3bbaab31069045aea9ae33c1d995640e56182a82':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
2014-03-07 19:33:26 +00:00
Ying Wang
542b98ebe9
am e2f06adb
: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
...
* commit 'e2f06adb8873ede16f829690b4dbab07b8121aa8':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
2014-03-07 19:33:21 +00:00
Colin Cross
17821ae6f1
am 7ea5cd95
: Merge "don\'t use LOCAL_*_arch for host builds"
...
* commit '7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
don't use LOCAL_*_arch for host builds
2014-03-07 19:33:20 +00:00
Ying Wang
16ae8b4dd1
am 5c7039fb
: Merge "Remove dead code."
...
* commit '5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
Remove dead code.
2014-03-07 02:30:02 +00:00
Ying Wang
14040db928
am bec954d0
: Merge "Clean up dangling module names"
...
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
2014-03-07 02:27:32 +00:00
Ying Wang
e23ee3ec25
am b12cce10
: Merge "Refine module name resolving in multilib build"
...
* commit 'b12cce10fab8c9adda213506be4ce675104655da':
Refine module name resolving in multilib build
2014-03-07 02:27:31 +00:00
Elliott Hughes
77285ffc9b
am 993ffb80
: Merge "Add all-S-files-under."
...
* commit '993ffb802ee90e07e73e67e523fd040395dfd74d':
Add all-S-files-under.
2014-03-07 02:27:16 +00:00
Colin Cross
d52c6101b7
am 90ed06ef
: Merge "fix 2nd target clang prebuilt paths"
...
* commit '90ed06ef84aee84dfc1edba1503a2b2036fc867d':
fix 2nd target clang prebuilt paths
2014-03-07 02:27:06 +00:00
Ben Cheng
9a854e7114
am 6c5d8976
: Merge "Refreshed gcc predefines __ANDROID__"
...
* commit '6c5d89764848b604c01d0dca7104d9e075aed2b2':
Refreshed gcc predefines __ANDROID__
2014-03-07 02:25:17 +00:00
Ying Wang
22e268503b
am 5cc7f8a7
: Merge "Select the arch_variant_cflags for the 2nd arch."
...
* commit '5cc7f8a720fdeb2c2ec46b6ec212d05587e76163':
Select the arch_variant_cflags for the 2nd arch.
2014-03-07 02:25:09 +00:00