Commit graph

15964 commits

Author SHA1 Message Date
Tim Murray
cf53e0e0aa am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '27fe940676b568bb9a0af889028495fab73853f2':
  Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:54:08 +00:00
Tim Murray
27fe940676 am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '7e65b6c1e53a51db0aa65126f2453f27daa0f22f':
  Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:52:33 +00:00
Tim Murray
7e65b6c1e5 Merge "Remove tblgen and clang-tblgen from prebuilts." 2014-04-30 21:49:35 +00:00
Tim Murray
75b58cc827 Remove tblgen and clang-tblgen from prebuilts.
Change-Id: I89fb74da5a516d0f768f72518a401216f8a5b1a8
2014-04-30 13:54:32 -07:00
Narayan Kamath
7d26e97e7f am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."
* commit '3f1d1608ebc4a0c307c94b67943bee004d8428a1':
  Use java_home to determine jdk location.
2014-04-30 15:37:38 +00:00
Narayan Kamath
3f1d1608eb am 475a3d17: Merge "Use java_home to determine jdk location."
* commit '475a3d17d7594ee2b8bcf1ac826c490b49f116df':
  Use java_home to determine jdk location.
2014-04-30 15:12:53 +00:00
Narayan Kamath
475a3d17d7 Merge "Use java_home to determine jdk location." 2014-04-30 10:45:51 +00:00
Jason Parks
30cfbd756b Use java_home to determine jdk location.
Specifying the major version rather than hard coding
to a minor version.

(cherry-picked from commit 13b2e19ef2)

Change-Id: Ie2c08d35fcff2129b26c1dfa8a2e5cd7b19c4b49
2014-04-30 11:43:00 +01:00
Bill Yi
6a27520295 am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD
* commit '1e4adfa837c77dc2dcb73ce2c0b32bf362e80000':
  Try to catch more misuse of $(my-dir).
  Revert "Remove external/chromium from the 64 bit blacklist."
  Remove external/chromium from the 64 bit blacklist.
  OProfile is no longer compiled now.
  Amend 64 bit blacklist.
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
  Remove external/tcpdump from 64-bit build blacklist.
  oprofile/daemon doesn't build for x86_64.
  Remove external/wpa_supplicant_8 and external/android-clat
  Take libcore off the LP64 blacklist.
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures
2014-04-30 00:49:23 +00:00
Bill Yi
1e4adfa837 Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD 2014-04-29 11:32:53 -07:00
Andrew Hsieh
d815dbd134 am f14ba5b9: am 8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit 'f14ba5b93583b33ad47b22b9de07c3907b8b5074':
  Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
2014-04-29 00:12:01 +00:00
Andrew Hsieh
f14ba5b935 am 8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '8afa25552efb51286fe0f010f0bf78fea71fc12a':
  Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
2014-04-29 00:08:21 +00:00
Andrew Hsieh
8afa25552e Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib" 2014-04-28 22:52:49 +00:00
Torne (Richard Coles)
93d0245bc9 am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."
* commit '5646d2f6aa851ca79440d573e73fa51cf6afaf81':
  Fix PATH setup for arm64.
2014-04-28 16:06:24 +00:00
Torne (Richard Coles)
5646d2f6aa am 7250b63a: Merge "Fix PATH setup for arm64."
* commit '7250b63a1a3e726aa83e2351b23f2d0c79903247':
  Fix PATH setup for arm64.
2014-04-28 16:00:30 +00:00
Torne (Richard Coles)
7250b63a1a Merge "Fix PATH setup for arm64." 2014-04-28 15:54:24 +00:00
Torne (Richard Coles)
f24c356a96 Fix PATH setup for arm64.
On architectures other than "arm", the combination of
ANDROID_KERNEL_TOOLCHAIN_PATH being empty, and CODE_REVIEWS being empty,
leads to adding a :: into the user's PATH, which is highly undesirable.

Neither CODE_REVIEWS nor the mips toolchaindir is ever used, so just
remove them, and make sure we only include the extra colon when setting
the kernel toolchain path to a non-empty value.

Change-Id: I2dfa7d3a322b56b6abbc47476082dc6ae4dd6a82
2014-04-28 15:25:21 +01:00
Andrew Hsieh
140761af09 Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
prebuilts/ndk/current/platforms/android-19/arch-x86_64/usr/lib
is renamed to usr/lib64 to be more consistent with rest of
lib paths in x86_64 toolchain, which is multilib

See https://android-review.googlesource.com/#/c/92441/

Change-Id: I4e59245505d0fa87ae3608e81e715ccfcecc5ec8
2014-04-25 23:47:10 -07:00
Ying Wang
d4cc9dad6c am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"
* commit '1427f872b99c4e019fe0b5a75a283bed68814204':
  include LGPL projects in GPL archives
2014-04-25 22:03:07 +00:00
Ying Wang
1427f872b9 am 676e11fe: Merge "include LGPL projects in GPL archives"
* commit '676e11fed82c5a4afb02d1082472fad14e625915':
  include LGPL projects in GPL archives
2014-04-25 21:59:35 +00:00
Ying Wang
676e11fed8 Merge "include LGPL projects in GPL archives" 2014-04-25 21:56:27 +00:00
Stephen Hines
f0dda8d0cb am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '9661b09ff1fb43014d7777b391531ebe59dd83bc':
  Build changes necessary for LLVM 3.5 switch.
