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
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
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
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
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
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 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'aae470446504a869db05f9b70b7146ea47d746d5':
CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:16 +00:00
Brian Carlstrom
e71d9a2fd9
CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: 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 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
...
Change-Id: Id632beeb2f96dd4502ac4a6c03bab5e4252137ff
2014-01-30 11:11:38 -08:00
Dave Langemak
63ac275378
.1 becomes .2
...
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
2013-12-03 15:06:56 -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
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
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