Svetoslav
af39741f1e
Merge "Adding the PDF rendering library to the build"
2014-05-15 20:14:52 +00:00
Victoria Lease
2d32ad48ce
Merge "deprecate external/sil-fonts"
2014-05-15 14:47:50 +00:00
Kenny Root
4884f8738d
am d36d61be
: am abe42666
: Move libkeystore to minimal
...
* commit 'd36d61bec8d728088a300a392b9815555a0203d4':
Move libkeystore to minimal
2014-05-14 19:46:07 +00:00
Kenny Root
d36d61bec8
am abe42666
: Move libkeystore to minimal
...
* commit 'abe426663a0534db685f2d44b8cd9a47480fb52f':
Move libkeystore to minimal
2014-05-14 19:40:53 +00:00
Kenny Root
abe426663a
Move libkeystore to minimal
...
The ENGINE needs to be included to make the keystore useful, so if
keystore is included, also include libkeystore.
Change-Id: I042a4eb02450d090f10437deb736e1c4a4105df7
2014-05-14 11:50:35 -07:00
Sreeram Ramachandran
61fa8d83e3
Introduce netd_client, a dynamic library that talks to netd.
...
(cherry picked from commit 440de6b9f715cb18b8ee888c58d5c7a659ff5073)
Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 15:59:05 +00:00
Svetoslav
41278dd27e
Adding the PDF rendering library to the build
...
Change-Id: I4e77d60154e8a6c9d1ceba0224d8710e36e56193
2014-05-13 15:47:49 -07:00
Victoria Lease
d8141b26f7
deprecate external/sil-fonts
...
Change-Id: Ic6113453acf94e1346dede99274cb4b20ad5a866
2014-05-13 10:44:49 -07:00
Ying Wang
2ec7c7a21c
am 5c7c9887
: am 03d02a26
: am b082b5f1
: Merge "Disable DEXPREOPT until we have multilib support"
...
* commit '5c7c9887f4216dbd94cc40451b3e4cc3dfd5a441':
Disable DEXPREOPT until we have multilib support
2014-05-13 17:06:01 +00:00
Ying Wang
5c7c9887f4
am 03d02a26
: am b082b5f1
: Merge "Disable DEXPREOPT until we have multilib support"
...
* commit '03d02a2687cbd59b8871ccbe0eeb3c2c51df063c':
Disable DEXPREOPT until we have multilib support
2014-05-13 16:58:47 +00:00
Ying Wang
03d02a2687
am b082b5f1
: Merge "Disable DEXPREOPT until we have multilib support"
...
* commit 'b082b5f1b2d1a45ee91de186428d5e341d02c08a':
Disable DEXPREOPT until we have multilib support
2014-05-13 16:54:29 +00:00
Ying Wang
a93102d411
Disable DEXPREOPT until we have multilib support
...
Bug: 14694978
Change-Id: I31d0f1c78a668435646c99e659cec46cd2f3ddf7
2014-05-13 09:46:23 -07:00
Baligh Uddin
b3fa045281
am efa671d2
: Add the Telecomm entry in core.mk
...
* commit 'efa671d2fd17280d096d914e492dd25db114c787':
Add the Telecomm entry in core.mk
2014-05-12 23:25:28 +00:00
Geremy Condra
c10320eef3
Merge "Add verity support to make dist
."
2014-05-12 17:00:58 +00:00
David 'Digit' Turner
edc702c7d6
am 873782cc
: am 9e3259f5
: am fb67f05d
: Merge changes I53b2ada9,I30794ea5
...
* commit '873782ccd44349c766f5d74e65b3b323618dd6ed':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:28:16 +00:00
David 'Digit' Turner
873782ccd4
am 9e3259f5
: am fb67f05d
: Merge changes I53b2ada9,I30794ea5
...
* commit '9e3259f50d6aa2ca4430430d71d2fffd58662650':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:23:35 +00:00
David 'Digit' Turner
9e3259f50d
am fb67f05d
: Merge changes I53b2ada9,I30794ea5
...
* commit 'fb67f05d3d6deb2400fd09390550a7858a3c3158':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:19:43 +00:00
Geremy Condra
5b5f4958d8
Add verity support to make dist
.
...
Without this, system images will be built that do not contain the
necessary bits for verification.
Change-Id: I87c15282b26377d7a2a1540e3d0e30b0299622e3
2014-05-10 18:31:07 -07:00
David 'Digit' Turner
f6e2694dd2
Disable emulator from platform builds.
...
Now that emulator prebuilts are available under prebuilts/android-emulator/,
disable building the emulator from source in all platform builds, except
if one defines BUILD_EMULATOR to 'true' in its environment.
NOTE: This patch should be applied after this one to avoid issues
with the GPU emulation libraries:
https://android-review.googlesource.com/93980
Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42
2014-05-09 15:32:39 +02:00
Ed Heyl
0cd5ec5b16
Merge "Fix build: Revert "Add verity support to make dist
.""
2014-05-09 05:58:28 +00:00
Ed Heyl
3e92fd0fba
Fix build: Revert "Add verity support to make dist
."
...
This reverts commit 5dee206d8e
.
Change-Id: I6f4f536c127d3e5dcb6594efb193231cd8dece7e
2014-05-09 05:53:54 +00:00
Xavier Ducrohet
7b967dc13f
am a6a2969e
: Resolved conflicts for merge of 05a7a955
to klp-modular-dev-plus-aosp
...
* commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
Remove SDK Tools from platform builds.
2014-05-09 02:13:32 +00:00
Xavier Ducrohet
a6a2969e02
Resolved conflicts for merge of 05a7a955
to klp-modular-dev-plus-aosp
...
Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
2014-05-08 18:48:26 -07:00
Geremy Condra
c921b1eb19
Merge "Add verity support to make dist
."
2014-05-09 01:39:44 +00:00
Xavier Ducrohet
05a7a955c1
am afe444a5
: Merge "Remove SDK Tools from platform builds."
...
* commit 'afe444a564ed72cdda792822a0c9dab57a8c9172':
Remove SDK Tools from platform builds.
2014-05-09 00:52:34 +00:00
Xavier Ducrohet
afe444a564
Merge "Remove SDK Tools from platform builds."
2014-05-09 00:46:45 +00:00
Tsu Chiang Chuang
7e9d23d9e7
am c0d50f62
: am 5bd1da1e
: am 41d8760d
: Merge "Bump userdata image size from 200 MB to 550 MB"
...
* commit 'c0d50f6295e9c552456c825f9c8045dced05a409':
Bump userdata image size from 200 MB to 550 MB
2014-05-08 23:12:40 +00:00
Tsu Chiang Chuang
c0d50f6295
am 5bd1da1e
: am 41d8760d
: Merge "Bump userdata image size from 200 MB to 550 MB"
...
* commit '5bd1da1e0e9dff444f98fb1b2e2954663041198f':
Bump userdata image size from 200 MB to 550 MB
2014-05-08 23:01:48 +00:00
Tsu Chiang Chuang
5bd1da1e0e
am 41d8760d
: Merge "Bump userdata image size from 200 MB to 550 MB"
...
* commit '41d8760d683f21d2868fbfb6872a3cf65b9edbcb':
Bump userdata image size from 200 MB to 550 MB
2014-05-08 22:50:27 +00:00
Xavier Ducrohet
51e303a281
Remove SDK Tools from platform builds.
...
(cherry picked from commit edf30221b4890673dc714a1efef3b5faf4ae1522)
Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
2014-05-08 14:50:15 -07: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
Geremy Condra
5dee206d8e
Add verity support to make dist
.
...
Without this, system images will be built that do not contain the
necessary bits for verification.
Change-Id: Icaa636085dbfd386424c90dfbe404c5960df0fe4
2014-05-06 18:06:18 -07:00
Tsu Chiang Chuang
27a026c802
Bump userdata image size from 200 MB to 550 MB
...
Change-Id: Ibdf319091a7187dc894f4a923d40868cec4b7b41
2014-05-06 17:40:23 -07: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
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
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