OSDN Git Service
Elliott Hughes [Thu, 12 Jun 2014 23:58:12 +0000 (23:58 +0000)]
am
553c289a: am
624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
* commit '
553c289afdbdd774e689898df4e8246fdf68182e':
Remove useless stuff from "AndroidConfig.h".
Elliott Hughes [Thu, 12 Jun 2014 23:53:57 +0000 (23:53 +0000)]
am
624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
* commit '
624220c18a6fd4cabbc75344248eb770985df93c':
Remove useless stuff from "AndroidConfig.h".
Nick Kralevich [Thu, 12 Jun 2014 21:10:20 +0000 (21:10 +0000)]
am
003f84fb: am
c80e876c: Merge "Add service_contexts to embedded.mk."
* commit '
003f84fbbbffa0eb0b6958a2f7f4a120206decc8':
Add service_contexts to embedded.mk.
Nick Kralevich [Thu, 12 Jun 2014 21:03:37 +0000 (21:03 +0000)]
am
c80e876c: Merge "Add service_contexts to embedded.mk."
* commit '
c80e876cd2eab6452313a98c6ddeca403510784c':
Add service_contexts to embedded.mk.
Dirk Dougherty [Thu, 12 Jun 2014 20:08:07 +0000 (20:08 +0000)]
am
a6913b5c: Adjust heading sizes and weights.
* commit '
a6913b5c22b8eac6b5b62099c3a848a1e712d675':
Adjust heading sizes and weights.
Dirk Dougherty [Thu, 12 Jun 2014 00:28:38 +0000 (17:28 -0700)]
Adjust heading sizes and weights.
Change-Id: Ib8b764bcb6c7d610e05bd6e38f8ee01a34dd5ce9
Scott Main [Thu, 12 Jun 2014 19:04:36 +0000 (19:04 +0000)]
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.
Nick Kralevich [Thu, 12 Jun 2014 21:00:30 +0000 (21:00 +0000)]
Merge "Add service_contexts to embedded.mk."
Riley Spahn [Tue, 10 Jun 2014 00:24:18 +0000 (17:24 -0700)]
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
Elliott Hughes [Thu, 12 Jun 2014 23:51:42 +0000 (23:51 +0000)]
Merge "Remove useless stuff from "AndroidConfig.h"."
Elliott Hughes [Thu, 12 Jun 2014 22:17:31 +0000 (15:17 -0700)]
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
Scott Main [Sat, 31 May 2014 04:18:30 +0000 (21:18 -0700)]
changes to sdk template for new install workflow.
add auto-redirect to install page after download starts.
Change-Id: Ic084742376870ab17eefd639d50540f6222cddf6
Ying Wang [Wed, 11 Jun 2014 17:06:02 +0000 (17:06 +0000)]
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
Ying Wang [Wed, 11 Jun 2014 17:02:27 +0000 (17:02 +0000)]
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
Ying Wang [Wed, 11 Jun 2014 02:29:37 +0000 (02:29 +0000)]
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.
Ying Wang [Wed, 11 Jun 2014 02:27:44 +0000 (02:27 +0000)]
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.
Ying Wang [Wed, 11 Jun 2014 01:18:28 +0000 (01:18 +0000)]
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."
Ying Wang [Wed, 11 Jun 2014 01:15:43 +0000 (01:15 +0000)]
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."
Ying Wang [Wed, 11 Jun 2014 01:09:44 +0000 (01:09 +0000)]
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.
Ying Wang [Wed, 11 Jun 2014 01:07:14 +0000 (01:07 +0000)]
am
c34f37c7: Merge "Allow to opt out both multilib in native test."
* commit '
c34f37c7b5d26e58a9666fc277379111a7c2ea4f':
Allow to opt out both multilib in native test.
Ying Wang [Wed, 11 Jun 2014 00:27:46 +0000 (00:27 +0000)]
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.
Ying Wang [Wed, 11 Jun 2014 00:24:10 +0000 (00:24 +0000)]
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.
Ying Wang [Tue, 10 Jun 2014 23:32:41 +0000 (23:32 +0000)]
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
Ying Wang [Tue, 10 Jun 2014 23:28:52 +0000 (23:28 +0000)]
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
Ying Wang [Tue, 10 Jun 2014 22:29:18 +0000 (22:29 +0000)]
am
79b46720: am
02f98a26: Merge "Fix loophole in module expansion."
* commit '
79b46720e606e3db5fff87f672b73613a9a19c69':
Fix loophole in module expansion.
Ying Wang [Tue, 10 Jun 2014 22:25:53 +0000 (22:25 +0000)]
am
02f98a26: Merge "Fix loophole in module expansion."
* commit '
02f98a26c9e305077f11a5e2f81494dd3a0a2a2c':
Fix loophole in module expansion.
Ying Wang [Wed, 11 Jun 2014 02:25:43 +0000 (02:25 +0000)]
Merge "Check existence of both 64-bit and 32-bit module variants."
Ying Wang [Wed, 11 Jun 2014 02:23:29 +0000 (19:23 -0700)]
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
Ying Wang [Wed, 11 Jun 2014 16:59:50 +0000 (16:59 +0000)]
Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
Ying Wang [Wed, 11 Jun 2014 01:03:22 +0000 (01:03 +0000)]
Merge "Allow to opt out both multilib in native test."
Ying Wang [Wed, 11 Jun 2014 00:52:20 +0000 (17:52 -0700)]
Allow to opt out both multilib in native test.
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.
Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
Ying Wang [Wed, 11 Jun 2014 00:21:04 +0000 (00:21 +0000)]
Merge "Don't rename host libraries if only one arch is build."
Ying Wang [Wed, 11 Jun 2014 00:18:08 +0000 (17:18 -0700)]
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
Ying Wang [Tue, 10 Jun 2014 23:25:38 +0000 (23:25 +0000)]
Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted"
Ying Wang [Tue, 10 Jun 2014 23:21:50 +0000 (16:21 -0700)]
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
Ying Wang [Wed, 11 Jun 2014 01:12:28 +0000 (01:12 +0000)]
Merge "Revert "Don't rename host libraries if only one arch is build.""
Ying Wang [Wed, 11 Jun 2014 01:12:18 +0000 (01:12 +0000)]
Revert "Don't rename host libraries if only one arch is build."
This reverts commit
b1f7fb7a508bb6b093c8b37d65adc9a5a0836e6e.
Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
Ying Wang [Tue, 10 Jun 2014 22:18:55 +0000 (22:18 +0000)]
Merge "Fix loophole in module expansion."
Ying Wang [Tue, 10 Jun 2014 21:21:20 +0000 (14:21 -0700)]
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
Ying Wang [Tue, 10 Jun 2014 20:35:08 +0000 (20:35 +0000)]
am
128cd1b7: am
6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '
128cd1b7eb66ccb05de417a93d6e432447dc875a':
Add global variable HOST_LIBRARY_PATH.
Ying Wang [Tue, 10 Jun 2014 20:33:04 +0000 (20:33 +0000)]
am
6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '
6cc4598d18c660d4e253970bc875be5fa08c770b':
Add global variable HOST_LIBRARY_PATH.
Ying Wang [Tue, 10 Jun 2014 20:31:23 +0000 (20:31 +0000)]
Merge "Add global variable HOST_LIBRARY_PATH."
Elliott Hughes [Tue, 10 Jun 2014 19:27:47 +0000 (19:27 +0000)]
am
c7504124: am
47cdacd5: Merge "Remove libportable from core_base.mk."
* commit '
c75041243c1c189e6972eb8680c83f1b17dacfd7':
Remove libportable from core_base.mk.
Elliott Hughes [Tue, 10 Jun 2014 19:25:57 +0000 (19:25 +0000)]
am
47cdacd5: Merge "Remove libportable from core_base.mk."
* commit '
47cdacd5e633c8256a5dd32c769b5469882fc0aa':
Remove libportable from core_base.mk.
Elliott Hughes [Tue, 10 Jun 2014 19:23:53 +0000 (19:23 +0000)]
Merge "Remove libportable from core_base.mk."
Elliott Hughes [Tue, 10 Jun 2014 19:19:01 +0000 (12:19 -0700)]
Remove libportable from core_base.mk.
Change-Id: I3fae0625c68db885bd2fba502d31fe3c524d4f47
Ying Wang [Tue, 10 Jun 2014 19:04:56 +0000 (12:04 -0700)]
Add global variable HOST_LIBRARY_PATH.
With multilib host build, the build system installs host
shared libraries to different directories depending on a
library's bitness:
- HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit;
- 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit;
- If you don't care the bitness of the libraries and just want whatever
version the librareies are built by default, use HOST_LIBRARY_PATH.
Bug:
13751317
Change-Id:Id4c818941dc4ea35d795767c76f698529bd6aebb
Ying Wang [Tue, 10 Jun 2014 16:45:45 +0000 (09:45 -0700)]
resolved conflicts for merge of
135e11df to klp-modular-dev-plus-aosp
Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
Ying Wang [Tue, 10 Jun 2014 16:31:39 +0000 (16:31 +0000)]
am
c3838620: Merge "Switch to 32-bit-by-default host multilib build."
* commit '
c383862020034b3db4e365aaf501a84a35e85ffe':
Switch to 32-bit-by-default host multilib build.
Ying Wang [Tue, 10 Jun 2014 16:26:42 +0000 (16:26 +0000)]
Merge "Switch to 32-bit-by-default host multilib build."
Ying Wang [Mon, 9 Jun 2014 19:31:12 +0000 (12:31 -0700)]
Switch to 32-bit-by-default host multilib build.
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.
Bug:
13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
Ying Wang [Mon, 9 Jun 2014 23:00:02 +0000 (23:00 +0000)]
am
322362cf: am
c0275247: Merge "build native tests for 32-bit and 64-bit"
* commit '
322362cf01e6d1ed6c73dd27f5a4e162610f55c4':
build native tests for 32-bit and 64-bit
Ying Wang [Mon, 9 Jun 2014 22:57:48 +0000 (22:57 +0000)]
am
c0275247: Merge "build native tests for 32-bit and 64-bit"
* commit '
c02752473f958cb1b23ca2f7d3fd1973b665e3c4':
build native tests for 32-bit and 64-bit
Ying Wang [Mon, 9 Jun 2014 22:52:59 +0000 (22:52 +0000)]
Merge "build native tests for 32-bit and 64-bit"
Ying Wang [Mon, 9 Jun 2014 21:51:01 +0000 (21:51 +0000)]
am
b1f65358: am
5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit '
b1f65358a8af7548dfb02de281b081fc356881b4':
Support .asm being compiled by yasm targeted for x86.
Ying Wang [Mon, 9 Jun 2014 21:47:40 +0000 (21:47 +0000)]
am
5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit '
5ad17493cdb329087459ef7cddaed20cb1bba707':
Support .asm being compiled by yasm targeted for x86.
Ying Wang [Mon, 9 Jun 2014 21:43:56 +0000 (21:43 +0000)]
Merge "Support .asm being compiled by yasm targeted for x86."
Bart Sears [Mon, 9 Jun 2014 21:12:45 +0000 (21:12 +0000)]
am
7976b2be: resolved conflicts for merge of
0e23c5e3 to klp-modular-dev
* commit '
7976b2be9e41dbf789ad31b331e355a0a949d00a':
MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
Stephen Hines [Fri, 6 Jun 2014 21:30:57 +0000 (21:30 +0000)]
am
e266873b: am
1a8f0d3b: Merge "Move comment out of recipe section"
* commit '
e266873b211289ce07420ec2c51208ff83c49c36':
Move comment out of recipe section
Bart Sears [Fri, 6 Jun 2014 21:21:28 +0000 (14:21 -0700)]
resolved conflicts for merge of
0e23c5e3 to klp-modular-dev
Resolve merge conflict from changing PLATFORM_VERSION from
4.4.3 to 4.4.4 in klp-dev. Resolved the conflict by skipping
the merge since we want to leave klp-modular-dev as 4.4W.
Stephen Hines [Fri, 6 Jun 2014 21:17:40 +0000 (21:17 +0000)]
am
1a8f0d3b: Merge "Move comment out of recipe section"
* commit '
1a8f0d3b6dc316034e1e3b28702fead4108ec8d3':
Move comment out of recipe section
Bart Sears [Fri, 6 Jun 2014 21:07:46 +0000 (21:07 +0000)]
am
3b118a55: MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
* commit '
3b118a55b94d96f8ac1e1f903d17ed650ccd0355':
MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
Stephen Hines [Fri, 6 Jun 2014 21:07:24 +0000 (21:07 +0000)]
Merge "Move comment out of recipe section"
Bart Sears [Fri, 6 Jun 2014 20:34:42 +0000 (13:34 -0700)]
MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
Make is so.
Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0
Stephen Hines [Fri, 6 Jun 2014 19:51:47 +0000 (12:51 -0700)]
Move comment out of recipe section
If we keep a comment in the recipe, it prints out whenever that component
gets built.
Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
Ying Wang [Fri, 6 Jun 2014 18:40:14 +0000 (18:40 +0000)]
am
3fe9a277: am
d0f0918b: Merge "Reenable ccache."
* commit '
3fe9a277fe1f21b947bb7ac5d093d969eb10dc6b':
Reenable ccache.
Ying Wang [Fri, 6 Jun 2014 18:24:31 +0000 (18:24 +0000)]
am
d0f0918b: Merge "Reenable ccache."
* commit '
d0f0918b8fa2a1794050a3cecf3ad3943ad378ab':
Reenable ccache.
Ying Wang [Fri, 6 Jun 2014 18:21:09 +0000 (18:21 +0000)]
Merge "Reenable ccache."
Ying Wang [Fri, 6 Jun 2014 18:17:34 +0000 (11:17 -0700)]
Reenable ccache.
The previous commit
994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.
Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
Ying Wang [Fri, 6 Jun 2014 02:05:47 +0000 (19:05 -0700)]
Support .asm being compiled by yasm targeted for x86.
Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
Adam Lesinski [Thu, 5 Jun 2014 22:21:32 +0000 (22:21 +0000)]
am
3f1b5c52: Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev
* commit '
3f1b5c52d27165fc5aa0fbf443f10e8ad3e81ab7':
The public Telephony APIs must be present in all Android products
Adam Lesinski [Thu, 5 Jun 2014 22:19:26 +0000 (22:19 +0000)]
Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev
Ying Wang [Wed, 4 Jun 2014 22:30:05 +0000 (22:30 +0000)]
am
1343ec16: am
b75fe469: am
eafdd2cd: Fix emulator builds
* commit '
1343ec169c1bbbf7c5f1d5d2ce6d30d27bbea992':
Fix emulator builds
Ying Wang [Wed, 4 Jun 2014 22:24:51 +0000 (22:24 +0000)]
am
b75fe469: am
eafdd2cd: Fix emulator builds
* commit '
b75fe4696e847ef49aa9b11693243c00de497808':
Fix emulator builds
Ying Wang [Wed, 4 Jun 2014 22:21:38 +0000 (22:21 +0000)]
am
eafdd2cd: Fix emulator builds
* commit '
eafdd2cd878c8fd23033302a2c5010505412981f':
Fix emulator builds
Ying Wang [Wed, 5 Feb 2014 19:28:51 +0000 (11:28 -0800)]
Fix emulator builds
which don't have boot.img.
Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
Tim Murray [Wed, 4 Jun 2014 19:20:29 +0000 (19:20 +0000)]
am
3c52ff07: am
e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
* commit '
3c52ff07141c236b51a2ccfe5fdb3de33421bd3b':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Tim Murray [Wed, 4 Jun 2014 19:05:45 +0000 (19:05 +0000)]
am
e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
* commit '
e564c0cbd08c728d84e62308c741b30f3bd542f8':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Tim Murray [Wed, 4 Jun 2014 19:00:38 +0000 (19:00 +0000)]
Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
Qiwen Zhao [Wed, 4 Jun 2014 18:52:14 +0000 (18:52 +0000)]
am
d6e6f97a: (-s ours) am
e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
* commit '
d6e6f97a8e015f39e40e434d7a5ab0d1eadcd691':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
Qiwen Zhao [Wed, 4 Jun 2014 18:27:18 +0000 (18:27 +0000)]
am
e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
* commit '
e8e7ebbde46df2a4dafc4c90a53abd911d1255ec':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
Qiwen Zhao [Wed, 4 Jun 2014 18:21:21 +0000 (11:21 -0700)]
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
This reverts commit
a5abefbbb527490dd76e34780dc2bfc6ed6a437d.
Ying Wang [Wed, 4 Jun 2014 17:30:32 +0000 (17:30 +0000)]
am
dc7ff054: am
bc080d51: am
2a386e0c: Allow to build the update.zip for emulator build.
* commit '
dc7ff05427e885a59e8884e0f8e10a6c78f2842b':
Allow to build the update.zip for emulator build.
Qiwen Zhao [Wed, 4 Jun 2014 17:29:03 +0000 (17:29 +0000)]
am
5de36c46: (-s ours) am
a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
5de36c46d84eeb944646fe5413502f8aabcc76c3':
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
Steve Moyer [Wed, 4 Jun 2014 17:28:52 +0000 (17:28 +0000)]
am
c653faa8: (-s ours) am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
c653faa88717b0ca5e97b39a4016399d7a67549f':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 17:28:51 +0000 (17:28 +0000)]
am
1e1681db: (-s ours) am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
1e1681db51e87c08b88dd5ffd961eb815b5aeb86':
DO NOT MERGE: Combine emulator test projects into a single apk
Ying Wang [Wed, 4 Jun 2014 17:26:00 +0000 (17:26 +0000)]
am
bc080d51: am
2a386e0c: Allow to build the update.zip for emulator build.
* commit '
bc080d510f022da8055b89b85e02d91e74c3757d':
Allow to build the update.zip for emulator build.
Ying Wang [Wed, 4 Jun 2014 17:22:21 +0000 (17:22 +0000)]
am
2a386e0c: Allow to build the update.zip for emulator build.
* commit '
2a386e0cfbdfa009038acede85876a7643f297f5':
Allow to build the update.zip for emulator build.
Qiwen Zhao [Wed, 4 Jun 2014 17:12:13 +0000 (17:12 +0000)]
am
a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
a5abefbbb527490dd76e34780dc2bfc6ed6a437d':
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
Ying Wang [Tue, 3 Jun 2014 21:07:27 +0000 (14:07 -0700)]
Allow to build the update.zip for emulator build.
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.
Bug:
15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
Qiwen Zhao [Wed, 4 Jun 2014 17:02:29 +0000 (10:02 -0700)]
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
This reverts commit
0ced06ea0f20cf8bd6a1a2b2e34531f04f621c00.
Steve Moyer [Wed, 4 Jun 2014 16:55:53 +0000 (16:55 +0000)]
am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
37773821f150778c48ef3519407d8ee71dd66a30':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 16:55:52 +0000 (16:55 +0000)]
am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
008dc16cb06976620c0fa1e51942f2d1c6af54f3':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Serban Constantinescu [Thu, 29 May 2014 16:41:03 +0000 (17:41 +0100)]
AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
A sensible default for the 32bit CPU_VARIANT of an ARM64 build is
cortex-a15. Please note that the AArch32 execution state of ARMv8
is a superset of ARMv7.
Change-Id: Id2b655172750e04609ae9ba22d621fe83cd69b1a
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Adam Lesinski [Wed, 4 Jun 2014 04:12:25 +0000 (21:12 -0700)]
The public Telephony APIs must be present in all Android products
Change-Id: I8d510a422b00b65beed2675c611301e20fd1356f
Stephen Hines [Wed, 4 Jun 2014 01:28:44 +0000 (18:28 -0700)]
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
Dirk Dougherty [Tue, 3 Jun 2014 23:18:12 +0000 (23:18 +0000)]
am
cfdf93c0: am
201cdd30: am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
cfdf93c003a7afc18eb9a79921abf7b472e6d745':
css adjustments for headings with dynamic content
Dirk Dougherty [Tue, 3 Jun 2014 23:14:41 +0000 (23:14 +0000)]
am
201cdd30: am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
201cdd30e07ecddb333b4e347fbf14493fd2643c':
css adjustments for headings with dynamic content