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
bc39fd5cab
am f1e697be
: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
...
* commit 'f1e697be5e433818071a817af0b673cba8e87795':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 16:33:44 -07:00
Ian Rogers
f1e697be5e
Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
2014-03-10 23:29:25 +00: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
a520bfbeb6
am 4783dc7a
: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
* commit '4783dc7ab509b7099d2de83f863a9799ce67659e':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-10 15:48:25 -07:00
Ian Rogers
4783dc7ab5
Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 22:44:50 +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
Ying Wang
61cf1df7ed
am 60ef9d5b
: Merge "jdk error message should not mention the version"
...
* commit '60ef9d5b263bdc6799bb6495bdd34877647d07fe':
jdk error message should not mention the version
2014-03-10 12:28:03 -07:00
Ying Wang
60ef9d5b26
Merge "jdk error message should not mention the version"
2014-03-10 19:25:59 +00: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
Clay Murphy
25f47659d7
am 05192e5a
: Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
...
* commit '05192e5a9095ac6a89757157dfd3636a2f56df7f':
Docs: replacing analytics ID from D.A.C. Bug: 11476435
2014-03-10 11:52:21 -07:00
Clay Murphy
05192e5a90
Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
2014-03-10 18:47:17 +00: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
Colin Cross
d24f6feff3
am b3bc6136
: Merge "arm64: don\'t build emulator"
...
* commit 'b3bc61365bb71cc45d10c22762aa86a3b78f1329':
arm64: don't build emulator
2014-03-07 23:19:17 +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
Stephen Hines
033aa738a8
am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit 'f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-03-07 19:40:01 +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
Ying Wang
a84b7311a8
am 872d3c2c
: Merge "gettop: fix symlink detection"
...
* commit '872d3c2c6a07e4f1c171439449727a870dfaa59d':
gettop: fix symlink detection
2014-03-07 19:38:40 +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
21bef6460d
am 2fbe5018
: Merge "add linker64 and debuggerd64 to all products"
...
* commit '2fbe5018f94f536541c0137be472e58c79890813':
add linker64 and debuggerd64 to all products
2014-03-07 19:33:27 +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
Colin Cross
8743fc32df
am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
2014-03-07 19:33:07 +00:00
Ben Cheng
21ef9705b6
am f230bcf4
: Merge "OProfile is no longer compiled now."
...
* commit 'f230bcf4035bdbc98e64c769b192c0d33b483913':
OProfile is no longer compiled now.
2014-03-07 08:52:52 -08:00
Ben Cheng
f230bcf403
Merge "OProfile is no longer compiled now."
2014-03-07 16:49:40 +00:00
Ying Wang
16ae8b4dd1
am 5c7039fb
: Merge "Remove dead code."
...
* commit '5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
Remove dead code.
2014-03-07 02:30:02 +00:00
Colin Cross
0a832b24e2
am 7cd7bd65
: (-s ours) Merge topic \'arm64\'
...
* commit '7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239':
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
2014-03-07 02:29:21 +00:00
Ying Wang
2bdf5e97bc
am cd958154
: Merge "Refactor a little bit and do the validation on also default.prop."
...
* commit 'cd958154a5bdb753274a338e799c3ece96ea9c5c':
Refactor a little bit and do the validation on also default.prop.
2014-03-07 02:29:21 +00:00
Ying Wang
0dd00d3d00
am de90b030
: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message."
...
* commit 'de90b0307a603449354bb2d265c5b2315b7b6850':
A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
2014-03-07 02:27:35 +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
Ying Wang
16ce683377
am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
2014-03-07 02:27:02 +00:00
David 'Digit' Turner
41925c4b06
am 145562fc
: Merge "Add missing font files to SDK system images."
...
* commit '145562fcef979e4fea946987717618dba6148aeb':
Add missing font files to SDK system images.
2014-03-07 02:25:51 +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
Ying Wang
f968cb1f3d
am 737a51dd
: Merge "Refactor llvm_config.mk and support the 2nd arch"
...
* commit '737a51dd7294b0443b4f1ac55372310d635c5121':
Refactor llvm_config.mk and support the 2nd arch
2014-03-07 02:25:02 +00:00