Mathieu Chartier
8b11285dd9
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
...
Bug: 19735273
This reverts commit 3abfcfc17b
.
Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
2015-03-18 19:06:28 -07:00
Mathieu Chartier
7c2d49dcb9
am 7b93109e
: am d7f3d8ba
: am 8ca542f4
: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
...
* commit '7b93109e48f90f756228bfe399b67d5d8cc306b0':
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:47:31 +00:00
Mathieu Chartier
3abfcfc17b
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
...
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
2015-03-16 16:29:30 -07:00
Mathieu Chartier
0694eabe4d
JIT default opt-in
...
Bug: 17950037
(cherry picked from commit 2a2a03046e
)
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 18:27:54 -07:00
Mathieu Chartier
2a2a03046e
JIT default opt-in
...
Bug: 17950037
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 14:45:22 -07:00
Dianne Hackborn
c421abfcd5
Update version to MNC.
...
Change-Id: I67a69efa90babcfbc3e83907e46be0833c0ddcdd
2015-01-22 16:36:55 -08:00
Narayan Kamath
675a726fe4
resolved conflicts for merge of 8f5fc9e2
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
2015-01-22 18:53:59 +00:00
Narayan Kamath
baf3eb93ee
Add ro.product.locale
...
This is a BCP-47 language tag representing the default locale for a
given device. Support for the earlier mechanism of supplying a language
and region via ro.product.locale.region/language has been removed. This
change also removes support for supplying these properties via
PRODUCT_ADDITIONAL_PROPERTY_OVERRIDES. Devices that need to override
this should either rearrange their PRODUCT_LANGUAGES or supply a custom
.prop file.
bug: 17691569
Change-Id: I00c74098542b49b9c514a6ca39ea8d08179546c1
2015-01-16 10:16:52 +00:00
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
Narayan Kamath
214c53a022
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
...
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
(cherry picked from commit 7b9347a7f9
)
Change-Id: If459eab32c6e7831596224ad3503baefbf028133
2014-05-27 12:08:33 +01:00
Griff Hazen
0413efd261
resolved conflicts for merge of 3bb81eb0
to klp-modular-dev-plus-aosp
2014-05-20 20:05:08 -07:00
Justin Koh
f6c21e7262
Set API version for KKWT. DO NOT MERGE
...
Set API level and version string for KKWT.
Change-Id: I18178e9286e6115f4f7273d4489dd91b3205e5cf
2014-05-14 18:57:42 -07:00
Brian Carlstrom
0e183b2d33
am 676c8f04
: am 4ed19f0f
: am 1e63c2d1
: Merge "Add dalvik.vm.dex2oat-flags for eng build"
...
* commit '676c8f0450a9dfb84c12257195ba05619aeed970':
Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 22:00:37 +00:00
Brian Carlstrom
676c8f0450
am 4ed19f0f
: am 1e63c2d1
: Merge "Add dalvik.vm.dex2oat-flags for eng build"
...
* commit '4ed19f0f4294544d0447025f0079a9d9e185a495':
Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 21:57:32 +00:00
Brian Carlstrom
4ed19f0f42
am 1e63c2d1
: Merge "Add dalvik.vm.dex2oat-flags for eng build"
...
* commit '1e63c2d15cba608a154bbd563f96dde334691147':
Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 21:53:14 +00:00
Narayan Kamath
7b9347a7f9
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
...
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
Change-Id: I684edf073b5c19f412b4617f8aa22824193c19be
2014-05-08 08:03:02 +00:00
Brian Carlstrom
fceb115bd6
Add dalvik.vm.dex2oat-flags for eng build
...
Bug: 12869646
Change-Id: I794320267c846225931f12075c7f32d7848081e9
2014-05-06 20:40:11 -07:00
Bill Yi
1e4adfa837
Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD
2014-04-29 11:32:53 -07:00
Dianne Hackborn
6ee3c4327d
Add new facility to have multiple active codenames.
...
Use this to have both L and KKWT.
Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
2014-04-24 16:19:14 -07:00
Narayan Kamath
110ea46e09
resolved conflicts for merge of 8af7e8ed
to master
...
Change-Id: Ib427b36e133e29d1c2e9cea065e4e63c1e2e2122
2014-04-09 12:33:03 +01:00
Narayan Kamath
8af7e8ed3e
resolved conflicts for merge of 1852237a
to klp-modular-dev-plus-aosp
...
Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
2014-04-09 10:03:41 +01:00
Narayan Kamath
7303ebda84
Add 32 / 64 bit abi lists to system properties.
...
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
2014-04-08 17:40:40 +01:00
Brian Carlstrom
4d5028ce3c
am aae47044
: Merge "CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'aae470446504a869db05f9b70b7146ea47d746d5':
CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:16 +00:00
Dianne Hackborn
56dab18617
It's L, dagnabbit.
...
Change-Id: Ied4e6fce1464aa5cd012a5e2519df8462ec91b4c
2014-03-05 12:33:44 -08:00
Dianne Hackborn
fc021daaca
Fix issue #12939338 : Android version showing as 'KKWT'
...
Thou shalt be... L!
Change-Id: I53e66eaf64183fbab0b1035cdb376b25abab4879
2014-02-10 13:43:00 -08:00
Justin Koh
19753f458b
am bbfebfad
: resolved conflicts for merge of 303d2755
to klp-modular-dev-plus-aosp
...
* commit 'bbfebfad0d8ad002995bb1005b61a35b42a8ce35':
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
2014-02-04 23:42:07 +00:00
Justin Koh
bbfebfad0d
resolved conflicts for merge of 303d2755
to klp-modular-dev-plus-aosp
...
Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9
2014-02-04 15:16:15 -08:00
Justin Koh
303d275591
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
...
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.
Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
2014-02-03 16:26:43 -08:00
Brian Carlstrom
7468e27676
am 03c16a30
: am aae47044
: Merge "CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit '03c16a309951c713ab4ab75434c9305134d72e14':
CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default
2014-01-31 16:41:29 +00:00
Narayan Kamath
966611a9c2
am 0ddbc6c2
: Merge "resolved conflicts for merge of 084209e2
to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp
...
* commit '0ddbc6c215c34f708fcc898be25ddffc18282881':
CleanSpec for 08d410f532
: Make libart the default runtime
2014-01-31 16:41:27 +00:00
Brian Carlstrom
03c16a3099
am aae47044
: Merge "CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'aae470446504a869db05f9b70b7146ea47d746d5':
CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default
2014-01-31 12:34:18 +00:00
Narayan Kamath
c1375f6991
resolved conflicts for merge of 084209e2
to klp-modular-dev-plus-aosp
...
Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87
2014-01-31 12:29:50 +00:00
Brian Carlstrom
e71d9a2fd9
CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default
...
Change-Id: I3ed55460864c17a199053a058b2482c6c4579622
2014-01-30 13:56:51 -08:00
Brian Carlstrom
6acec48274
CleanSpec for 08d410f532
: Make libart the default runtime
...
Change-Id: Id632beeb2f96dd4502ac4a6c03bab5e4252137ff
2014-01-30 11:11:38 -08:00
Dave Langemak
aa7386a746
am b738b392
: am c58cdd36
: am 48130ea9
: am 63ac2753
: .1 becomes .2
...
* commit 'b738b392f4da0a4975aeec3cbd1b270bcd194b26':
.1 becomes .2
2013-12-03 23:34:07 +00:00
Dave Langemak
63ac275378
.1 becomes .2
...
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
2013-12-03 15:06:56 -08:00
Dianne Hackborn
1460444ca1
am d54f8c2d
: am 1611712d
: am 221fcf31
: Merge "Just a little .1 makes all the difference in the world." into klp-dev
...
* commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078':
Just a little .1 makes all the difference in the world.
2013-11-14 15:49:32 -08:00
Dianne Hackborn
b6ab1203fb
Just a little .1 makes all the difference in the world.
...
Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497
2013-11-14 12:06:49 -08:00
Dianne Hackborn
269c6e1f26
resolved conflicts for merge of a3fd7bf0
to master
...
Change-Id: Ifcef32cbf9482aeec032e577c20761b74bdea775
2013-10-08 15:58:47 -07:00
Dianne Hackborn
6a4d333907
So long Key Lime Pie, it was nice knowing you.
...
Now we are KitKat.
I mean Android 4.4 API 19.
Or whatever.
Bug: 10348975
Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
2013-10-03 12:30:00 -07:00
Ben Cheng
670b8d2251
Switch ARM platform toolchain to GCC 4.8.
...
Change-Id: If08cfb2b9d86c08d3b658470440242b0af4d9916
2013-09-17 09:35:14 -07:00
Jake Hamby
200dbc5fea
Remove Moto OMA DM client from build tree.
...
Remove Moto OMA DM client from system image and intermediates.
Bug: 10455884
Change-Id: Idc0529d33911dc417f8f5b6db71808bf847eed3c
2013-08-29 17:27:21 +00:00
Mathew Inwood
0735c5f08c
Remove ApplicationsProvider.
...
ApplicationsProvider is going away since it's no longer needed. Remove it
from the build config.
Also add cleansteps to remove the APK & intermediates.
Bug: 10407790
Change-Id: I0b273d22e309822fde6d753b541f7ac648607b4e
2013-08-21 17:34:34 +01:00
Amith Yamasani
6b812201ef
Clean generated java files since framework intermediates has partially moved.
...
Change-Id: I89dea945e1c931e26985a6af7bf54ede93d2ee33
2013-07-18 18:48:32 -07:00
Christopher Tate
596395bb8f
Clean up /system/app -> /system/priv-app in incremental builds
...
Change-Id: Ib5596532e042e11cb1227d8a33367d24a3163431
2013-06-17 14:27:03 -07:00
Dianne Hackborn
6198be83d8
Bump up to API 18 to match jbmr2.
...
Change-Id: I84755411b6688edc373a8fbd44af0dbc8e89d2ac
2013-04-30 14:47:15 -07:00
Dianne Hackborn
a6e7f28492
Welcome, Key Lime Pie.
...
Change-Id: I51563ed3622d61a6396246c78b01605ff7a96b02
2013-03-05 10:29:24 -08:00
Dianne Hackborn
aa8c2956c2
You would not believe how much we all love jelly beans.
...
Seriously.
We looooooove them.
Especially Ryan.
Change-Id: I7ef04f1113147cb86a660c566b0d95d8c55eafd4
2013-02-01 16:51:45 -08:00
Ben Cheng
9c68f06a54
Merge commit 'ec4caba7' into manualmerge
...
Conflicts:
CleanSpec.mk
Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a
2012-12-13 11:03:58 -08:00
Ben Cheng
ec4caba79c
Enable lunch command to pick up new toolchain version.
...
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.
Change-Id: Icdacb8c46034b8a24a9875b7596b31d00861512a
2012-12-13 10:43:55 -08:00
Nick Kralevich
cced518b1e
It's a new version!
...
Change-Id: I97ba954c8726ae3b64c43260ce221642d5865c6d
2012-12-12 13:41:54 -08:00
Dianne Hackborn
aa48e74b60
Obviously JB MR1.1 should be Android 4.2.2.
...
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
2012-12-03 11:07:37 -08:00
Dianne Hackborn
0bc0394688
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
...
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
2012-09-27 15:11:47 -07:00
Ying Wang
86eab59783
am b4199b86
: am 1c27ac0e
: am 1b70bb21
: Merge "Clean step for libc."
...
* commit 'b4199b869bcc3b8dff6572c682fe09f74660268e':
Clean step for libc.
2012-09-06 10:44:12 -07:00
Ying Wang
7d862475fd
Clean step for libc.
...
(cherry-pick of ab1e93d4d4f4a46fa922df5ba7ccd41dde1221ac.)
Change-Id: I304312d6eb0346c050d02bd834565e0d43d8b4dd
2012-09-06 10:34:37 -07:00
Ying Wang
63c3871502
Clean up the crt*.o files.
...
To fix incremental build failure caused by
https://android-review.googlesource.com/41940
Change-Id: I9a977fe6e26fefaababdbb5d498b63e37884a4be
2012-09-06 10:34:07 -07:00
Ying Wang
ab1e93d4d4
Clean step for libc.
...
Change-Id: I6e11464eedea7ce073a3278e07825f777a32f62a
2012-09-05 16:18:14 -07:00
Dianne Hackborn
75f4c72320
This branch is now JB MR1 development.
...
Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
2012-07-30 18:32:04 -07:00
Ying Wang
7023f6179d
Fix build.
...
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
2012-07-27 09:57:36 -07:00
Ying Wang
89fa2850cc
Add clean step to introduce the newly added BUILD_EMULATOR.
...
Change-Id: I0de0625a12af0b98d6288df03024268326b909bf
2012-07-26 15:28:43 -07:00
Ying Wang
9f4d00b94b
am e534e2eb
: am 47450542
: Merge "Use Mac OS X SDK 10.6."
...
* commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
Use Mac OS X SDK 10.6.
2012-06-05 15:25:39 -07:00
Ying Wang
644dc164cc
Use Mac OS X SDK 10.6.
...
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
2012-06-05 14:23:22 -07:00
Ying Wang
3ec4061911
We want to clean *darwin-x86* obj files.
...
Change-Id: Iec204cfe39cde5434a8d09d8328d315d3c9abfcb
2012-06-05 11:36:09 -07:00
Ying Wang
abf72cf3f4
Use Mac OS X SDK 10.6.
...
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
2012-05-30 18:16:10 -07:00
Dianne Hackborn
3742983d3b
JellyBean is now 4.1.
...
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
2012-05-10 18:57:22 -07:00
Andrew Flynn
dc790b0f1d
Default ro.carrier to unknown
...
This was previously performed by init.c
Change-Id: Id34c636e06dfe2766446f909e9d05557163d812d
2012-04-16 10:16:02 -07:00
Dianne Hackborn
512ce9cb42
You know back when I said this thing about Ice Cream Sandwich MR2?
...
What was I thinking?
That would be *ridiculous*.
What sane person would come up with a release like that?!?
I mean... four words! Six if you try to say it! Insane!!
Instead, we shall call you:
Jelly Bean.
Yum.
Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
2012-01-25 11:21:37 -08:00
Dianne Hackborn
e73b24ccbe
Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
...
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
2011-12-07 10:30:19 -08:00
Dianne Hackborn
6e4e1bbbc1
Dev branch for ICS MR2.
...
Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
2011-11-10 15:19:51 -08:00
Dianne Hackborn
b32faad390
MR1 is version 4.1, API 15.
...
Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
2011-11-02 11:37:25 -07:00
Dianne Hackborn
7766ea2884
Let's call MR0 4.0.1.
...
Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
2011-09-21 15:25:37 -07:00
Dianne Hackborn
4d7ddab160
Hello, Android 4.0.
...
Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
2011-09-14 13:52:02 -07:00
Ying Wang
dc31d76b5d
Use TARGET_BOARD_INFO_FILE to locate board-info.txt
...
So board-info.txt can be inherited from the parent device.
Change-Id: I5d99a2483b9a325e475f3c602d9e0f5d2b95e80c
2011-06-13 17:36:08 -07:00
Dianne Hackborn
8edd7f9a35
resolved conflicts for merge of 3f72af13
to master
...
Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
2011-06-10 14:00:55 -07:00
Dianne Hackborn
0b22d93be3
Welcome, Android 3.2.
...
Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
2011-06-09 16:40:02 -07:00
Andreas Huber
7daec177bb
Cleanspec for change 109590
...
Change-Id: Icd4a6c3963d33b813e212015d954e9f06a489a05
2011-05-11 15:04:00 -07:00
Dianne Hackborn
22b5d62172
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
...
Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
2011-05-09 18:21:14 -07:00
Joe Onorato
c9ef69c32c
Remove app that's been removed.
...
Change-Id: Ie91629e3d44ee9b16ec2d0ea93978c738b682fb9
2011-04-06 12:09:45 -07:00
Dianne Hackborn
e4b2178329
Onward and upward! And ice cream for all!
...
Change-Id: If4f5541e1bac283f4c2f43d6e73e37c124ba7684
2011-03-24 16:59:32 -07:00
Iliyan Malchev
0cafe839e0
build: pass --strip-all, not --strip-debug to strip
...
Option --strip-all will remove the static symbol section in addition to debug
symbols. We do not need the static symbol table in libraries installed on the
target.
Change-Id: I7a52d22f5b45aa727f31bfd9af796b289528caef
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-17 10:09:59 -07:00
Iliyan Malchev
b375e71d30
build: remove prelinker build build system
...
This patch removes support for prelinking from the build system. By now, the
prelinker has outlived its usefulness for several reasons. Firstly, the
speedup that it afforded in the early days of Android is now nullified by the
speed of hardware, as well as by the presence of Zygote. Secondly, the space
savings that come with prelinking (measued at 17MB on a recent honeycomb
stingray build) are no longer important either. Thirdly, prelinking reduces
the effectiveness of Address-Space-Layout Randomization. Finally, since it is
not part of the gcc suite, the prelinker needs to be maintained separately.
The patch deletes apriori, soslim, lsd, isprelinked, and iself from the source
tree. It also removes the prelink map.
LOCAL_PRELINK_MODULE becomes a no-op. Individual Android.mk will get cleaned
separately. Support for prelinking will have to be removed from the recovery
code and from the dynamic loader as well.
Change-Id: I5839c9c25f7772d5183eedfe20ab924f2a7cd411
2011-03-12 14:59:46 -08:00
Dianne Hackborn
59daa2bc61
It's a new version!
...
Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
2011-03-09 18:20:40 -08:00
Dianne Hackborn
733ce0d0cc
DO NOT MERGE. Hello, Android 3.0 API 11.
...
Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
2011-01-23 14:49:02 -08:00
Amith Yamasani
1fd97c38b0
Clean the build.prop so that default notification sound is set properly.
...
Bug: 3349429
Change-Id: I44450a4cc9acdeffa42340c61088a5964fa6ee0d
2011-01-21 13:59:53 -08:00
Kristian Monsen
da7575bc70
Making more space for libwebcore.so
...
Taking half the space of libexpat.so and libbinder.so so there
is still room to grow (webkit mergers tend to make libwebcore
larger)
Change-Id: I6d5bf385221c8e199e587c3a7c8c9425a15a5bb6
2011-01-18 22:02:11 +00:00
Dianne Hackborn
68404ba40e
Bump API version up to 10, thus resource version up to 11.
...
Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
2011-01-16 11:07:28 -08:00
Dianne Hackborn
7e41e31038
We. Are. Honeycomb!
...
Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
2011-01-06 12:47:43 -08:00
Joe Onorato
e814ad4950
am 5c41c178
: am 700b88e1
: Pass device characteristic information through to aapt.
...
Merge commit '5c41c17868865d1f2e9e2ff4680b528da61d16af'
* commit '5c41c17868865d1f2e9e2ff4680b528da61d16af':
Pass device characteristic information through to aapt.
2010-10-08 14:36:43 -07:00
Ying Wang
4c5f5df2c2
resolved conflicts for merge of 222a835d
to master
...
Change-Id: I82b1f9338eadaed07dc803e56682f4bbb2a97fc3
2010-10-07 15:24:44 -07:00
Joe Onorato
700b88e145
Pass device characteristic information through to aapt.
...
A build configuration can define PRODUCT_CHARACTERISTICS, which is
a comma-separated list of device characteristics, for example
"nosdcard,grayscale". This will be passed through to aapt with
the --product flag.
Change-Id: I902c034b2f2824dbd2d33449308ee08beeb09551
2010-10-06 10:44:33 -04:00
Ying Wang
476d70aece
Clean step for CL 71822
...
Change-Id: Iddbefa915cdde0cc403134711b6ffd056c402db2
2010-10-05 18:07:29 -07:00
Brian Swetland
c1a1aa1eb5
deal with gps renaming
...
Change-Id: I488de95880be1c4fadf23a2fb4f7e7eb686d52c2
2010-09-21 15:58:12 -07:00
Jeff Hamilton
f5d730d5aa
Add more cleanspecs for the property files, fixing ro.secure.
...
Change-Id: Iae47959c25ca9779df7679528d1d61ebd3c48b50
2010-09-08 14:26:13 -05:00
Jean-Baptiste Queru
e7c0ad103c
am 49da72c2
: am dff3c597
: cleanspec for corrupted build.prop
...
Merge commit '49da72c25abeb36fc5d9a1c786ee3f232cfc7682'
* commit '49da72c25abeb36fc5d9a1c786ee3f232cfc7682':
cleanspec for corrupted build.prop
2010-09-07 11:56:45 -07:00
Jean-Baptiste Queru
dff3c59702
cleanspec for corrupted build.prop
...
Change-Id: Ib8d6719af92759272ae25607862391647dfe408d
2010-09-07 11:18:09 -07:00
Andreas Huber
36aa8c3798
resolved conflicts for merge of f739e312
to master
...
Change-Id: I3be6dbc299d2d761c96a6f00958d9a4c018ec290
2010-08-30 15:36:58 -07:00
Andreas Huber
a398961195
Cleanspec to make sure everything works consistently after turning off OpenCore.
...
Change-Id: Icf3ba66b8183e36247b4cfc623643e37f78d7144
related-to-bug: 2941153
2010-08-30 14:17:14 -07:00
Dianne Hackborn
79b4be961b
Change version codename.
...
Change-Id: I0bee8d54cf50448f53133eaae64bc0e57781d4ed
2010-07-27 14:59:24 -07:00
Jean-Baptiste Queru
d231c0648d
Add an empty CleanSpec.mk
...
Change-Id: Idc6adae88917383b19af0a7cfec88526cd6ac176
2010-03-08 18:04:03 -08:00