aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-07update blacklisted projects listlinaro-juice-masterAmit Pundir
Change-Id: I59dc321ab7caf1b060a9dde1d3521d6fc7283e88 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2014-05-06Merge masterAmit Pundir
* aosp/master: (22 commits) Increase system image size of generic_x86_64 to 750MB. build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config Increase system image size of generic_x86_64 to 650MB. Add WITH_DEXPREOPT to the list of protected global variables. build: add core_64_bit.mk build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set build: split TARGET_PREFER_32_BIT for apps and executables Add -no-integrated-as for ARM64. Remove tblgen and clang-tblgen from prebuilts. Use java_home to determine jdk location. add silvermont x86 architecture Remove libpac and v8 from the 64-bit blacklist. Fix PATH setup for arm64. Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib Build changes necessary for LLVM 3.5 switch. Remove chromium_org and webview from the 64-bit blacklist. Leave 'linux' defined on mips/mips64, like arm. Leave 'linux' defined on x86/x86-64, like arm. Switch to new host prebuilt x86_64-linux-glibc2.11-4.6 Update build system for better Clang behavior on Mac. ... Conflicts: core/combo/HOST_linux-x86.mk Change-Id: Ia47703b331ec5dad2fbfee44c7624abd1fd160bd Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2014-05-06Merge "add silvermont x86 architecture"Ying Wang
2014-05-06Merge "Increase system image size of generic_x86_64 to 750MB."Ying Wang
2014-05-05Increase system image size of generic_x86_64 to 750MB.Ying Wang
Change-Id: I0c3264c7f629bc4d8c30539590de00967188807b
2014-05-05Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"Colin Cross
2014-05-05build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit configColin Cross
Set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS, TARGET_PREFERS_32_BIT_APPS is enough to get apps to build for 32-bit only, and leaving TARGET_SUPPORTS_64_BIT_APPS unset confuses zygote64 because it finds an empty 64-bit ABI list. Change-Id: Iadea7f2b42c216710b54aeac6011a4e30e0f2eaa
2014-05-05Merge changes I7e809264,I504cea21,Ibd2165e6Colin Cross
* changes: build: add core_64_bit.mk build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05Merge "Increase system image size of generic_x86_64 to 650MB."Ying Wang
2014-05-05Increase system image size of generic_x86_64 to 650MB.Ying Wang
Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
2014-05-02Merge "Add -no-integrated-as for ARM64."Tim Murray
2014-05-02Merge "Add WITH_DEXPREOPT to the list of protected global variables."Ying Wang
2014-05-01Add WITH_DEXPREOPT to the list of protected global variables.Ying Wang
Bug: 14380196 Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
2014-05-01build: add core_64_bit.mkColin Cross
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-01build: reverse abi list when TARGET_PREFER_32_BIT_APPS is setColin Cross
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-01Merge "Remove libpac and v8 from the 64-bit blacklist."Torne (Richard Coles)
2014-04-30build: split TARGET_PREFER_32_BIT for apps and executablesColin Cross
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-30Add -no-integrated-as for ARM64.Tim Murray
Change-Id: I7faba190554aa43f43b2eb164bdc7b3bfab68ef0
2014-04-30Merge "Remove tblgen and clang-tblgen from prebuilts."Tim Murray
2014-04-30Remove tblgen and clang-tblgen from prebuilts.Tim Murray
Change-Id: I89fb74da5a516d0f768f72518a401216f8a5b1a8
2014-04-30Merge "Use java_home to determine jdk location."Narayan Kamath
2014-04-30Use java_home to determine jdk location.Jason Parks
Specifying the major version rather than hard coding to a minor version. (cherry-picked from commit 13b2e19ef240804908629ed2e54a98ec9dede337) Change-Id: Ie2c08d35fcff2129b26c1dfa8a2e5cd7b19c4b49
2014-04-30add silvermont x86 architectureAndrew Boie
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-29Remove libpac and v8 from the 64-bit blacklist.Torne (Richard Coles)
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-28Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"Andrew Hsieh
2014-04-28Merge "Fix PATH setup for arm64."Torne (Richard Coles)
2014-04-28Fix PATH setup for arm64.Torne (Richard Coles)
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-25Rename my_ndk_version_root to my_ndk_sysroot; and _include and _libAndrew Hsieh
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-25Merge "include LGPL projects in GPL archives"Ying Wang
2014-04-25Merge "Build changes necessary for LLVM 3.5 switch."Stephen Hines
2014-04-24Build changes necessary for LLVM 3.5 switch.Tim Murray
Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03 Conflicts: core/clang/arm.mk
2014-04-24Merge "Leave 'linux' defined on x86/x86-64, like arm."Elliott Hughes
2014-04-24Merge "Leave 'linux' defined on mips/mips64, like arm."Elliott Hughes
2014-04-24Merge "Remove chromium_org and webview from the 64-bit blacklist."Torne (Richard Coles)
2014-04-24Remove chromium_org and webview from the 64-bit blacklist.Torne (Richard Coles)
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-23Leave 'linux' defined on mips/mips64, like arm.Elliott Hughes
Change-Id: Idf1e781c34d45d1e20b7e5542d79201ae93668fe
2014-04-23Leave 'linux' defined on x86/x86-64, like arm.Elliott Hughes
Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
2014-04-24Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"Andrew Hsieh
2014-04-23Switch to new host prebuilt x86_64-linux-glibc2.11-4.6Andrew Hsieh
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
2014-04-23Merge "Update build system for better Clang behavior on Mac."Ying Wang
2014-04-22Update build system for better Clang behavior on Mac.Tim Murray
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
2014-04-22Merge "Make the zygote 64-bit for the x86-64 emulator."Ian Rogers
2014-04-21Merge masterAmit Pundir
* aosp/master: Update rules to install JNI libraries. For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled. Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)" Use aarch64-linux-android-4.9 for arm64 build (attempt #3) Explicitly link libstdc++.a for static gtest executables.
2014-04-18Make the zygote 64-bit for the x86-64 emulator.Ian Rogers
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
2014-04-18Merge "Update rules to install JNI libraries."Ying Wang
2014-04-18Update rules to install JNI libraries.Ying Wang
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-18Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled."Ian Rogers
2014-04-18For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.Ian Rogers
Change-Id: Ia95d74517f8182031d6044ae55559010a98ec5ca
2014-04-18Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""Ben Cheng
2014-04-18Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"Ben Cheng
This reverts commit 084a7f83875d030c2e4819bed386c4a16168e731. GCC 4.9 still has stability issues (b/14160872) Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271