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
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
Colin Cross
ef28912a41
am 5e9a2033
: Merge "don\'t rename 32-bit packages to *_32"
...
* commit '5e9a20337e1110868296c27f201e4579e5e3fb9e':
don't rename 32-bit packages to *_32
2014-03-07 02:24:36 +00:00
Elliott Hughes
aa2143f02c
am 8b20d5b9
: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
...
* commit '8b20d5b97e98ddac6031cb555078f425aef1da8f':
Turn 64-bit-related warnings into errors on 64-bit builds.
2014-03-07 02:24:09 +00:00
Elliott Hughes
17a1e7a412
am efb9603a
: Merge "[MIPS64] Add mips64 target"
...
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
[MIPS64] Add mips64 target
2014-03-07 02:24:02 +00:00
Christopher Ferris
1277559bf5
am afbbce3f
: Merge "Add library test makefile solutions."
...
* commit 'afbbce3ff1d2d94e54f48d748d18796ce671fce9':
Add library test makefile solutions.
2014-03-07 02:23:40 +00:00
Colin Cross
80c83d993c
am 054b0274
: Merge topic \'arm64\'
...
* commit '054b0274fc27babb42a60002ad25c9e608eac257':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
2014-03-07 02:23:36 +00:00
Colin Cross
b9ad6792c0
am 717de0f5
: Merge "Fix installing 2nd arch shared libraries"
...
* commit '717de0f553dc3c1a2baa0cc988af1adc5b26dba8':
Fix installing 2nd arch shared libraries
2014-03-07 02:23:35 +00:00
Tim Murray
94f1e3055c
am 5352018b
: Merge "Add new rs directory to list of Java subdirs of fw/base."
...
* commit '5352018b0b115061bce7a2aac14780ffea3885c7':
Add new rs directory to list of Java subdirs of fw/base.
2014-03-07 01:34:31 +00:00
Ying Wang
a4ec5e6c67
am a77456b8
: Merge "Dedup the targets and dependencies of required modules."
...
* commit 'a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
Dedup the targets and dependencies of required modules.
2014-03-07 01:34:08 +00:00
Brian Carlstrom
b04562ad0f
am 601d39b6
: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit '601d39b688bcbb1789e145d1b72753206c24d374':
build: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:15 +00:00
Ian Rogers
9022dde627
am e854276d
: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
...
* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
Disable WITH_HOST_DALVIK on 64bit host builds.
2014-03-06 22:58:26 +00:00
Narayan Kamath
0a468d6ef7
am ad9209ad
: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
...
* commit 'ad9209adff8d2f94c57387ee3d3abcff28049091':
Define __STDC_FORMAT_MACROS on Windows host builds.
2014-03-06 22:58:05 +00:00
Colin Cross
536405b6a0
am a8e6166f
: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
...
* commit 'a8e6166fa482782719dce28a9ae1869f017e7cee':
build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
2014-03-06 20:23:42 +00:00
Colin Cross
56390a16fc
am 2dcaf9f4
: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
...
* commit '2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
build: support LOCAL_*_32 and LOCAL_*_64
2014-03-06 20:23:41 +00:00
Ian Rogers
249f8e0bf1
am 805cb8fa
: Merge "Fix the host inttypes.h problem globally."
...
* commit '805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
Fix the host inttypes.h problem globally.
2014-03-06 20:23: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
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
Colin Cross
4febec1227
Merge "x86: set -msse2 for all builds"
2014-02-19 01:00:33 +00:00
Colin Cross
4aa263f2be
x86: set -msse2 for all builds
...
All supported x86 processors have SSE2.
Change-Id: Ib4a0511c456fe3185b0b902390860ad557aeedcf
2014-02-18 15:49:48 -08:00
Pavel Chupin
c562742e0b
Switch x86_64 to gcc-4.8
...
x86 is already on gcc-4.8
Change-Id: I39b4298b705a6ad04cdaa434261c6b0d90d552ff
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2014-02-18 17:02:36 +04:00
Narayan Kamath
2bea94bac7
Merge "Fix up android.core CTS tests."
2014-02-17 12:25:26 +00:00
Narayan Kamath
70a4a6a332
Merge "changing the rules following java package renaming for external/apache-harmony."
2014-02-17 12:25:24 +00:00
Narayan Kamath
d4dc88b0f5
Merge "Adding apache-harmony to cts."
2014-02-17 12:25:21 +00:00
Narayan Kamath
92e99b128d
Merge "add jsr166 tests to cts. Bug: 10390711"
2014-02-17 12:25:19 +00:00
Narayan Kamath
ba0b0e71ae
Fix up android.core CTS tests.
...
Fix several wrongly configured tests that were either
looking for tests in the wrong jar (apache-harmony-tests
instead of core-tests) or using the wrong prefix.
Also, this change creates subsets of the harmony tests based
on subpackage names (java.net, java.io, java.nio etc.) instead
of the earlier harmony groupings.
Change-Id: Iea0e20d23512611d1aac92b2f8219031b6396c77
2014-02-17 12:09:24 +00:00
Tsu Chiang Chuang
7d42d0f251
changing the rules following java package renaming for
...
external/apache-harmony.
(cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a)
Change-Id: Ia5a7b2d401f23dfdc556ef1982efd441ed1d1ae2
2014-02-17 12:09:13 +00:00
Tsu Chiang Chuang
9c648df491
Adding apache-harmony to cts.
...
(cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6)
Change-Id: I9a6595f5e8bc30654a062e0917d3ecd3ba28ebc7
2014-02-17 12:08:59 +00:00
Tsu Chiang Chuang
4e189b08f3
add jsr166 tests to cts.
...
Bug: 10390711
Change-Id: I512770e98f61995fc33043d35562dc3b213a4930
2014-02-17 12:08:39 +00:00
Qiming Shi
310324d28a
Fix x86 config file to support 2nd ARCH build
...
Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 17:46:48 +08:00