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
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
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
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
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
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
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
e5381d074f
Merge "verity: clean up verity build dependencies"
2014-04-30 20:47:58 +00:00
Ying Wang
09a4e6870d
Add SDK product for arm64, x86_64 and mips64.
...
Bug: 14411602
Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
2014-04-29 12:48:06 -07:00
Bill Yi
1e4adfa837
Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD
2014-04-29 11:32:53 -07:00
Colin Cross
8a30f72c0c
verity: clean up verity build dependencies
...
Move image dependencies out of PRODUCT_PACKAGES and into direct
dependencies for the image building rules.
Fix the test for PRODUCT_SUPPORTS_VERITY, it needs to check for
the current project as the global is no longer set.
Change-Id: I811501834ae5ec658229bd505fcc48275ff578c9
2014-04-28 17:19:04 -07:00
Ying Wang
8d4562a14d
resolved conflicts for merge of 0a694f4c
to master
...
Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
2014-04-25 09:28:00 -07:00
Ying Wang
0a694f4c57
am c564b691
: Remove libs from target/product/base.mk.
...
* commit 'c564b691d55d4dcede7ce46248b1a87acf3d2618':
Remove libs from target/product/base.mk.
2014-04-25 16:13:55 +00:00
Ying Wang
c564b691d5
Remove libs from target/product/base.mk.
...
LatinIME has libjni_latinime as dependency, so we don't need it in
PRODUCT_PACKAGES;
Moved libpac close to PacProcesser, which requires libpac.
Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
2014-04-24 17:12:58 -07:00
Lajos Molnar
9fcc2da4db
Merge "Remove VideoEditor"
2014-04-22 18:33:39 +00:00
Ian Rogers
2b96d6ae78
resolved conflicts for merge of 77efd7b4
to master
...
Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
2014-04-22 10:03:16 -07:00
Ian Rogers
77efd7b4cd
am f1d5dcdd
: am 850299f6
: Merge "Make the zygote 64-bit for the x86-64 emulator."
...
* commit 'f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:45:44 +00:00
Ian Rogers
f1d5dcdd30
am 850299f6
: Merge "Make the zygote 64-bit for the x86-64 emulator."
...
* commit '850299f6a6a831d47af68a3004a62df21b5fee3a':
Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:43:04 +00:00
Lajos Molnar
e685ff0f0c
Remove VideoEditor
...
This app is no longer supported as there are 3rd party video editing
apps, such as Google+ Video Editor.
Bug: 13542518
Change-Id: Ib3a4e2e7d3e261e12355650fc4db62ac59daef8e
2014-04-22 00:18:42 +00:00
Marco Nelissen
863c9e9cf5
Add libmediandk
...
Change-Id: I2c9645d16b56aafb05b52369b0774adffb575197
2014-04-21 10:26:17 -07:00
Ian Rogers
d4186e8c1f
Make the zygote 64-bit for the x86-64 emulator.
...
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
2014-04-18 17:09:33 -07:00
Ying Wang
105ed03cf0
am 25e75aba
: am 6e3bbf64
: am 0ac89b45
: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
...
* commit '25e75abac2c9229c0c4741e33f504a341a36ad94':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:42:38 +00:00
Ying Wang
25e75abac2
am 6e3bbf64
: am 0ac89b45
: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
...
* commit '6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:36:05 +00:00
Ying Wang
6e3bbf64b2
am 0ac89b45
: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
...
* commit '0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:34:34 +00:00
Ying Wang
e948255ac6
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
...
Bug: 11368415
Bug: 14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
2014-04-15 14:42:27 -07:00
Ben Murdoch
675919dfc7
All devices that depend on WebView must have the system feature.
...
We add a new system feature that declares if a functioning WebView is
present on the device, so copy that permission into builds that
depend on the WebView.
Bug: 13438487
Change-Id: I05bcfec2417862d41aacbacb8b2cc0e59f7c4549
2014-04-04 21:20:55 +01:00
Steve Moyer
b9d6f6f15c
Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
2014-04-04 16:32:06 +00:00
Geremy Condra
8cc491cff3
Merge "Add verity dev keys to build."
2014-04-04 00:49:51 +00:00
Steve Moyer
0ced06ea0f
DO NOT MERGE: Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-04-03 16:01:06 -07:00
Ji-Hwan Lee
dccce7bbe9
Add handheld_core_hardware.xml to telephony base
...
Bug: 13683526
Change-Id: I8085fa1abfa460213c3c9fe2a63217ee16b9ff8a
2014-04-03 14:23:40 +09:00
Geremy Condra
7afae2c115
Add verity dev keys to build.
...
These will be used when making images from your dev machine.
Change-Id: Ib1c894f6874a8e1a7d3d6e8133c8e897d40080d4
2014-04-02 18:17:39 -07:00
Narayan Kamath
c54d7f2148
am b6cc8421
: am 2c9552b7
: am aafbbe7e
: Merge "Add a default value for ro.zygote."
...
* commit 'b6cc84212875fda1b8d2ccc0a66fc6a2169933d9':
Add a default value for ro.zygote.
2014-04-01 18:33:37 +00:00
Narayan Kamath
b6cc842128
am 2c9552b7
: am aafbbe7e
: Merge "Add a default value for ro.zygote."
...
* commit '2c9552b78486ae1592303932dc70e00ff487d76f':
Add a default value for ro.zygote.
2014-04-01 16:33:26 +00:00
Narayan Kamath
39fd21a2df
Add a default value for ro.zygote.
...
Also makes sure the correct init config file is
copied across.
Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
2014-03-31 12:33:45 +01:00
Geremy Condra
9a6e87648b
Merge "Add the verity key to the verity dependencies."
2014-03-26 01:03:53 +00:00
Tim Kilbourn
428854952e
Add wifi-service to PRODUCT_PACKAGES.
...
Bug: 13622394
Change-Id: Ifa186db4b804bcb123b26324978c7a1ad986c1e2
2014-03-24 23:45:52 -07:00
Colin Cross
cf1f9d2d67
fix bad merge conflict resolution
...
Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d
2014-03-21 17:41:26 -07:00
Colin Cross
f2b60c0f80
resolved conflicts for merge of f8e4d1b7
to master
...
Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94
2014-03-21 17:25:08 -07:00
Adam Hampson
e3290e9e46
Merge "move libbcc from core_base to core_minimal"
2014-03-21 21:31:02 +00:00
Lajos Molnar
3d402686ca
Merge "stagefright: use media_codecs_google*.xml files"
2014-03-21 21:15:32 +00:00
Adam Hampson
ce91d3c0c0
move libbcc from core_base to core_minimal
...
Bug: 13528787
Change-Id: If8b531f71bf3831e4d3d59e2a2bc04dd72f4a8b1
Signed-off-by: Adam Hampson <ahampson@google.com>
2014-03-21 12:40:57 -07:00
Mark Renouf
50449c9cfa
am 37f3c5cc
: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
...
* commit '37f3c5cc1de11f7b316c2d03ed8f6951d4f95372':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
2014-03-21 16:22:07 +00:00
Mark Renouf
37f3c5cc1d
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
...
Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
2014-03-21 11:50:35 -04:00
Ying Wang
636dc20d1a
resolved conflicts for merge of ad495272
to master
...
Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
2014-03-20 15:24:52 -07:00
Ying Wang
7796921cc5
am 9ce34617
: am 4f9d6f57
: Merge "Fix embedded build"
...
* commit '9ce34617a001338093b0de85443925a37a967f0d':
Fix embedded build
2014-03-20 19:38:45 +00:00
Ying Wang
46d69e9914
am 9ce34617
: am 4f9d6f57
: Merge "Fix embedded build"
...
* commit '9ce34617a001338093b0de85443925a37a967f0d':
Fix embedded build
2014-03-20 19:36:32 +00:00
Ying Wang
8c7e74ee05
Fix embedded build
...
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.
Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
2014-03-20 12:13:10 -07:00
Lajos Molnar
f40956fbbf
stagefright: use media_codecs_google*.xml files
...
Bug: 13549114
Change-Id: I25d6344c78da152f394fa7b4855a2eb61008afc6
2014-03-19 17:39:39 -07:00
Geremy Condra
a8a7572169
Add the verity key to the verity dependencies.
...
Missed this last time around. Needed to boot.
Change-Id: I67f25ed442365ad0171ecbc37bc2de02b7108399
2014-03-18 21:25:26 -07:00
Geremy Condra
acd99d9367
Merge "Add verity build targets for verity-enabled devices."
2014-03-18 22:23:48 +00:00
Geremy Condra
0ac3b5d8e5
Add verity build targets for verity-enabled devices.
...
Change-Id: Ia9fa8e7ebe01b63e50d61071d36165a6a820c6c4
2014-03-17 20:18:49 -07:00
Eric Laurent
2044c09202
Merge "move audio policy service to a separate library"
2014-03-18 00:14:24 +00:00
Andy McFadden
68e1654aed
Remove "screenshot"
...
Remove the old "screenshot" utility, which has been replaced
by "screencap".
Change-Id: I5bad1fdad308339e4a16ce92f2a65e2437b1be65
2014-03-11 13:51:57 -07:00
Victoria Lease
e19b86cbbd
am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
2014-03-11 18:28:39 +00:00
Mark Salyzyn
5e9a4fa67b
am 4c65c202
: am 7fc3a06d
: Merge "build: add logd"
...
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
2014-03-11 18:16:24 +00:00
Stephen Hines
033aa738a8
am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit 'f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-03-07 19:40:01 +00:00
Colin Cross
21bef6460d
am 2fbe5018
: Merge "add linker64 and debuggerd64 to all products"
...
* commit '2fbe5018f94f536541c0137be472e58c79890813':
add linker64 and debuggerd64 to all products
2014-03-07 19:33:27 +00:00
Colin Cross
8743fc32df
am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
2014-03-07 19:33:07 +00:00
Ying Wang
14040db928
am bec954d0
: Merge "Clean up dangling module names"
...
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
2014-03-07 02:27:32 +00:00
Ying Wang
16ce683377
am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
2014-03-07 02:27:02 +00:00
David 'Digit' Turner
41925c4b06
am 145562fc
: Merge "Add missing font files to SDK system images."
...
* commit '145562fcef979e4fea946987717618dba6148aeb':
Add missing font files to SDK system images.
2014-03-07 02:25:51 +00:00
Elliott Hughes
17a1e7a412
am efb9603a
: Merge "[MIPS64] Add mips64 target"
...
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
[MIPS64] Add mips64 target
2014-03-07 02:24:02 +00:00
Eric Laurent
20d5476f7f
move audio policy service to a separate library
...
Change-Id: I2612253148238e0cce12bd5a0effcb790e86e5f0
2014-03-06 14:42:00 -08:00
Victoria Lease
c9b7f3d6a1
am 3c14d21a
: am 14a5be01
: am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '3c14d21a2a62398322479e015fecdb43652fb331':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:49:36 +00:00
Victoria Lease
14a5be0174
am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:42:48 +00:00
Victoria Lease
8da3a02c1f
Add external/google-fonts/*/fonts.mk.
...
Bug: 12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
2014-02-28 15:35:07 -08:00
Mark Salyzyn
b8424c7925
am 4c65c202
: am 7fc3a06d
: Merge "build: add logd"
...
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
2014-02-27 16:26:54 +00:00
Nick Kralevich
1884833c3a
build: add logd
...
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
2014-02-26 15:39:38 -08:00
Nicolas Prevot
c1b2536f63
Making ManagedProvisioning present in all phones/tablets.
...
Change-Id: Icf004835f526e5e6a2798fc5a0003c25d837289d
2014-02-25 10:04:12 +00:00
Mark Salyzyn
5bcb2c86d7
Merge "build: add logd"
2014-02-20 22:50:03 +00:00
Baligh Uddin
efa671d2fd
Add the Telecomm entry in core.mk
2014-02-20 14:15:01 -08:00
Steve Moyer
6bbb6a1fe3
Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51
2014-02-19 10:39:20 -08:00
Stephen Hines
a0d13d81d6
am 515f379f
: am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit '515f379f1dd14e7564ad99dec42549a263863166':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-02-18 23:18:06 +00:00
Stephen Hines
515f379f1d
am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit 'f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-02-18 23:12:37 +00:00
Stephen Hines
816b86f759
Add bcc to the list of PRODUCT_PACKAGES to install.
...
Bug: 7342767
As part of the process of sandboxing the online RenderScript compiler, we
need to install bcc.
Change-Id: Ia650bdcb760246f3f1e15ebb867f07d9802cdfbe
2014-02-18 14:21:39 -08:00
Colin Cross
b01233f26f
am a0eb50ac
: resolved conflicts for merge of 2fbe5018
to klp-modular-dev-plus-aosp
...
* commit 'a0eb50accabe83b18bd3fe3b9d6417a4718af9e2':
add linker64 and debuggerd64 to all products
2014-02-14 00:51:53 +00:00
Colin Cross
a0eb50acca
resolved conflicts for merge of 2fbe5018
to klp-modular-dev-plus-aosp
...
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
2014-02-13 16:32:48 -08:00
Colin Cross
381435353d
add linker64 and debuggerd64 to all products
...
Add linker64 and debuggerd64 to embedded.mk. They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.
Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
2014-02-13 16:23:33 -08:00
Colin Cross
59dc65a28a
am 481fed17
: am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit '481fed17fad5141154d8cf9532c0803ade24a6a6':
make 64-bit builds into multiarch builds
2014-02-13 21:38:00 +00:00
Colin Cross
481fed17fa
am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
2014-02-13 21:20:31 +00:00
Colin Cross
930b5fbcb9
make 64-bit builds into multiarch builds
...
Also enable the 64-bit binder interface and make them only use ART.
Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
2014-02-12 19:49:47 -08:00
Ying Wang
e6a65a5f15
resolved conflicts for merge of b6d53f0b
to master
...
Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
2014-02-12 14:58:06 -08:00
Ying Wang
b6d53f0b31
am bec954d0
: Merge "Clean up dangling module names"
...
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
2014-02-12 19:22:52 +00:00
Ying Wang
d18e570fba
Clean up dangling module names
...
Those modules have disappeared from the source tree.
https://code.google.com/p/android/issues/detail?id=61210
Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
2014-02-11 17:28:30 -08:00
Ying Wang
1eba3c14c7
am 484c7dec
: am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit '484c7dec798c8ba068f282d1d4398bfdd9b634d3':
Runtime resource overlay, iteration 2
2014-02-11 19:41:03 +00:00
Ying Wang
484c7dec79
am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
2014-02-11 19:34:55 +00:00
Ying Wang
ba46260f8d
Merge "Runtime resource overlay, iteration 2"
2014-02-11 19:27:59 +00:00
Justin Koh
f26c96edc5
resolved conflicts for merge of 34cb6460
to master
...
Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea
2014-02-11 11:26:14 -08:00