summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update build system for better Clang behavior on Mac."Ying Wang2014-04-233-8/+16
|\
| * Update build system for better Clang behavior on Mac.Tim Murray2014-04-223-8/+16
| | | | | | | | Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
* | Merge "Make the zygote 64-bit for the x86-64 emulator."Ian Rogers2014-04-222-1/+5
|\ \ | |/ |/|
| * Make the zygote 64-bit for the x86-64 emulator.Ian Rogers2014-04-182-1/+5
| | | | | | | | Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
* | Merge "Update rules to install JNI libraries."Ying Wang2014-04-183-44/+89
|\ \ | |/ |/|
| * Update rules to install JNI libraries.Ying Wang2014-04-183-44/+89
|/ | | | | | | | | | | | | | | | 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
* Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled."Ian Rogers2014-04-182-4/+20
|\
| * For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.Ian Rogers2014-04-182-4/+20
| | | | | | | | Change-Id: Ia95d74517f8182031d6044ae55559010a98ec5ca
* | Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""Ben Cheng2014-04-181-5/+6
|\ \ | |/ |/|
| * Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"Ben Cheng2014-04-181-5/+6
| | | | | | | | | | | | | | | | This reverts commit 084a7f83875d030c2e4819bed386c4a16168e731. GCC 4.9 still has stability issues (b/14160872) Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
* | Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"Ben Cheng2014-04-171-6/+5
|\ \ | |/
| * Use aarch64-linux-android-4.9 for arm64 build (attempt #3)Ben Cheng2014-04-161-6/+5
|/ | | | | | | | | | | | GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7 NDK libraries are still picked up from prebuilts/ndk/*/4.8/* GCC has been patched to disable codegen for calling __cxa_throw_bad_array_new_length. Change-Id: Ie0bf38357c0cf3d265d8b5dd3c2b8a8fd83b1de1
* Merge "Explicitly link libstdc++.a for static gtest executables."Ben Cheng2014-04-161-0/+1
|\
| * Explicitly link libstdc++.a for static gtest executables.Ben Cheng2014-04-161-0/+1
| | | | | | | | Change-Id: I29e3a4036264acd00dfa3229c9d0fc52ee20830e
* | Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord ↵Ying Wang2014-04-154-3/+3
|\ \ | | | | | | | | | from SDK build."
| * | Remove libGLES_android from non-emulator builds; Remove screenrecord from ↵Ying Wang2014-04-154-3/+3
| |/ | | | | | | | | | | | | | | SDK build. Bug: 11368415 Bug: 14087863 Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
* | Merge "Add -Wl,-maarch64linux"Andrew Hsieh2014-04-151-0/+1
|\ \ | |/ |/|
| * Add -Wl,-maarch64linuxAndrew Hsieh2014-04-151-0/+1
|/ | | | | | | | | | | The "-maarch64linux" switch is needed before aarch64-*4.8 is rebuilt with backport of upstream patch, see https://android-review.googlesource.com/#/c/91099/ The existing ld.bfd is fine because it's configured to support aarch64linux only. ld.mcld (see https://android-review.googlesource.com/#/c/91047) needs explicit emulation switch because it supports multiple targets Change-Id: Idc1a491c5722ea9e26db917b667b1000bccc1f60
* Merge ""desktop" linux has Posix clocks."Narayan Kamath2014-04-151-4/+1
|\
| * "desktop" linux has Posix clocks.Narayan Kamath2014-04-101-4/+1
| | | | | | | | Change-Id: I90885a2bbb65f14f774ae72b2ca6738176bf0341
* | Merge "build: remove LOCAL_NO_2ND_ARCH"Colin Cross2014-04-122-14/+2
|\ \
| * | build: remove LOCAL_NO_2ND_ARCHColin Cross2014-04-112-14/+2
| | | | | | | | | | | | | | | | | | | | | Delete LOCAL_NO_2ND_ARCH, it is no longer used. Equivalent functionality is available with LOCAL_MULTILIB := first. Change-Id: I36838a8a7e10b0a59ca0022c4c8a3a190e782c71
* | | Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""Ben Cheng2014-04-111-5/+6
|\ \ \ | |/ / |/| |
| * | Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"Ben Cheng2014-04-111-5/+6
| | | | | | | | | | | | | | | | | | | | | This reverts commit 1ae9b213eb5648205223e4b825f4c808a5d2ace8. Sigh... new warnings found by 4.9 break checkbuild. Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
* | | Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"Ben Cheng2014-04-111-6/+5
|\ \ \ | |/ /
| * | Use aarch64-linux-android-4.9 for arm64 build (attempt #2)Ben Cheng2014-04-111-6/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7 NDK libraries are still picked up from prebuilts/ndk/*/4.8/* GCC has been patched to disable codegen for calling __cxa_throw_bad_array_new_length. Change-Id: Ie647fc4c6b227d6bee792f04d5c2f02eb0099559
* | Merge "Decouple platform compiler and NDK library versioning."Ben Cheng2014-04-117-3/+21
|\ \
| * | Decouple platform compiler and NDK library versioning.Ben Cheng2014-04-107-3/+21
| | | | | | | | | | | | | | | | | | | | | TARGET_GCC_VERSION: select compiler from prebuilts/gcc/... TARGET_NDK_GCC_VERSION: select libraries from prebuilts/ndk/... Change-Id: I4422a42cdc97aa92b40798014cba82c3c123bbd2
* | | Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75Colin Cross2014-04-115-32/+76
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * changes: build: remove packages/ from 64-bit blacklist build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS build: add support for LOCAL_MULTILIB := 64 build: fix TARGET_PREFER_32_BIT
| * | build: remove packages/ from 64-bit blacklistColin Cross2014-04-101-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Everything under packages/ will build for 64-bit now, and package.mk has been updated to not produce 64-bit libraries on devices that don't support them (all of them right now). Change-Id: I2c10e41f727cfc8fe237819308a6dfa34c4fff3f
| * | build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPSColin Cross2014-04-101-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS to determine which native libraries to build for an app. If both are set, it will use 64-bit unless TARGET_PREFER_32_BIT is set. If only one is set, it will only build apps that work on that architecture. If neither is set it will fall back to only building 32-bit apps. On existing 32-bit devices neither variable will be set, and the build system will continue to build 32-bit apps. Once a device has support for a 64-bit runtime, the same logic that selects the dual runtimes should set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS, and packages will be built for the preferred arch, or fall back to the non-preferrred arch if necessary. For testing, a device may set TARGET_SUPPORTS_64_BIT_APPS without TARGET_SUPPORTS_32_BIT_APPS to produce only 64-bit apps. Change-Id: I5b5e23f15602c3cf9bd96791971208a85492c7a3
| * | build: add support for LOCAL_MULTILIB := 64Colin Cross2014-04-102-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | I don't expect it to be useful for modules, but package.mk will use it to only install 64-bit native apps on devices that only have a 64-bit zygote. Change-Id: If3f5a81c3a60bd13fa6ded08e2a7579a29877324
| * | build: fix TARGET_PREFER_32_BITColin Cross2014-04-102-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TARGET_PREFER_32_BIT can't assume that the 32-bit rule is allowed, it needs to try the 32-bit rule first, then fall back to the 64-bit rule in case the module specifies LOCAL_MODULE_TARGET_ARCH or LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH to disallow the 32-bit build. Also port TARGET_PREFER_32_BIT to package.mk. Change-Id: I07520b75c4ee11a1e95a82b3afa2a33d4907eb04
* | | Merge "gdbclient: use 64-bit suffix for all library symbols"Colin Cross2014-04-101-1/+3
|\ \ \ | |/ / |/| |
| * | gdbclient: use 64-bit suffix for all library symbolsColin Cross2014-04-101-1/+3
|/ / | | | | | | | | | | | | Correct the solib-search-path for 64-bit to look in /system/lib64 for all libraries including those in subdirectories. Change-Id: I606a0eae1137a857564facc79306ad83097d9659
* | Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""Ben Cheng2014-04-101-5/+6
|\ \
| * | Revert "Use aarch64-linux-android-4.9 for arm64 build."Ben Cheng2014-04-101-5/+6
| | | | | | | | | | | | | | | | | | This reverts commit 6154690d8615995b961530479ddc1a34946efe49. Change-Id: I7427ad6ca1f74ad632229348bac31ebdbc0590ad
* | | Merge "Use aarch64-linux-android-4.9 for arm64 build."Ben Cheng2014-04-101-6/+5
|\ \ \ | |/ / | | / | |/ |/|
| * Use aarch64-linux-android-4.9 for arm64 build.Ben Cheng2014-04-091-6/+5
| | | | | | | | | | | | | | Change-Id: I63e1b54947326fb5da07af7691d4729bcbf99ac1 GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7
* | Merge "Increase the maximum javac heap size again."Ying Wang2014-04-091-1/+1
|\ \ | |/ |/|
| * Increase the maximum javac heap size again.Ying Wang2014-04-091-1/+1
|/ | | | Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
* Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."Narayan Kamath2014-04-099-54/+0
|\
| * Stop defining HAVE_TIMEDWAIT_MONOTONIC.Narayan Kamath2014-04-099-54/+0
|/ | | | | | | We no longer provide this function in bionic. All callers should be moved over to pthread_condattr_setclock(). Change-Id: Iccd3384b40de423f7d5f9521b6d8073bf8bdea42
* Merge "Add 32 / 64 bit abi lists to system properties."Narayan Kamath2014-04-095-22/+45
|\
| * Add 32 / 64 bit abi lists to system properties.Narayan Kamath2014-04-085-22/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce ro.product.cpu.abilist32 / abilist64, which are comma separated lists of the 32 and 64 bit ABIs that the device supports. These properties are used by the zygote and system server to determine what ABI an app should be started with. This changes move abilist related make steps out of envsetup.mk and into config.mk because they depend on variables set by core/combo/***. Additionally, config.mk performs a few additional cleanups of these variables (like stripping them) after the inclusion of envsetup.mk so this seems like a better place to put them. bug: 13647418 Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
* | Merge "Fix javadoc error "class file for ↵Ying Wang2014-04-071-0/+2
|\ \ | | | | | | | | | sun.util.resources.OpenListResourceBundle not found""
| * | Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle ↵Ying Wang2014-04-071-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | not found" It seems to be a javac/javadoc bug. See https://code.google.com/p/doclava/issues/detail?id=38 sun.util.resources.OpenListResourceBundle is a class defined in the host rt.jar, but sometimes on some platform javadoc/javac can't find it. -XDignore.symbol.file tells javadoc/javac to skip the stubs file ct.sym and link against rt.jar directly. Change-Id: I3930f7399fc14b2d6b43c29f737fa90f37515aff
* | Merge "Different bootclasspath for droiddoc."Ying Wang2014-04-071-4/+6
|\ \
| * | Different bootclasspath for droiddoc.Ying Wang2014-04-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If it's host module, don't set bootclasspath; - If it's arget module, - It can build against the API stubs; - It can build against a historical SDK version; - It can build against core.jar Change-Id: Id1ec3ba624bc38068b206ad7173f4facf590e021
* | | Merge "Fix droiddoc generation."Ying Wang2014-04-071-6/+2
|\ \ \ | |/ / | | / | |/ |/|
generated by cgit v1.1 at 2025-03-18 21:03:25 +0000