Commit graph

15821 commits

Author SHA1 Message Date
Colin Cross
75b29ae078 build: add core_64_bit.mk
Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.

Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.

Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
2014-05-01 10:56:12 -07:00
Colin Cross
2a4f0ff32f build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
If the product prefers 32-bit apps signal that preference to
PackageManager by reversing the abi list.

Also uses the absence of TARGET_SUPPORTS_32_BIT_APPS and
TARGET_SUPPORTS_64_BIT_APPS to remove those ABIs from the
ABI list.

Change-Id: I504cea21b6f800a7a9e7706b4a7123d3fb07c383
2014-05-01 10:55:43 -07:00
Torne (Richard Coles)
f0b5bfec7b am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit 'a0267df234db59d34891a01e0761233abc9ae4b1':
  Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:20:19 +00:00
Torne (Richard Coles)
a0267df234 Merge "Remove libpac and v8 from the 64-bit blacklist." 2014-05-01 09:17:26 +00:00
Colin Cross
a3339e98e6 build: split TARGET_PREFER_32_BIT for apps and executables
Introduce two new flags, TARGET_PREFER_32_BIT_APPS and
TARGET_PREFER_32_BIT_EXECUTABLES that individually control
compilation of apps and executables.  If TARGET_PREFER_32_BIT is
set, the build system will automatically set both new flags.

Change-Id: Ibd2165e688675c2884d9e7ddf82d7dd6c28521f3
2014-04-30 18:18:59 -07:00
Tim Murray
6f144b8f65 Add -no-integrated-as for ARM64.
Change-Id: I7faba190554aa43f43b2eb164bdc7b3bfab68ef0
2014-04-30 15:55:52 -07: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
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
1e4adfa837 Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD 2014-04-29 11:32:53 -07:00
Andrew Boie
155fc8b5fe add silvermont x86 architecture
This is used for Baytrail targets.

Change-Id: I5a2fa6dbb8217a326ee09f5ea434885718ab3f0c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
2014-04-30 01:23:25 +08:00
Torne (Richard Coles)
91d4944434 Remove libpac and v8 from the 64-bit blacklist.
external/chromium-libpac has been updated to depend on the copy of V8 in
external/chromium_org, and its makefiles updated to be multilib-safe.
external/v8 is thus unused and has been removed from the tree.

Bug: 12452053
Change-Id: I757fa187f7f67cd9a89d4b228d4ce3ed6d2858b1
2014-04-29 10:23:56 +01: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
Robert Craig
65dad28716 Include selinux_version file with builds.
The selinux_version file is used to perform policy
versioning checks by libselinux and SELinuxMMAC. When
loading policy a check is first performed to determine
if the policy out in /data/security/current should be
used to override the base policy shipped with the device.
The selinux_version file is used to make that choice. The
contents of the file simply contains the BUILD_ID that
the policy was built against. A simple string comparison
is then performed by libselinux and SELinuxMMAC.

Change-Id: I69d9d071743cfd46bb247c98f94a193396f8ebbd
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-04-28 22:05:54 +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
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
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
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
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
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)
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
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
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
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
Ian Rogers
d4186e8c1f Make the zygote 64-bit for the x86-64 emulator.
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
2014-04-18 17:09:33 -07:00
Ying Wang
a59c2935bc am 488b23d9: Merge "Update rules to install JNI libraries."
* commit '488b23d96dc796e457d8df4d7775cefcf68320af':
  Update rules to install JNI libraries.
2014-04-18 23:59:52 +00:00
Ying Wang
488b23d96d Merge "Update rules to install JNI libraries." 2014-04-18 23:54:43 +00:00
Ying Wang
695e826a0c Update rules to install JNI libraries.
Previously we have to use LOCAL_REQUIRED_MODULES to install jni
libraries for an apk in bundled build.
With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to
install jni shared libraries.

The new rules are:
- If we are doing unbundled build, or the apk isn't going to be
  installed to system partitions, we'll embed the jni libs in the
  built apk.
- Otherwise, the jni libraries will be installed to the system
  lib path, and symlinks created in the app specific lib path.

Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
2014-04-18 16:36:19 -07:00
Ian Rogers
9b3fb2c32b am 67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit '67c209281ff0454213bc117691214bc67ad5a7f2':
  For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
2014-04-18 23:15:17 +00:00
Ian Rogers
67c209281f Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled." 2014-04-18 23:10:31 +00:00