summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Vary non-image Xmx for dex2oat on MIPS."Ian Rogers2014-07-161-1/+1
|\ \ \ \
| * | | | Vary non-image Xmx for dex2oat on MIPS.Ian Rogers2014-07-161-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | The image Xmx is already fixed at 64m. The issue is in the non boot image case. Change-Id: Idd508187ce8ac3d3c8dbe357c74bc33a5c8185dd
* | | | Merge "Fix the MIPS build."Ying Wang2014-07-161-5/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the MIPS build.Ian Rogers2014-07-161-5/+11
|/ / / | | | | | | | | | | | | | | | | | | Use an override for the dex2oat Xmx value when cross-compiling. Bug: 16221224 Change-Id: Iaeac95cd50a0bae7817ee7da23b3cf25246f1d6d
* | | Merge "Revert "Fix Java detection on some Linux distributions""Ying Wang2014-07-151-1/+5
|\ \ \
| * | | Revert "Fix Java detection on some Linux distributions"Ying Wang2014-07-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 09040dd8232f8fe588d938e04581ba1648f452f4. Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
* | | | Merge "Fix Java detection on some Linux distributions"Ying Wang2014-07-141-5/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Fix Java detection on some Linux distributionsBernhard Rosenkränzer2014-07-141-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Linux distributions (spotted here on OpenMandriva Lx, but I'm pretty sure some others do the same thing), "which javac" returns /usr/bin/javac, which is a symlink to "../../etc/alternatives/javac", which in turn points at whatever the JDK the user picked as his default. Given "../../etc/alternatives/javac" is a relative, symlink, the next iteration of LSLINE=$(ls -l "$JAVAC") fails (no ../../etc/alternatives/java relative to the build directory), causing tools.jar not to be found. Using readlink -f should work in all cases (while also simplifying the script a bit). Change-Id: I96afcf8e6460861bf8bb849dae05c27c42b91e84 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Merge "Remove bcc from generic_no_telephony.mk."Stephen Hines2014-07-141-1/+0
|\ \ \
| * | | Remove bcc from generic_no_telephony.mk.leozwang2014-07-141-1/+0
| |/ / | | | | | | | | | | | | | | | bcc was added into core_minimal.mk. Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
* | | Merge "Add bcc into /system/bin."Stephen Hines2014-07-141-0/+1
|\ \ \ | |/ / |/| |
| * | Add bcc into /system/bin.leozwang2014-07-141-0/+1
|/ / | | | | | | | | Bug: 16161758 Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
* | Merge "Fix PIC default to be -fPIC"Nick Kralevich2014-07-102-2/+2
|\ \
| * | Fix PIC default to be -fPICPavel Chupin2014-07-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -fPIC is more restrictive than -fPIE, but when "-fPIC -fPIE" used together the latter overrides. It may lead to issues when building DSO where -fPIC and not -fPIE is required. For executables -fPIE -pie shoudld be added and it's fine to override -fPIC as it is done now. The reason why we don't have these issues so far is probably related to -Bsymbolic added by default. But any attempt to remove it reveals these problems: https://android-review.googlesource.com/#/c/98061/ Change-Id: If0f10628b7cc41e564221a7a37298f7d65f859a8 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
* | | Merge "build: fix host dex2oat runtime args"Colin Cross2014-07-092-8/+8
|\ \ \
| * | | build: fix host dex2oat runtime argsColin Cross2014-07-092-8/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES, not PRODUCT_PROPERTY_OVERRIDES. Use $(call func,args) for user defined functions Prepend the property contents with -Xms or -Xmx when passing to dex2oat. This only worked before because DEX2OAT_XMS, etc. were blank due to the first two bugs, which resulted in --runtime-arg --runtime-arg and anything starting with -- as the argument to --runtime-arg is silently ignored. Change-Id: Ifa30038b397355171fefcc5248eea033bb634036
* | | Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img"Ying Wang2014-07-091-5/+7
|\ \ \
| * | | Don't enable LOCAL_DEX_PREOPT for apks outside system.imgYing Wang2014-07-091-5/+7
| | | | | | | | | | | | | | | | | | | | Bug: 15621103 Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
* | | | Merge "Allow symlinks to device or vendor tree in envsetup.sh."Ying Wang2014-07-091-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Allow symlinks to device or vendor tree in envsetup.sh.Ying Wang2014-07-091-2/+2
|/ / / | | | | | | | | | Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
* | | Merge "Make dex2oat heap size product configurable [build]"Brian Carlstrom2014-07-084-2/+23
|\ \ \
| * | | Make dex2oat heap size product configurable [build]Brian Carlstrom2014-07-084-2/+23
| | | | | | | | | | | | | | | | | | | | Bug: 15919420 Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
* | | | Merge "More consistent use of 64-bit build variable."Ying Wang2014-07-088-27/+13
|\ \ \ \
| * | | | More consistent use of 64-bit build variable.Ying Wang2014-07-088-27/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2 mechanisms to judge if it's 64-bit build; Remove the unnecessary 32-bit host variables. Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
* | | | Merge "ADBS now uses stack_core code to parse traces."Elliott Hughes2014-07-071-184/+8
|\ \ \ \
| * | | | ADBS now uses stack_core code to parse traces.Brigid Smith2014-07-071-184/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
* | | | | Merge "Remove -Bsymbolic from builds."Dan Albert2014-07-086-6/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove -Bsymbolic from builds.Dan Albert2014-06-136-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is causing issues when tools like asan try to wrap calls like malloc. See the referenced bug for more details. Bug: 15432753 Change-Id: I15e8eab5b773afd02dc14c78500cf8246a617718
* | | | | Merge "Fix host java doc by referring to the correct classpath."Ying Wang2014-07-021-3/+6
|\ \ \ \ \
| * | | | | Fix host java doc by referring to the correct classpath.Ying Wang2014-07-071-3/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In droiddoc for host, we don't generate classes.jar for LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead. This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in base_rules.mk. Bug: 9176318 Change-Id: If7460b30ca5da28743487d66da0029a44108d556
* | | | | Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."Ying Wang2014-07-022-3/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Clean the last bit of LOCAL_BUILD_HOST_DEX.Ying Wang2014-07-072-3/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Long live LOCAL_BUILD_HOST_DEX! Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
* | | | Merge "Strip all multidex files, not just classes.dex"Brian Carlstrom2014-07-011-1/+5
|\ \ \ \
| * | | | Strip all multidex files, not just classes.dexBrian Carlstrom2014-07-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10447095 Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
* | | | | Merge "Fix partition_tag usage in install_jni_libs"Ying Wang2014-07-021-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix partition_tag usage in install_jni_libsDan Willemsen2014-07-011-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES. Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078
* | | | Merge "More consistent host library path in multilib build."Ying Wang2014-06-301-6/+4
|\ \ \ \
| * | | | More consistent host library path in multilib build.Ying Wang2014-06-301-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 64-bit multilib host build, changed from 32-bit lib: out/host/<platform>/lib32 64-bit lib: out/host/<platform>/lib to 32-bit lib: out/host/<platform>/lib 64-bit lib: out/host/<platform>/lib64 . That way the host library path is consistent with the multilib target build's. Also with this change prebuilt 32-bit libraries can be reused in 64-bit host build as 2nd arch binaries. (With previous setup, they can't be used because they have rpath ../lib in it while the 2nd arch library path needs ../lib32. Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
* | | | | Merge "Add -Wl,--fatal-warnings to x86_64."Elliott Hughes2014-06-261-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add -Wl,--fatal-warnings to x86_64.Elliott Hughes2014-06-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11358761 Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
* | | | | Merge "Fix missing rs_compatibility_jni_libs."Ying Wang2014-06-271-0/+2
|\ \ \ \ \
| * | | | | Fix missing rs_compatibility_jni_libs.Ying Wang2014-06-301-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 15935150 Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
* | | | | Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH."Ying Wang2014-06-271-2/+1
|\ \ \ \ \
| * | | | | Remove nonexistent $ANDROID_QTOOLS from $PATH.Ying Wang2014-06-301-2/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 15983070 Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26
* | | | | Merge "Host support for prefer symlink"Ian Rogers2014-06-271-9/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Host support for prefer symlinkIan Rogers2014-06-271-9/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | We need a host symlink for dalvik, our *-dalvik-host build targets are failing. Change-Id: I6045de20c948b456a150033deb3459895aff83c6
* | | | Merge "Add --pseudo-localize aapt parameter for builds."Ying Wang2014-06-262-1/+8
|\ \ \ \
| * | | | Add --pseudo-localize aapt parameter for builds.Igor Viarheichyk2014-06-262-1/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some packages can override list of locales with LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling pseudolocalization. Adding new --pseudo-localize flag to aapt if pseudo-locales are specified in product locales list solves this issue. Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
* | | | Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"Ying Wang2014-06-252-9/+18
|\ \ \ \
| * | | | Allow LOCAL_RESOURCE_DIR pointing to dir generated during the buildYing Wang2014-06-252-9/+18
|/ / / / | | | | | | | | | | | | | | | | Bug: 15850610 Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
generated by cgit v1.1 at 2025-01-26 20:12:22 +0000