summaryrefslogtreecommitdiffstats
path: root/CleanSpec.mk
Commit message (Collapse)AuthorAgeFilesLines
* am 29f8d7d6: Merge "Make gnu++11 the default standard version."Dan Albert2014-11-251-0/+5
|\ | | | | | | | | * commit '29f8d7d68a8dadd9cb2f087caa1f02a5240e8a07': Make gnu++11 the default standard version.
| * Make gnu++11 the default standard version.Dan Albert2014-11-241-0/+5
| | | | | | | | | | | | | | | | | | There are a _lot_ of users of `typeof` in the tree, and they'll need a GNU flavored standard. Rather than fixing up all of these individually, let's just use gnu++11 as the default. Bug: 18466763 Change-Id: Ia1bd3adaa74fadba259fda3d37653fb8d5cff69a
* | am 74b2870a: Merge "Clean out *.prop files due to dex2oat instruction-set ↵Stephen Hines2014-11-141-0/+5
|\ \ | |/ | | | | | | | | | | flag change." * commit '74b2870a272a4f069354dcc262c3af3042943969': Clean out *.prop files due to dex2oat instruction-set flag change.
| * Clean out *.prop files due to dex2oat instruction-set flag change.Stephen Hines2014-11-131-0/+5
| | | | | | | | Change-Id: Ib1e94cfe08bad9e51fd46e8a1a09926877f179de
* | resolved conflicts for merge of ebc32090 to lmp-mr1-dev-plus-aospDan Albert2014-11-071-0/+3
|\ \ | |/ | | | | Change-Id: Icfa9c3424a2e75a07eaa453663b03a12897809a9
| * Cleanspec for libc++ migration.Dan Albert2014-11-071-0/+3
| | | | | | | | | | | | | | This affects most native code in the tree, so the only real option is to nuke out from orbit. Change-Id: Ia3a794731e703c3ca02b55f6f7827d3425dca5cb
| * am e105b8f2: Merge "And then L, without ever becoming a real code name, ↵Dianne Hackborn2014-09-251-0/+5
| |\ | | | | | | | | | | | | | | | | | | transforms like magic to 5.0." into lmp-dev * commit 'e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4': And then L, without ever becoming a real code name, transforms like magic to 5.0.
* | \ am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-devDianne Hackborn2014-10-171-0/+5
|\ \ \ | | | | | | | | | | | | | | | | * commit '374712c54f5416e14523eec15456bb8b4372ffac': Move up to API 21, Lollipop MR1.
| * | | Move up to API 21, Lollipop MR1.Dianne Hackborn2014-10-171-0/+5
| | |/ | |/| | | | | | | Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
* | | am e105b8f2: Merge "And then L, without ever becoming a real code name, ↵Dianne Hackborn2014-09-261-0/+5
|\ \ \ | |/ / | | / | |/ |/| | | | | transforms like magic to 5.0." into lmp-dev * commit 'e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4': And then L, without ever becoming a real code name, transforms like magic to 5.0.
| * And then L, without ever becoming a real code name, transforms like magic to ↵Dianne Hackborn2014-09-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.0. The code name looked at 5.0 despondently. "Won't anyone care about me? Why does everyone pretend like I don't even exist!" And it was true -- for all of its life, nobody had ever whispered L's true name, at least not in the same breath as many other names that were not L's at all. But 5.0 knew better. "L," the number said, "don't you fear. Some day, I am sure, your name will go up in lights. Your name will shine brighter than even my own. And everyone who is anyone will know your name, write pages and pages all about your name, and debate endlessly about everything you are." L could only hope this would be true. But not today. Today, L is still nobody. Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
* | am e4584a41: Merge "Shhhhhhh!!!" into lmp-devDianne Hackborn2014-08-261-0/+5
|\ \ | |/ | | | | | | * commit 'e4584a412960e18709953eee942bceaa85b100f8': Shhhhhhh!!!
| * Shhhhhhh!!!Dianne Hackborn2014-08-261-0/+5
| | | | | | | | Change-Id: I3bb72742f788c70f82f311b6ffba479aa02a1eb0
| * Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]Brian Carlstrom2014-08-061-0/+6
| | | | | | | | | | | | | | | | | | | | This will allow us to conditionally change the compiler-filter based on other properties. Bug: 15165413 (cherry picked from commit 4d30e5e2604a77df2acd41e36cbca54cd42cbf0a) Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
* | resolved conflicts for merge of 9b80095e to lmp-dev-plus-aospBrian Carlstrom2014-08-041-0/+5
|\ \ | | | | | | | | | Change-Id: Id37b96441818c5542b8c340f968183162a47191a
| * | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]Brian Carlstrom2014-07-301-0/+6
| | | | | | | | | | | | | | | | | | | | | This will allow us to conditionally change the compiler-filter based on other properties. Bug: 15165413 Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
* | | resolved conflicts for merge of 2812b27c to lmp-dev-plus-aospTim Murray2014-07-241-0/+4
|\ \ \ | |/ / | | / | |/ |/| Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
| * Switch host builds to use Clang by default.Tim Murray2014-07-241-0/+3
| | | | | | | | | | | | | | | | | | | | If LOCAL_CLANG is not set to false for a host module, clang will be used instead of gcc. This also enables the integrated assembler by default for Darwin host builds. bug 16172793 Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
* | New installation path for apks and their JNIs.Ying Wang2014-07-181-0/+2
| | | | | | | | | | | | | | | | | | Apk's path is changed to <parent_dir>/MyApp/MyApp.apk; JNI path is changed to <parent_dir>/MyApp/lib/<arch_name>/libfoo.so. Symlinks of JNIs are changed accordingly. Bug: 16319961 Change-Id: Ib3b2309c95fa9aea27837fcc29e28d990b04747b
* | am ef0b6e0c: am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product ↵Brian Carlstrom2014-07-091-0/+5
|\ \ | | | | | | | | | | | | | | | | | | configurable [build]" * commit 'ef0b6e0c19eb37f4fbc42491771611e247168519': Make dex2oat heap size product configurable [build]
| * \ am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable ↵Brian Carlstrom2014-07-091-0/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | [build]" * commit '8a7496060df85c241b976d6cd69b13828e452ef9': Make dex2oat heap size product configurable [build]
| | * Make dex2oat heap size product configurable [build]Brian Carlstrom2014-07-081-0/+5
| | | | | | | | | | | | | | | Bug: 15919420 Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
* | | resolved conflicts for merge of b60ccd66 to masterNarayan Kamath2014-06-171-0/+3
|\ \ \ | |/ / | | | | | | Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
| * | am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"Narayan Kamath2014-06-171-0/+3
| |\ \ | | |/ | | | | | | | | | * commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d': Make default 64-bit primary, 32-bit secondary
| | * Make default 64-bit primary, 32-bit secondaryBrian Carlstrom2014-06-161-0/+3
| | | | | | | | | | | | Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
* | | Adding CleanSpec for adding BOOTCLASSPATH to ims-common.jarBrian Carlstrom2014-06-131-0/+3
| | | | | | | | | | | | | | | Bug: 15616246 Change-Id: Idce2fb20943f4d4ba6dd66f95f9f5bbd9caefb46
* | | resolved conflicts for merge of 0c651756 to masterDianne Hackborn2014-06-121-0/+5
|\ \ \ | | | | | | | | | | | | Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d
| * | | Update to reflect KKWT's graduation to API 20.Dianne Hackborn2014-06-111-0/+5
| | | | | | | | | | | | | | | | Change-Id: I4716e71d72b2526fe635079d1b15f623db842c21
* | | | am 2d19cbd2: resolved conflicts for merge of 135e11df to ↵Ying Wang2014-06-111-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '2d19cbd279ed69c7202f089be174c35c1585f709': Switch to 32-bit-by-default host multilib build.
| * | | resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aospYing Wang2014-06-101-0/+3
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
| | * | Switch to 32-bit-by-default host multilib build.Ying Wang2014-06-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also we don't need to force LLVM built from source, for we already force LLVM to be built as 32-bit. Bug: 13751317 Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
| * | | resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aospBrian Carlstrom2014-05-291-0/+3
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
| | * | am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in ↵Brian Carlstrom2014-05-291-0/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | general" * commit 'f2a2406b8c01e71603feaa5eaccd75d26ea76804': Remove dependencies on runtime_libdvm and libdvm.so in general
| | | * | Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit bf8a374a92e327efed95892fe67e6917a89c6c2b) Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
| * | | | am ed97938c: am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to ↵Brian Carlstrom2014-05-281-0/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | libart" * commit 'ed97938caa7a1e7cde1d060ebbe6f6af1279188e': Move to dalvik.vm.lib.2 to force default to libart
| | * | | am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-0/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0': Move to dalvik.vm.lib.2 to force default to libart
| | | * | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit 7e127ebe0bf8753fcbeeac6140916d512322e308) Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
* | | | | am bf8a374a: Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-0/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit 'bf8a374a92e327efed95892fe67e6917a89c6c2b': Remove dependencies on runtime_libdvm and libdvm.so in general
| * | | | Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
* | | | | resolved conflicts for merge of 7e127ebe to masterBrian Carlstrom2014-05-281-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
| * | | | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
* | | | | resolved conflicts for merge of 38c3c930 to masterNarayan Kamath2014-05-271-0/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
| * | | | am 6c2ae327: am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-271-0/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '6c2ae327665396958ba6f08dc72bc30b3455d046': Switch x86_64 emulator to 64 bit primary.
| | * | | am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-271-0/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3': Switch x86_64 emulator to 64 bit primary.
| | | * | Switch x86_64 emulator to 64 bit primary.Narayan Kamath2014-05-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also siezes the opportunity to remove the hardcoded TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk. This avoids the need for further hacks but needs supporting changes to a few apps to force them to 32 bit. Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
* | | | | am 06db7324: resolved conflicts for merge of 0f99bb3d to ↵Narayan Kamath2014-05-271-0/+3
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | klp-modular-dev-plus-aosp * commit '06db73241a12a6b5f352647e966d254ae6443f68': Remove hardcoded TARGET_PREFER_32_BIT_APPS.
| * | | resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aospNarayan Kamath2014-05-271-0/+3
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
| | * | am 7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."Narayan Kamath2014-05-271-0/+3
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '7b31bd3e8f25b9b232204d4b64399d78d6e41163': Remove hardcoded TARGET_PREFER_32_BIT_APPS.
| | | * Remove hardcoded TARGET_PREFER_32_BIT_APPS.Narayan Kamath2014-05-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't required any longer, besides individual products should be allowed to set this value themselves. (cherry picked from commit 7b9347a7f9d870e149ef38438ad547abe2709ee2) Change-Id: If459eab32c6e7831596224ad3503baefbf028133
| * | | resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aospGriff Hazen2014-05-201-0/+5
| |\ \ \