Commit graph

14872 commits

Author SHA1 Message Date
Tim Murray
254a88b957 Merge "Switch to LLVM 3.4 prebuilts in AOSP." 2014-02-21 21:52:15 +00:00
Colin Cross
b3bc61365b Merge "arm64: don't build emulator" 2014-02-20 22:49:32 +00:00
Colin Cross
15b1c8377d arm64: don't build emulator
There is no emulator kernel yet, so don't try to build the emulator.

Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764
2014-02-20 14:39:09 -08:00
Ying Wang
9aadde6734 Merge "Include $(BUILD_COPY_HEADERS) in upper-level makefiles" 2014-02-20 22:24:09 +00:00
Ying Wang
bf4a8d3069 Include $(BUILD_COPY_HEADERS) in upper-level makefiles
This makes sure copy_headers.mk only be included onces, no matter
it's for the 1st arch or the 2nd arch.

Change-Id: I80a558fbdb52861f176bd27a21c302069a5cc3ce
2014-02-20 13:54:43 -08:00
Ying Wang
9335001d5d Merge "Strip all symbols on x86" 2014-02-20 18:31:07 +00:00
Ying Wang
e72beb53a8 Merge "Remove dead code." 2014-02-20 18:30:51 +00:00
Ying Wang
f9538ea626 Merge "Add missing $(combo_2nd_arch_prefix)s to mips." 2014-02-20 04:31: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
3da7b96a39 Remove dead code.
It seems the code was meant to add the toolchain to ANDROID_BUILD_PATHS
and then export to PATH by lunch.
But now we export the toolchain to PATH explicitly in envsetup.sh and
the code is unnecessary.
This reduces the places to change when we upgrade the gcc version.
It also fixed the bug that the mips toolchain was always exported
regardless of the target arch.

Change-Id: Iee3b895b4c4e0df8971c27c01b9ecbd591848b12
2014-02-19 18:25:55 -08:00
C. Sean Young
b47c863ec7 Strip all symbols on x86
Strip all of the non-dynamic symbols on x86 targets,
instead of just the debug symbols.

Change-Id: Id799a6a8c8b0e8bf70977328e42e5efa23762f25
2014-02-19 12:53:43 -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
Stephen Hines
7bc754bca9 Switch to LLVM 3.4 prebuilts in AOSP.
Change-Id: I064e953fb1bf69e7e321616647aab88dcc39af76
2014-02-19 09:03:00 -08: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
Stephen Hines
f1ad4d2d2e Merge "Add bcc to the list of PRODUCT_PACKAGES to install." 2014-02-18 23:05:42 +00:00
Stephen Hines
816b86f759 Add bcc to the list of PRODUCT_PACKAGES to install.
Bug: 7342767

As part of the process of sandboxing the online RenderScript compiler, we
need to install bcc.

Change-Id: Ia650bdcb760246f3f1e15ebb867f07d9802cdfbe
2014-02-18 14:21:39 -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
Ying Wang
872d3c2c6a Merge "gettop: fix symlink detection" 2014-02-14 21:20:17 +00:00
Stephen Hines
051e28fe21 Merge "Fix incorrect x86 build rules." 2014-02-14 20:32:30 +00:00
Colin Cross
a9baf8795e Merge "fix build" 2014-02-14 00:44:30 +00:00
Colin Cross
3a14c87520 fix build
Include prebuilt_internal.mk for host builds.

Change-Id: I750d6f71b3a2c67b11536babb8b39060005f4ff4
2014-02-13 16:41:52 -08:00
Colin Cross
2fbe5018f9 Merge "add linker64 and debuggerd64 to all products" 2014-02-14 00:24:47 +00:00
Colin Cross
3bbaab3106 Merge changes I2514f66f,I71fed98d
* changes:
  support LOCAL_MODULE_TARGET_ARCH for prebuilts
  Add generated sources dir to the default include path
2014-02-14 00:24:16 +00:00
Colin Cross
381435353d add linker64 and debuggerd64 to all products
Add linker64 and debuggerd64 to embedded.mk.  They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.

Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
2014-02-13 16:23:33 -08:00
Ying Wang
e2f06adb88 Merge "Don't check the existence for the 64-bit modules for 32-bit SDK build." 2014-02-14 00:03:13 +00:00
Ying Wang
940d68af53 Don't check the existence for the 64-bit modules for 32-bit SDK build.
Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc
2014-02-13 15:56:34 -08:00
Colin Cross
e18cb93e48 support LOCAL_MODULE_TARGET_ARCH for prebuilts
Prebuilts often support only a single architecture, allow them to
use LOCAL_MODULE_TARGET_ARCH to specify it.

Change-Id: I2514f66f682ef267bbf1a1ab78510faff0a18b64
2014-02-13 15:36:41 -08:00
Colin Cross
2d20670380 Add generated sources dir to the default include path
Change-Id: I71fed98dfbc0bf5efad069a251eee2e5ab2e5fe6
2014-02-13 15:36:41 -08:00
Colin Cross
7ea5cd95b8 Merge "don't use LOCAL_*_arch for host builds" 2014-02-13 23:00:40 +00:00
Colin Cross
f4f2fbe220 don't use LOCAL_*_arch for host builds
The LOCAL_*_$(TARGET_ARCH) variables don't make sense for host
modules, only append use them for target modules.

Also complete the list of LOCAL_*_arch and LOCAL_*_32/64 to be
consistent.

Change-Id: I00c83e5c4e08ed9a844f9f99a79ce4bcc3f0bf11
2014-02-13 13:48:23 -08:00
Colin Cross
f10efbc15e Merge "make 64-bit builds into multiarch builds" 2014-02-13 21:15:00 +00:00
Stephen Hines
6d5dd2367a Fix incorrect x86 build rules.
combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their
linker command lines. This results in clang builds not working properly,
since they strip some unknown flags from TARGET_GLOBAL_CFLAGS.

Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
2014-02-13 09:24:29 -08:00
Colin Cross
930b5fbcb9 make 64-bit builds into multiarch builds
Also enable the 64-bit binder interface and make them only use ART.

Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
2014-02-12 19:49:47 -08:00
Ying Wang
5c7039fb06 Merge "Remove dead code." 2014-02-13 01:39:41 +00:00
Ying Wang
dc6bb0477d Remove dead code.
Change-Id: Ia36a04037e15cbf296f375f3ece9a7e977fdca1e
2014-02-12 17:38:46 -08:00
Colin Cross
7cd7bd65fd Merge topic 'arm64'
* changes:
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures
2014-02-12 20:57:25 +00:00
Ying Wang
cd958154a5 Merge "Refactor a little bit and do the validation on also default.prop." 2014-02-12 20:56:31 +00:00
Colin Cross
02e31d240a HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-02-12 12:17:55 -08:00
Colin Cross
8e4041271d 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-02-12 12:17:55 -08:00