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
Ying Wang
a6b8025a81
Merge "Add WITH_DEXPREOPT to the list of protected global variables."
2014-05-02 03:57:33 +00:00
Ying Wang
9c44021535
Add WITH_DEXPREOPT to the list of protected global variables.
...
Bug: 14380196
Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
2014-05-01 20:55:30 -07:00
Michael Runge
6e836116f7
Add support for verifying OEM properties.
...
A separate OEM file must be specified to provide the expected
values for these properties. The list of properties comes from
the "oem_fingerprint_properties" list in misc_info.txt
Bug: b/13367676
Change-Id: I1a3eaf108492132cf6f595a5d1c9f7e0c3cb3142
2014-05-01 17:37:57 -07:00
Colin Cross
75b29ae078
build: add core_64_bit.mk
...
Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.
Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.
Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
2014-05-01 10:56:12 -07:00
Colin Cross
2a4f0ff32f
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
...
If the product prefers 32-bit apps signal that preference to
PackageManager by reversing the abi list.
Also uses the absence of TARGET_SUPPORTS_32_BIT_APPS and
TARGET_SUPPORTS_64_BIT_APPS to remove those ABIs from the
ABI list.
Change-Id: I504cea21b6f800a7a9e7706b4a7123d3fb07c383
2014-05-01 10:55:43 -07:00
Torne (Richard Coles)
a1215ab943
am 2b2a4953: am f0b5bfec: am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
...
* commit '2b2a495317f5b08d4b64ab7c95955b0cf8d0232e':
Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:31:59 +00:00
Torne (Richard Coles)
2b2a495317
am f0b5bfec: am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
...
* commit 'f0b5bfec7b0a715cd09da7540f0a772e31b65c71':
Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:25:02 +00:00
Torne (Richard Coles)
f0b5bfec7b
am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
...
* commit 'a0267df234db59d34891a01e0761233abc9ae4b1':
Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:20:19 +00:00
Torne (Richard Coles)
a0267df234
Merge "Remove libpac and v8 from the 64-bit blacklist."
2014-05-01 09:17:26 +00:00
Colin Cross
a3339e98e6
build: split TARGET_PREFER_32_BIT for apps and executables
...
Introduce two new flags, TARGET_PREFER_32_BIT_APPS and
TARGET_PREFER_32_BIT_EXECUTABLES that individually control
compilation of apps and executables. If TARGET_PREFER_32_BIT is
set, the build system will automatically set both new flags.
Change-Id: Ibd2165e688675c2884d9e7ddf82d7dd6c28521f3
2014-04-30 18:18:59 -07:00
Tim Murray
93dc057826
am cf53e0e0: am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
...
* commit 'cf53e0e0aaf569d7e76472e2958dca5a44f45df2':
Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 23:35:46 +00:00
Tim Murray
6f144b8f65
Add -no-integrated-as for ARM64.
...
Change-Id: I7faba190554aa43f43b2eb164bdc7b3bfab68ef0
2014-04-30 15:55:52 -07:00
Tim Murray
cf53e0e0aa
am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
...
* commit '27fe940676b568bb9a0af889028495fab73853f2':
Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:54:08 +00:00
Tim Murray
27fe940676
am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
...
* commit '7e65b6c1e53a51db0aa65126f2453f27daa0f22f':
Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:52:33 +00:00