Ed Heyl
898b9e43cf
resolve conflicts w/aaf823d2
...
Change-Id: I7c5cf1d1e074a67bdd19a7cf51f45e5f3e026c84
2014-12-08 10:53:50 -08:00
Dianne Hackborn
0421d0b115
Fix issue #18368417 : 5.0 -> 5.1.
...
Change-Id: Icd7137fe8b1bda1c5aaf170aa7b19a58832144c8
2014-12-04 12:10:32 -08:00
Dan Albert
4bf9b396bd
am 29f8d7d6
: Merge "Make gnu++11 the default standard version."
...
* commit '29f8d7d68a8dadd9cb2f087caa1f02a5240e8a07':
Make gnu++11 the default standard version.
2014-11-25 19:58:41 +00:00
Dan Albert
bf0426f474
Make gnu++11 the default standard version.
...
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
2014-11-24 15:53:31 -08:00
Stephen Hines
20bebfe456
am 74b2870a
: Merge "Clean out *.prop files due to dex2oat instruction-set flag change."
...
* commit '74b2870a272a4f069354dcc262c3af3042943969':
Clean out *.prop files due to dex2oat instruction-set flag change.
2014-11-14 03:15:14 +00:00
Stephen Hines
39bf012335
Clean out *.prop files due to dex2oat instruction-set flag change.
...
Change-Id: Ib1e94cfe08bad9e51fd46e8a1a09926877f179de
2014-11-13 19:04:28 -08:00
Dan Albert
420773ae53
resolved conflicts for merge of ebc32090
to lmp-mr1-dev-plus-aosp
...
Change-Id: Icfa9c3424a2e75a07eaa453663b03a12897809a9
2014-11-07 14:20:57 -08:00
Dan Albert
7337a822a8
Cleanspec for libc++ migration.
...
This affects most native code in the tree, so the only real option is
to nuke out from orbit.
Change-Id: Ia3a794731e703c3ca02b55f6f7827d3425dca5cb
2014-11-07 13:24:56 -08:00
Dianne Hackborn
87fa865bea
am 374712c5
: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev
...
* commit '374712c54f5416e14523eec15456bb8b4372ffac':
Move up to API 21, Lollipop MR1.
2014-10-17 17:19:57 +00:00
Dianne Hackborn
4a6a7524b3
Move up to API 21, Lollipop MR1.
...
Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
2014-10-17 10:05:33 -07:00
Dianne Hackborn
8ae0f88b78
am e105b8f2
: Merge "And then L, without ever becoming a real code name, 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.
2014-09-26 00:22:31 +00:00
Dianne Hackborn
a0fdca5e79
am e105b8f2
: Merge "And then L, without ever becoming a real code name, 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.
2014-09-25 00:40:56 +00:00
Dianne Hackborn
105df2f1d2
And then L, without ever becoming a real code name, transforms like magic to 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
2014-09-22 15:55:23 -07:00
Dianne Hackborn
54256fd45c
am e4584a41
: Merge "Shhhhhhh!!!" into lmp-dev
...
* commit 'e4584a412960e18709953eee942bceaa85b100f8':
Shhhhhhh!!!
2014-08-26 21:16:47 +00:00
Dianne Hackborn
bf9b9275af
Shhhhhhh!!!
...
Change-Id: I3bb72742f788c70f82f311b6ffba479aa02a1eb0
2014-08-26 12:39:26 -07:00
Brian Carlstrom
cced082f5d
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
(cherry picked from commit 4d30e5e260
)
Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
2014-08-06 17:50:39 -07:00
Brian Carlstrom
479eca858c
resolved conflicts for merge of 9b80095e
to lmp-dev-plus-aosp
...
Change-Id: Id37b96441818c5542b8c340f968183162a47191a
2014-08-04 12:21:46 -07:00
Brian Carlstrom
4d30e5e260
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
2014-07-30 15:57:16 -07:00
Tim Murray
72c70d14d4
resolved conflicts for merge of 2812b27c
to lmp-dev-plus-aosp
...
Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
2014-07-24 14:27:05 -07:00
Tim Murray
92d79cbb41
Switch host builds to use Clang by default.
...
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
2014-07-24 09:25:58 -07:00
Ying Wang
af9757e849
New installation path for apks and their JNIs.
...
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
2014-07-18 16:26:24 -07:00
Brian Carlstrom
b1c9734b68
am ef0b6e0c
: am 8a749606
: am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit 'ef0b6e0c19eb37f4fbc42491771611e247168519':
Make dex2oat heap size product configurable [build]
2014-07-09 15:07:13 +00:00
Brian Carlstrom
ef0b6e0c19
am 8a749606
: am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
Make dex2oat heap size product configurable [build]
2014-07-09 12:36:31 +00:00
Brian Carlstrom
cffe289dc6
Make dex2oat heap size product configurable [build]
...
Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
2014-07-08 11:33:45 -07:00
Narayan Kamath
b60ccd6672
am ae65e2eb
: am d73ec26a
: Merge "Make default 64-bit primary, 32-bit secondary"
...
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
Make default 64-bit primary, 32-bit secondary
2014-06-17 10:05:13 +00:00
Brian Carlstrom
d795046319
Make default 64-bit primary, 32-bit secondary
...
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
2014-06-16 23:59:43 -07:00
Narayan Kamath
9d62dbc532
resolved conflicts for merge of b60ccd66
to master
...
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
2014-06-17 11:11:35 +01:00
Brian Carlstrom
8f15beac84
Adding CleanSpec for adding BOOTCLASSPATH to ims-common.jar
...
Bug: 15616246
Change-Id: Idce2fb20943f4d4ba6dd66f95f9f5bbd9caefb46
2014-06-13 22:20:39 -07:00
Dianne Hackborn
dd0afa03f2
resolved conflicts for merge of 0c651756
to master
...
Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d
2014-06-12 11:34:48 -07:00
Dianne Hackborn
997b896eeb
Update to reflect KKWT's graduation to API 20.
...
Change-Id: I4716e71d72b2526fe635079d1b15f623db842c21
2014-06-11 14:24:32 -07:00
Ying Wang
f7988507f4
am 2d19cbd2
: resolved conflicts for merge of 135e11df
to klp-modular-dev-plus-aosp
...
* commit '2d19cbd279ed69c7202f089be174c35c1585f709':
Switch to 32-bit-by-default host multilib build.
2014-06-11 19:26:30 +00:00
Ying Wang
2d19cbd279
resolved conflicts for merge of 135e11df
to klp-modular-dev-plus-aosp
...
Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
2014-06-10 09:45:45 -07:00
Ying Wang
2713fcebba
Switch to 32-bit-by-default host multilib build.
...
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
2014-06-09 17:48:05 -07:00
Brian Carlstrom
8fe9c76d9a
resolved conflicts for merge of 2267c22b
to klp-modular-dev-plus-aosp
...
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
2014-05-29 14:01:24 -07:00
Brian Carlstrom
2267c22b3d
am f2a2406b
: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit 'f2a2406b8c01e71603feaa5eaccd75d26ea76804':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:39:49 +00:00
Brian Carlstrom
1e60fe58f0
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
(cherry picked from commit bf8a374a92
)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
2014-05-29 09:37:25 -07:00
Brian Carlstrom
5da48a3394
am bf8a374a
: Remove dependencies on runtime_libdvm and libdvm.so in general
...
* commit 'bf8a374a92e327efed95892fe67e6917a89c6c2b':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 16:37:19 +00:00
Brian Carlstrom
bf8a374a92
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
2014-05-28 21:27:47 -07:00
Brian Carlstrom
9843e86395
am ed97938c
: am 7df64f7c
: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit 'ed97938caa7a1e7cde1d060ebbe6f6af1279188e':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:13:28 +00:00
Brian Carlstrom
ee26bf6a84
resolved conflicts for merge of 7e127ebe
to master
...
Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
2014-05-28 16:02:45 -07:00
Brian Carlstrom
ed97938caa
am 7df64f7c
: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:44 +00:00
Brian Carlstrom
31f5db27c6
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
(cherry picked from commit 7e127ebe0b
)
Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
2014-05-28 14:49:34 -07:00
Brian Carlstrom
7e127ebe0b
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
2014-05-28 14:31:46 -07:00
Narayan Kamath
7d55bea91f
resolved conflicts for merge of 38c3c930
to master
...
Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
2014-05-27 12:29:41 +01:00
Narayan Kamath
cc25436841
am 06db7324
: resolved conflicts for merge of 0f99bb3d
to klp-modular-dev-plus-aosp
...
* commit '06db73241a12a6b5f352647e966d254ae6443f68':
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
2014-05-27 11:23:39 +00:00
Narayan Kamath
38c3c9309f
am 6c2ae327
: am 8d3b9c9e
: Merge "Switch x86_64 emulator to 64 bit primary."
...
* commit '6c2ae327665396958ba6f08dc72bc30b3455d046':
Switch x86_64 emulator to 64 bit primary.
2014-05-27 11:23:34 +00:00
Narayan Kamath
06db73241a
resolved conflicts for merge of 0f99bb3d
to klp-modular-dev-plus-aosp
...
Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
2014-05-27 12:21:22 +01:00
Narayan Kamath
6c2ae32766
am 8d3b9c9e
: Merge "Switch x86_64 emulator to 64 bit primary."
...
* commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
Switch x86_64 emulator to 64 bit primary.
2014-05-27 11:15:57 +00:00
Narayan Kamath
0f99bb3d0b
am 7b31bd3e
: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
...
* commit '7b31bd3e8f25b9b232204d4b64399d78d6e41163':
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
2014-05-27 11:15:56 +00:00
Narayan Kamath
62da5fd161
Switch x86_64 emulator to 64 bit primary.
...
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
2014-05-27 12:12:00 +01:00