2014-04-25 20:57:30 +00:00
Stephen Hines
9661b09ff1 am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '9956bb6aebf5084b730e9f4ac4d00b3a7c4a2f27':
  Build changes necessary for LLVM 3.5 switch.
2014-04-25 20:53:02 +00:00
Stephen Hines
9956bb6aeb Merge "Build changes necessary for LLVM 3.5 switch." 2014-04-25 20:47:33 +00:00
Ying Wang
0a694f4c57 am c564b691: Remove libs from target/product/base.mk.
* commit 'c564b691d55d4dcede7ce46248b1a87acf3d2618':
  Remove libs from target/product/base.mk.
2014-04-25 16:13:55 +00:00
Ying Wang
c564b691d5 Remove libs from target/product/base.mk.
LatinIME has libjni_latinime as dependency, so we don't need it in
PRODUCT_PACKAGES;
Moved libpac close to PacProcesser, which requires libpac.

Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
2014-04-24 17:12:58 -07:00
Tim Murray
43d5e1bbc4 Build changes necessary for LLVM 3.5 switch.
Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03

Conflicts:
	core/clang/arm.mk
2014-04-24 13:14:32 -07:00
Elliott Hughes
bb21bfb090 am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '7cad688ea267df86ceb9c7fbfd6bc463af4580b1':
  Leave 'linux' defined on x86/x86-64, like arm.
2014-04-24 16:27:28 +00:00
Elliott Hughes
7cad688ea2 am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '847fd0311f6c82b8ac90d970cfc68aafd9913471':
  Leave 'linux' defined on x86/x86-64, like arm.
2014-04-24 16:23:42 +00:00
Elliott Hughes
439f279d0c am 62911d47: am 1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '62911d473e0798a626cdf8773eab0a7f6c461d1b':
  Leave 'linux' defined on mips/mips64, like arm.
2014-04-24 16:23:33 +00:00
Elliott Hughes
62911d473e am 1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '1076c5685b1f1dd0f8b691466f6e16259722ca56':
  Leave 'linux' defined on mips/mips64, like arm.
2014-04-24 16:20:02 +00:00
Elliott Hughes
847fd0311f Merge "Leave 'linux' defined on x86/x86-64, like arm." 2014-04-24 16:19:17 +00:00
Elliott Hughes
1076c5685b Merge "Leave 'linux' defined on mips/mips64, like arm." 2014-04-24 16:16:06 +00:00
Torne (Richard Coles)
04a6aa2648 am 081c1c59: am 3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '081c1c5943aacb3cb05615793ecc33a75ae26b17':
  Remove chromium_org and webview from the 64-bit blacklist.
2014-04-24 15:58:52 +00:00
Torne (Richard Coles)
081c1c5943 am 3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '3467048f3f5a483ca2fff529ebd4c8d3b7827143':
  Remove chromium_org and webview from the 64-bit blacklist.
2014-04-24 15:53:33 +00:00
Torne (Richard Coles)
3467048f3f Merge "Remove chromium_org and webview from the 64-bit blacklist." 2014-04-24 15:49:45 +00:00
Torne (Richard Coles)
0933cf22fc Remove chromium_org and webview from the 64-bit blacklist.
external/chromium_org has been updated to handle 64-bit architectures
correctly in its makefiles; remove it from the blacklist so we can start
experimenting with building a 64/32 multilib version.

Change-Id: Ieb0e4f3cfea1578e01954c4656df90cd8d36b8cc
2014-04-24 13:30:47 +01:00
Andrew Hsieh
aabe27ccfd am 9754735f: am db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit '9754735f7e86bd7647796a6d804c18e6be94675c':
  Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
2014-04-24 09:02:32 +00:00
Elliott Hughes
1acd8b0552 Leave 'linux' defined on mips/mips64, like arm.
Change-Id: Idf1e781c34d45d1e20b7e5542d79201ae93668fe
2014-04-23 23:24:36 -07:00
Elliott Hughes
2c8e95528c Leave 'linux' defined on x86/x86-64, like arm.
Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
2014-04-23 23:09:30 -07:00
Andrew Hsieh
9754735f7e am db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit 'db55f602be5434c0a2b7ffdfe601878d910f0914':
  Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
2014-04-24 01:06:42 +00:00
Andrew Hsieh
db55f602be Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6" 2014-04-24 00:40:28 +00:00
Andrew Hsieh
dfde360b2c Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
2014-04-23 14:47:00 -07:00
Ying Wang
ad60c86eda am f1a3d5e8: am 871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit 'f1a3d5e8ab2064f9ab4ba3d1a6d594c1905624da':
  Update build system for better Clang behavior on Mac.
2014-04-23 00:17:31 +00:00
Ying Wang
f1a3d5e8ab am 871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit '871bc703e57d5b7629c043a54f5ac2614a17981b':
  Update build system for better Clang behavior on Mac.
2014-04-23 00:15:12 +00:00
Ying Wang
871bc703e5 Merge "Update build system for better Clang behavior on Mac." 2014-04-23 00:12:07 +00:00
Tim Murray
d318ba66f9 Update build system for better Clang behavior on Mac.
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
2014-04-22 09:26:22 -07:00
Ian Rogers
77efd7b4cd am f1d5dcdd: am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."
* commit 'f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
  Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:45:44 +00:00
Ian Rogers
f1d5dcdd30 am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."
* commit '850299f6a6a831d47af68a3004a62df21b5fee3a':
  Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:43:04 +00:00
Ian Rogers
850299f6a6 Merge "Make the zygote 64-bit for the x86-64 emulator." 2014-04-22 15:41:32 +00:00