Narayan Kamath
b35b8bed84
am 110ea46e
: resolved conflicts for merge of 8af7e8ed
to master
...
* commit '110ea46e096b2aff0afb60224406fb76699308c7':
Add 32 / 64 bit abi lists to system properties.
2014-04-09 12:14:49 +00: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
Dianne Hackborn
c4d63403d6
am a3be3d8a
: Merge "It\'s L, dagnabbit."
...
* commit 'a3be3d8a8778c46dd2f30be349865f2589ec6068':
It's L, dagnabbit.
2014-03-05 12:57:37 -08:00
Dianne Hackborn
56dab18617
It's L, dagnabbit.
...
Change-Id: Ied4e6fce1464aa5cd012a5e2519df8462ec91b4c
2014-03-05 12:33:44 -08:00
Dianne Hackborn
6a03bf2e7e
am fc021daa
: Fix issue #12939338 : Android version showing as \'KKWT\'
...
* commit 'fc021daaca11917888ed941ee0ea1877965d437b':
Fix issue #12939338 : Android version showing as 'KKWT'
2014-02-21 10:34:55 -08:00
Justin Koh
c94a531b08
am 19753f45
: am bbfebfad
: resolved conflicts for merge of 303d2755
to klp-modular-dev-plus-aosp
...
* commit '19753f458bc5ec546f4c5bb304072a53b4f9357f':
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
2014-02-21 10:34:38 -08:00
Brian Carlstrom
456e2ec3de
am 7468e276
: am 03c16a30
: am aae47044
: Merge "CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit '7468e2767695c2736f4e1095e1f3579651ba4974':
CleanSpec for 49f1fab8a5
: Rename persist.sys.dalvik.vm.lib to allow new default
2014-02-21 10:34:32 -08:00
Brian Carlstrom
902e09d43a
resolved conflicts for merge of 966611a9
to master-nova
...
Change-Id: Iefe66d7b0bc604460ab18228233ec61c98490b8a
2014-02-21 10:29:55 -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
Ed Heyl
813b4f27b7
merge 601d39b688
...
Change-Id: I9795ab63b29481de392a8672d272082270894e1f
2014-02-03 09:47:42 -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