aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-19Merge "Revert "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6" DO ↵tools_r22.6Raphael Moll
NOT MERGE." into tools_r22.6
2014-05-19Merge "Revert "Update build system for better Clang behavior on Mac." DO NOT ↵Raphael Moll
MERGE." into tools_r22.6
2014-05-19Merge "Revert "Build changes necessary for LLVM 3.5 switch." DO NOT MERGE." ↵Raphael Moll
into tools_r22.6
2014-05-19Merge "Revert "Remove tblgen and clang-tblgen from prebuilts." DO NOT ↵Raphael Moll
MERGE." into tools_r22.6
2014-05-16Revert "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6" DO NOT MERGE.Raphael Moll
This reverts commit a787d7af0699b8121ee193ab71620a626540b52d. This reverts rs/bcc to the stable state of Tools r22.6.3.
2014-05-16Revert "Update build system for better Clang behavior on Mac." DO NOT MERGE.Raphael Moll
This reverts commit c07c8fae25ffef1a97dbdba843d833ed7270f703. This reverts rs/bcc to the stable state of Tools r22.6.3.
2014-05-16Revert "Build changes necessary for LLVM 3.5 switch." DO NOT MERGE.Raphael Moll
This reverts commit 6bd23816bf6eb5b37f785d23c5df3880d2865a60. This reverts rs/bcc to the stable state of Tools r22.6.3.
2014-05-16Revert "Remove tblgen and clang-tblgen from prebuilts." DO NOT MERGE.Raphael Moll
This reverts commit da522500c4e76106dec5143834edca681726b5b7. This reverts rs/bcc to the stable state of Tools r22.6.3.
2014-04-30Merge "Remove tblgen and clang-tblgen from prebuilts." into tools_r22.6Stephen Hines
2014-04-30Remove tblgen and clang-tblgen from prebuilts.Tim Murray
Change-Id: I89fb74da5a516d0f768f72518a401216f8a5b1a8 (cherry picked from commit 75b58cc827faad56517181960f81f5b4bd8a08f0)
2014-04-30Merge "Build changes necessary for LLVM 3.5 switch." into tools_r22.6Stephen Hines
2014-04-30Merge "Update build system for better Clang behavior on Mac." into tools_r22.6Stephen Hines
2014-04-30Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6" into tools_r22.6Stephen Hines
2014-04-30Build changes necessary for LLVM 3.5 switch.Tim Murray
Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03 Conflicts: core/clang/arm.mk
2014-04-30Update build system for better Clang behavior on Mac.Tim Murray
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
2014-04-30Switch to new host prebuilt x86_64-linux-glibc2.11-4.6Andrew Hsieh
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
2014-04-04Merge "Disable host -fPIE if BUILD_HOST_static is set."Ying Wang
2014-04-04Disable host -fPIE if BUILD_HOST_static is set.Ying Wang
It turns out -static doesn't work with -fPIE. Bug: 13568878 Change-Id: I66951a5517dece1c5f4f22c329cf703bd99b5163
2014-04-04Merge "DO NOT MERGE: Combine emulator test projects into a single apk"Steve Moyer
2014-04-03DO NOT MERGE: Combine emulator test projects into a single apkSteve Moyer
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests Conflicts: target/product/sdk.mk Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-04-03Merge "Unset _JAVA_OPTIONS before running "java -version"."Ying Wang
2014-04-02Unset _JAVA_OPTIONS before running "java -version".Ying Wang
Unfortunately the previous approach of grepping out java version before "head -n 1" clash with the effort of running "java -version" only once. Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
2014-04-02Merge "Revert "HACK: disable emulator on x86_64""Greg Hackmann
2014-04-02Merge "aosp_arm64: increase userdata image size"Colin Cross
2014-04-02Merge "Add GYP as a target type that requires 2nd arch."Torne (Richard Coles)
2014-04-02aosp_arm64: increase userdata image sizeColin Cross
Increase userdata image size to allow make tests to builds with extra tests to fit. Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
2014-04-02Merge "Add warning message for java6 builds."Narayan Kamath
2014-04-02Add warning message for java6 builds.Narayan Kamath
The instruction URL has been amended and a few additional details have been added. (cherry picked from 8c06afdea3d3c422d653b40fd19d5e3d4be64af2) Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
2014-04-02Merge "Call "java[c] -version" only once"Narayan Kamath
2014-04-02Call "java[c] -version" only onceYing Wang
and print out the full output if error occurs. Bug: 11672548 (cherry picked from 7b66d366bf5c469130f71d0870424fcd265e0301) Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
2014-04-02Merge "Bring main.mk in sync with master."Narayan Kamath
2014-04-02Add GYP as a target type that requires 2nd arch.Torne (Richard Coles)
"GYP" class targets are used by external/chromium_org for gyp's "none" type. The processing in these targets needs a separate intermediate directory for the primary/secondary architecture, so add it to the list in intermediates-dir-for along with libraries/executables. Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b
2014-04-02Merge "Use debug versions of dex2oat explicitly."Nicolas Geoffray
2014-04-01Merge "Remove redundant my_target_global_ldflags"Dmitriy Ivanov
2014-04-01Remove redundant my_target_global_ldflagsDmitriy Ivanov
* Fix: my_target_global_ldflags is defined in binary.mk so they effectivelly override previous definition Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0
2014-04-01Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM."Tim Murray
2014-04-01Always use prebuilt clang, even if we're explicitly building clang/LLVM.Tim Murray
This is needed for self-hosting Clang/LLVM. bug 13588226 Change-Id: Ic98adc2b174b12ce046b7b65bbc28901a766a485
2014-04-01Merge "cortex-a7 supports div"Brian Carlstrom
2014-04-01cortex-a7 supports divBrian Carlstrom
(cherry picked from commit cece45d22652ca0d8a57a6cb03c5ca2a915a9a07) Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
2014-04-01Merge "Add a default value for ro.zygote."Narayan Kamath
2014-04-01Bring main.mk in sync with master.Narayan Kamath
These lines were removed in aosp in commit e2d27887b but a bad merge conflict resolution left them in master. Subsequent changes on master started using these variables so they're being brought back. Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
2014-04-01Use debug versions of dex2oat explicitly.Nicolas Geoffray
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
2014-04-01Merge "Add intel to the vendor whitelist"Ying Wang
2014-04-01Add intel to the vendor whitelistDaniel Leung
Change-Id: I91d6ff72629523050b4f26c2d731cac90ef49348 Signed-off-by: Daniel Leung <daniel.leung@intel.com> Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com> Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com> Reviewed-by: Kumar-mayernik, Nisha <nisha.kumar-mayernik@intel.com> Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com> Tested-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
2014-03-31Revert "HACK: disable emulator on x86_64"Greg Hackmann
This reverts commit 4562c5bcb355c87a18e811ba8e6c2b6451a3ebf7.
2014-03-31Merge "Fix java version detection when _JAVA_OPTIONS is set."Ying Wang
2014-03-31Fix java version detection when _JAVA_OPTIONS is set.Peter Ammon
_JAVA_OPTIONS is an environment variable that can be used to affect the behavior of java and javac. It is currently required to get Android to build on some configurations, where the default Java heap size is too small. Unfortunately, if _JAVA_OPTIONS is set, both java and javac will output its value to the console as the first line on every invocation, including trivial ones like java -version. This will confuse main.mk’s version detection, which only looks at the first line of output. Tweak the version detection to run grep before head, so that the _JAVA_OPTIONS line is filtered by the grep. Change-Id: I69aee52b56d27711b7d3087ec6b3ebab07ffc3af
2014-03-31Merge "Specify -mcpu=cortex-a15 for denver CPU variants."Christopher Ferris
2014-03-31Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"Ying Wang
2014-03-31Merge "Extend the CPU ABI specification mechanism."Narayan Kamath
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 08:38:21 +0000