Ying Wang
bf145f8805
am bf4cdb49
: am c3b2314a
: am a37550ed
: Merge "Use prebuilt flex."
...
* commit 'bf4cdb49a3e56b37f8bd2eeeeeb4a72795dcd0a9':
Use prebuilt flex.
2014-05-06 18:52:06 +00:00
Ying Wang
bf4cdb49a3
am c3b2314a
: am a37550ed
: Merge "Use prebuilt flex."
...
* commit 'c3b2314a58e8d6f90766db2ef82303bafcefb766':
Use prebuilt flex.
2014-05-06 18:46:10 +00:00
Ying Wang
c3b2314a58
am a37550ed
: Merge "Use prebuilt flex."
...
* commit 'a37550edd39b3520839251b2a4acceca779a8a8b':
Use prebuilt flex.
2014-05-06 18:43:28 +00:00
Ying Wang
a37550edd3
Merge "Use prebuilt flex."
2014-05-06 18:41:00 +00:00
Ying Wang
d8b39956f8
am 9c7393b8
: am e9dd544d
: am 889a93a4
: Merge "add silvermont x86 architecture"
...
* commit '9c7393b87aed5ae6acd97529b05ce26f80627259':
add silvermont x86 architecture
2014-05-06 16:28:00 +00:00
Ying Wang
9c7393b87a
am e9dd544d
: am 889a93a4
: Merge "add silvermont x86 architecture"
...
* commit 'e9dd544dfed3a974d2bb2e6f783238ecfe64fb6c':
add silvermont x86 architecture
2014-05-06 16:24:30 +00:00
Ying Wang
e9dd544dfe
am 889a93a4
: Merge "add silvermont x86 architecture"
...
* commit '889a93a49582fa17049f0424af3c1c06f70db407':
add silvermont x86 architecture
2014-05-06 16:20:51 +00:00
Ying Wang
889a93a495
Merge "add silvermont x86 architecture"
2014-05-06 16:18:56 +00:00
Ying Wang
40227dfaaf
am 876dca69
: am 2c32044d
: am b7e0bdc0
: Merge "Increase system image size of generic_x86_64 to 750MB."
...
* commit '876dca695d1be00054fe7c4b5ac4e7c36b6c1eb9':
Increase system image size of generic_x86_64 to 750MB.
2014-05-06 02:09:46 +00:00
Ying Wang
876dca695d
am 2c32044d
: am b7e0bdc0
: Merge "Increase system image size of generic_x86_64 to 750MB."
...
* commit '2c32044d95501b376cd8f912b28c957accfb1873':
Increase system image size of generic_x86_64 to 750MB.
2014-05-06 02:05:46 +00:00
Ying Wang
2c32044d95
am b7e0bdc0
: Merge "Increase system image size of generic_x86_64 to 750MB."
...
* commit 'b7e0bdc02be3c505c72d431c1addd42016d0a7fc':
Increase system image size of generic_x86_64 to 750MB.
2014-05-06 02:03:55 +00:00
Ying Wang
b7e0bdc02b
Merge "Increase system image size of generic_x86_64 to 750MB."
2014-05-06 02:01:58 +00:00
Ying Wang
ff4aa89db8
Increase system image size of generic_x86_64 to 750MB.
...
Change-Id: I0c3264c7f629bc4d8c30539590de00967188807b
2014-05-05 19:01:28 -07:00
Ying Wang
fb1236a9a8
Use prebuilt flex.
...
Bug: 14446414
Change-Id: I07fe8d7f246de853e5bae17286834268e36d260c
2014-05-05 18:34:57 -07:00
Colin Cross
d2151e1402
am 40aabbee
: am 9150a90d
: am 5128237a
: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
...
* commit '40aabbeeac53a01d42316423c7091612a1302b3f':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
2014-05-05 23:37:07 +00:00
Colin Cross
40aabbeeac
am 9150a90d
: am 5128237a
: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
...
* commit '9150a90dafd6554519d41e5efffeb501268cf8de':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
2014-05-05 23:09:04 +00:00
Colin Cross
9150a90daf
am 5128237a
: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
...
* commit '5128237ad3312523c5a1390efce33ad77f0f2ff0':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
2014-05-05 23:05:14 +00:00
Colin Cross
5128237ad3
Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
2014-05-05 23:02:45 +00:00
Colin Cross
772c216e71
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
...
Set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS,
TARGET_PREFERS_32_BIT_APPS is enough to get apps to build for
32-bit only, and leaving TARGET_SUPPORTS_64_BIT_APPS unset
confuses zygote64 because it finds an empty 64-bit ABI list.
Change-Id: Iadea7f2b42c216710b54aeac6011a4e30e0f2eaa
2014-05-05 15:25:41 -07:00
Marco Nelissen
5f3be2ddcd
Merge "Add libmediandk"
2014-05-05 21:28:25 +00:00
Colin Cross
39fef1f420
am 6f916664
: am 735628e8
: am 2ff8919d
: Merge changes I7e809264,I504cea21,Ibd2165e6
...
* commit '6f9166640a62f694a257a307284ea1c442f66a7b':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05 20:22:36 +00:00
Colin Cross
6f9166640a
am 735628e8
: am 2ff8919d
: Merge changes I7e809264,I504cea21,Ibd2165e6
...
* commit '735628e8d19fae51574bd5057c142db56797a2b0':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05 20:18:09 +00:00
Colin Cross
735628e8d1
am 2ff8919d
: Merge changes I7e809264,I504cea21,Ibd2165e6
...
* commit '2ff8919de339209412d9da2a524f566dfcf5847f':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05 20:14:18 +00:00
Colin Cross
2ff8919de3
Merge changes I7e809264,I504cea21,Ibd2165e6
...
* changes:
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05 20:11:28 +00:00
Michael Runge
0a2ce08f66
Merge "Support block OTA + OEM partition"
2014-05-05 19:57:56 +00:00
Michael Runge
c6e3afd26d
Support block OTA + OEM partition
...
Change-Id: I9e662098569a43b05279908e6833e9552a7abe3a
2014-05-05 12:22:12 -07:00
David 'Digit' Turner
1ce02c9847
Merge "envsetup.sh: Use prebuilt emulator binaries if available."
2014-05-05 19:09:10 +00:00
Ying Wang
15f6287e09
am 0049c40e
: am 54a570bd
: am 57df0c7b
: Merge "Increase system image size of generic_x86_64 to 650MB."
...
* commit '0049c40efd053d0fae186515e7cfc3fc0671c4cd':
Increase system image size of generic_x86_64 to 650MB.
2014-05-05 18:50:19 +00:00
Ying Wang
0049c40efd
am 54a570bd
: am 57df0c7b
: Merge "Increase system image size of generic_x86_64 to 650MB."
...
* commit '54a570bd1da36041124965110f4d2d1206558c82':
Increase system image size of generic_x86_64 to 650MB.
2014-05-05 18:45:57 +00:00
Ying Wang
54a570bd1d
am 57df0c7b
: Merge "Increase system image size of generic_x86_64 to 650MB."
...
* commit '57df0c7bf5a78b1c4edb7e06d22ccc91ad46b41d':
Increase system image size of generic_x86_64 to 650MB.
2014-05-05 18:41:32 +00:00
Ying Wang
57df0c7bf5
Merge "Increase system image size of generic_x86_64 to 650MB."
2014-05-05 18:37:29 +00:00
Ying Wang
edf99a23ee
Increase system image size of generic_x86_64 to 650MB.
...
Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
2014-05-05 11:34:30 -07:00
Justin Koh
f0e151152a
am 007f8c80
: am 0e35df2a
: Add ContactsProvider to core_tiny.
...
* commit '007f8c804fbabfea461db546eb46ac9b1d3e9e3d':
Add ContactsProvider to core_tiny.
2014-05-05 17:50:37 +00:00
Justin Koh
007f8c804f
am 0e35df2a
: Add ContactsProvider to core_tiny.
...
* commit '0e35df2a7c77a6308106fa9a48f90c4729b9b8f3':
Add ContactsProvider to core_tiny.
2014-05-05 17:46:55 +00:00
David 'Digit' Turner
7cde030346
envsetup.sh: Use prebuilt emulator binaries if available.
...
This patch changes the setpaths() function in envsetup.sh to probe
for prebuilts/android-emulator/<host>/, and prepend it to PATH if
it exists.
See https://googleplex-android-review.googlesource.com/#/c/459741/
for a related patch that adds the binaries.
BUG=13747402
Change-Id: I30794ea52f6dfc58908e6271f2c0da8e2f0b68e8
2014-05-05 16:13:50 +02:00
Justin Koh
0e35df2a7c
Add ContactsProvider to core_tiny.
...
Add ContactsProvider to core_tiny: this is necessary to pass CTS.
Change-Id: I159109740f329e5c540ffb6f1cd1b1a7f9429d86
2014-05-04 16:31:02 -07:00
Colin Cross
e8eef02cca
Merge "verity: switch to C++ version of build_verity_tree"
2014-05-02 23:52:16 +00:00
Dirk Dougherty
03257fe50c
am d19aa4ba
: am 611d7e14
: am 379d9968
: am e21bed28
: Merge changes from templates-sdk to templates-sdk-dyn.
...
* commit 'd19aa4bae2161f89966e38cb099f2f080e2bbfac':
Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 23:03:45 +00:00
Dirk Dougherty
d19aa4bae2
am 611d7e14
: am 379d9968
: am e21bed28
: Merge changes from templates-sdk to templates-sdk-dyn.
...
* commit '611d7e14e87d030cd5d89b932a1877289ab68e8d':
Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:58:02 +00:00
Dirk Dougherty
611d7e14e8
am 379d9968
: am e21bed28
: Merge changes from templates-sdk to templates-sdk-dyn.
...
* commit '379d9968ccc31701053eca7e0d809f2f52c0b964':
Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:54:45 +00:00
Dirk Dougherty
379d9968cc
am e21bed28
: Merge changes from templates-sdk to templates-sdk-dyn.
...
* commit 'e21bed28acdd21f6000d1de30538839085ffa890':
Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:50:25 +00:00
Dirk Dougherty
e21bed28ac
Merge changes from templates-sdk to templates-sdk-dyn.
...
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
2014-05-02 15:44:20 -07:00
Chad Jones
072923238d
Expand PDK platform.zip auto-detect to named with vendor/pdk/PRODUCT
...
Change-Id: Ib813c9333541fa041a0902dab113fb7dc01f7e45
2014-05-02 12:39:02 -07:00
Tim Murray
f38dd880c9
am 09e044ea
: am 6ac74e6d
: am d720c5a2
: Merge "Add -no-integrated-as for ARM64."
...
* commit '09e044ea813cc23b1d3b5ed99b20dea9ec7c5328':
Add -no-integrated-as for ARM64.
2014-05-02 18:30:12 +00:00
Tim Murray
09e044ea81
am 6ac74e6d
: am d720c5a2
: Merge "Add -no-integrated-as for ARM64."
...
* commit '6ac74e6d81744654b6ca36b5df369975a1fcc655':
Add -no-integrated-as for ARM64.
2014-05-02 18:26:14 +00:00
Tim Murray
6ac74e6d81
am d720c5a2
: Merge "Add -no-integrated-as for ARM64."
...
* commit 'd720c5a2a6cb44e76c20f96d33b0ac8a96060d91':
Add -no-integrated-as for ARM64.
2014-05-02 18:24:20 +00:00
Tim Murray
d720c5a2a6
Merge "Add -no-integrated-as for ARM64."
2014-05-02 18:21:34 +00:00
Ying Wang
4056798282
am 372df5a4
: am 887a52d0
: am a6b8025a
: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
...
* commit '372df5a49ebae4ce04df4633be195afb224c5d86':
Add WITH_DEXPREOPT to the list of protected global variables.
2014-05-02 04:05:59 +00:00
Ying Wang
372df5a49e
am 887a52d0
: am a6b8025a
: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
...
* commit '887a52d02251a1a94f8e17ecbfe26ba15ece6af5':
Add WITH_DEXPREOPT to the list of protected global variables.
2014-05-02 04:03:18 +00:00
Ying Wang
887a52d022
am a6b8025a
: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
...
* commit 'a6b8025a815cc5c9b441a91917f100486c270446':
Add WITH_DEXPREOPT to the list of protected global variables.
2014-05-02 04:00:30 +00:00