smain@google.com
2e0551e58f
am 77a6812d
: Merge "add About secondary nav bar and delete the Wear custom header" into klp-modular-dev
...
* commit '77a6812dd844d586ded060e14bbbeccff7bd0338':
add About secondary nav bar and delete the Wear custom header
2014-06-13 22:15:09 +00:00
smain@google.com
77a6812dd8
Merge "add About secondary nav bar and delete the Wear custom header" into klp-modular-dev
2014-06-13 21:09:46 +00:00
smain@google.com
6040ffa1e8
add About secondary nav bar
...
and delete the Wear custom header
Change-Id: If7ac93556586d369a2dbf7e1fc4044473ace7bc9
2014-06-13 22:10:37 +00:00
Adam Lesinski
b9c024c674
am e20af003
: Merge "Add drm framework library to core_tiny" into klp-modular-dev
...
* commit 'e20af003e443ff2fd38a446613ecc28f0d10330a':
Add drm framework library to core_tiny
2014-06-13 20:47:33 +00:00
Elliott Hughes
7f880d15da
am 553c289a
: am 624220c1
: Merge "Remove useless stuff from "AndroidConfig.h"."
...
* commit '553c289afdbdd774e689898df4e8246fdf68182e':
Remove useless stuff from "AndroidConfig.h".
2014-06-12 23:58:12 +00:00
Elliott Hughes
553c289afd
am 624220c1
: Merge "Remove useless stuff from "AndroidConfig.h"."
...
* commit '624220c18a6fd4cabbc75344248eb770985df93c':
Remove useless stuff from "AndroidConfig.h".
2014-06-12 23:53:57 +00:00
Nick Kralevich
64dd84a94f
am 003f84fb
: am c80e876c
: Merge "Add service_contexts to embedded.mk."
...
* commit '003f84fbbbffa0eb0b6958a2f7f4a120206decc8':
Add service_contexts to embedded.mk.
2014-06-12 21:10:20 +00:00
Nick Kralevich
003f84fbbb
am c80e876c
: Merge "Add service_contexts to embedded.mk."
...
* commit 'c80e876cd2eab6452313a98c6ddeca403510784c':
Add service_contexts to embedded.mk.
2014-06-12 21:03:37 +00:00
Dirk Dougherty
89654d31a3
am a6913b5c
: Adjust heading sizes and weights.
...
* commit 'a6913b5c22b8eac6b5b62099c3a848a1e712d675':
Adjust heading sizes and weights.
2014-06-12 20:08:07 +00:00
Dirk Dougherty
a6913b5c22
Adjust heading sizes and weights.
...
Change-Id: Ib8b764bcb6c7d610e05bd6e38f8ee01a34dd5ce9
2014-06-12 19:14:24 +00:00
Scott Main
b7de5e8474
am c29b3f58
: changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
...
* commit 'c29b3f58b0edc60ecaaedb652475fdad4ffe7bfd':
changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
2014-06-12 19:04:36 +00:00
Adam Lesinski
e20af003e4
Merge "Add drm framework library to core_tiny" into klp-modular-dev
2014-06-12 05:34:42 +00:00
Nick Kralevich
c80e876cd2
Merge "Add service_contexts to embedded.mk."
2014-06-12 05:34:11 +00:00
Riley Spahn
8b834ecedb
Add service_contexts to embedded.mk.
...
Add service_contexts to embedded.mk to support MAC checks in the
service manager.
Bug: 12909011
Change-Id: I31f4f4e1acb2be8167f2f11f93c936c18303135a
2014-06-12 20:45:58 +00:00
Elliott Hughes
624220c18a
Merge "Remove useless stuff from "AndroidConfig.h"."
2014-06-12 03:32:07 +00:00
Elliott Hughes
e82d33d997
Remove useless stuff from "AndroidConfig.h".
...
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.
Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
2014-06-12 15:36:52 -07:00
Scott Main
c29b3f58b0
changes to sdk template for new install workflow.
...
add auto-redirect to install page after download starts.
Change-Id: Ic084742376870ab17eefd639d50540f6222cddf6
2014-06-11 20:25:30 -07:00
Ying Wang
b3529761af
am 2d4a27ee
: am d707b5aa
: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
...
* commit '2d4a27ee6cbd779b17eb8cd07dcbb9ff3bc8b2c0':
AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
2014-06-11 17:06:02 +00:00
Ying Wang
2d4a27ee6c
am d707b5aa
: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
...
* commit 'd707b5aa74730103a1978b2b47713b24bd2a7017':
AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
2014-06-11 17:02:27 +00:00
Ying Wang
2ebf7c1c5f
am 6b468193
: am cc2a47bf
: Merge "Check existence of both 64-bit and 32-bit module variants."
...
* commit '6b468193536c1925944ccbf6269ee057e080aef4':
Check existence of both 64-bit and 32-bit module variants.
2014-06-11 02:29:37 +00:00
Ying Wang
6b46819353
am cc2a47bf
: Merge "Check existence of both 64-bit and 32-bit module variants."
...
* commit 'cc2a47bf64b87f228b10c8f83b1575eee2aa1e76':
Check existence of both 64-bit and 32-bit module variants.
2014-06-11 02:27:44 +00:00
Ying Wang
4706eb3f22
am c72592b7
: am b2ba5636
: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
...
* commit 'c72592b7bdcfbedd51198b09917a7c331a552544':
Revert "Don't rename host libraries if only one arch is build."
2014-06-11 01:18:28 +00:00
Ying Wang
c72592b7bd
am b2ba5636
: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
...
* commit 'b2ba5636f187e7d2f3d2f0497bfaca68c5c7b06c':
Revert "Don't rename host libraries if only one arch is build."
2014-06-11 01:15:43 +00:00
Ying Wang
f1b35fb159
am fd76c34a
: am c34f37c7
: Merge "Allow to opt out both multilib in native test."
...
* commit 'fd76c34a1700d18677a461fb3ae777dd13f813ad':
Allow to opt out both multilib in native test.
2014-06-11 01:09:44 +00:00
Ying Wang
fd76c34a17
am c34f37c7
: Merge "Allow to opt out both multilib in native test."
...
* commit 'c34f37c7b5d26e58a9666fc277379111a7c2ea4f':
Allow to opt out both multilib in native test.
2014-06-11 01:07:14 +00:00
Ying Wang
19aa28379f
am 49d9a894
: am cec9dc14
: Merge "Don\'t rename host libraries if only one arch is build."
...
* commit '49d9a894dcc83ecbc4589d315a9c0799ee6d8846':
Don't rename host libraries if only one arch is build.
2014-06-11 00:27:46 +00:00
Ying Wang
49d9a894dc
am cec9dc14
: Merge "Don\'t rename host libraries if only one arch is build."
...
* commit 'cec9dc14185dd1df6704a4af226ffbb2a1b9cd87':
Don't rename host libraries if only one arch is build.
2014-06-11 00:24:10 +00:00
Ying Wang
32aff8085a
am 6bfbfee5
: am a45a5d27
: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
...
* commit '6bfbfee5358715933fa90cc3ecd8fcf43338315b':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
2014-06-10 23:32:41 +00:00
Ying Wang
6bfbfee535
am a45a5d27
: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
...
* commit 'a45a5d27972070895001571b7912655b0bd0931c':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
2014-06-10 23:28:52 +00:00
Ying Wang
dceddd91d9
am 79b46720
: am 02f98a26
: Merge "Fix loophole in module expansion."
...
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
Fix loophole in module expansion.
2014-06-10 22:29:18 +00:00
Ying Wang
79b46720e6
am 02f98a26
: Merge "Fix loophole in module expansion."
...
* commit '02f98a26c9e305077f11a5e2f81494dd3a0a2a2c':
Fix loophole in module expansion.
2014-06-10 22:25:53 +00:00
Ying Wang
cc2a47bf64
Merge "Check existence of both 64-bit and 32-bit module variants."
2014-06-10 22:20:24 +00:00
Ying Wang
ff3a904522
Check existence of both 64-bit and 32-bit module variants.
...
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.
Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
2014-06-10 19:23:29 -07:00
Ying Wang
d707b5aa74
Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
2014-06-10 22:15:14 +00:00
Ying Wang
c34f37c7b5
Merge "Allow to opt out both multilib in native test."
2014-06-10 22:15:14 +00:00
Ying Wang
ad10cc76b6
Allow to opt out both multilib in native test.
...
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.
Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
2014-06-10 17:52:20 -07:00
Ying Wang
cec9dc1418
Merge "Don't rename host libraries if only one arch is build."
2014-06-10 22:15:14 +00:00
Ying Wang
b1f7fb7a50
Don't rename host libraries if only one arch is build.
...
This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.
Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
2014-06-10 17:18:08 -07:00
Ying Wang
a45a5d2797
Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted"
2014-06-10 22:15:14 +00:00
Ying Wang
6e85f8b0de
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
...
Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.
Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
2014-06-10 16:24:31 -07:00
Ying Wang
b2ba5636f1
Merge "Revert "Don't rename host libraries if only one arch is build.""
2014-06-10 22:08:45 +00:00
Ying Wang
532f1127af
Revert "Don't rename host libraries if only one arch is build."
...
This reverts commit b1f7fb7a50
.
Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
2014-06-11 01:12:18 +00:00
Ying Wang
02f98a26c9
Merge "Fix loophole in module expansion."
2014-06-10 21:59:54 +00:00
Ying Wang
e1b867dde7
Fix loophole in module expansion.
...
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.
With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.
Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
2014-06-10 14:30:30 -07:00
Ying Wang
0d27626620
am 128cd1b7
: am 6cc4598d
: Merge "Add global variable HOST_LIBRARY_PATH."
...
* commit '128cd1b7eb66ccb05de417a93d6e432447dc875a':
Add global variable HOST_LIBRARY_PATH.
2014-06-10 20:35:08 +00:00
Ying Wang
128cd1b7eb
am 6cc4598d
: Merge "Add global variable HOST_LIBRARY_PATH."
...
* commit '6cc4598d18c660d4e253970bc875be5fa08c770b':
Add global variable HOST_LIBRARY_PATH.
2014-06-10 20:33:04 +00:00
Ying Wang
6cc4598d18
Merge "Add global variable HOST_LIBRARY_PATH."
2014-06-10 20:31:23 +00:00
Elliott Hughes
b515347710
am c7504124
: am 47cdacd5
: Merge "Remove libportable from core_base.mk."
...
* commit 'c75041243c1c189e6972eb8680c83f1b17dacfd7':
Remove libportable from core_base.mk.
2014-06-10 19:27:47 +00:00
Elliott Hughes
c75041243c
am 47cdacd5
: Merge "Remove libportable from core_base.mk."
...
* commit '47cdacd5e633c8256a5dd32c769b5469882fc0aa':
Remove libportable from core_base.mk.
2014-06-10 19:25:57 +00:00
Elliott Hughes
47cdacd5e6
Merge "Remove libportable from core_base.mk."
2014-06-10 19:23:53 +00:00