OSDN Git Service
Ying Wang [Wed, 11 Jun 2014 20:49:37 +0000 (20:49 +0000)]
am
32aff808: am
6bfbfee5: am
a45a5d27: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
* commit '
32aff8085a2f5fed34a4d28b78bb52a10a5b5751':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
Ying Wang [Wed, 11 Jun 2014 20:49:20 +0000 (20:49 +0000)]
am
dceddd91: am
79b46720: am
02f98a26: Merge "Fix loophole in module expansion."
* commit '
dceddd91d9a6516346e752b9f942747bea931cfa':
Fix loophole in module expansion.
Ying Wang [Wed, 11 Jun 2014 20:24:22 +0000 (20:24 +0000)]
am
0d276266: am
128cd1b7: am
6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '
0d27626620676dbe72bf5c020008bb2dad20d75f':
Add global variable HOST_LIBRARY_PATH.
Elliott Hughes [Wed, 11 Jun 2014 19:34:31 +0000 (19:34 +0000)]
am
b5153477: am
c7504124: am
47cdacd5: Merge "Remove libportable from core_base.mk."
* commit '
b5153477107fd0cba9e073c4445c11c78ee35c92':
Remove libportable from core_base.mk.
Ying Wang [Wed, 11 Jun 2014 19:26:30 +0000 (19:26 +0000)]
am
2d19cbd2: resolved conflicts for merge of
135e11df to klp-modular-dev-plus-aosp
* commit '
2d19cbd279ed69c7202f089be174c35c1585f709':
Switch to 32-bit-by-default host multilib build.
Ying Wang [Wed, 11 Jun 2014 17:58:43 +0000 (17:58 +0000)]
am
b06c655e: am
322362cf: am
c0275247: Merge "build native tests for 32-bit and 64-bit"
* commit '
b06c655e580e683c44354cda8a9fbcd8f30efab6':
build native tests for 32-bit and 64-bit
Ying Wang [Wed, 11 Jun 2014 17:44:54 +0000 (17:44 +0000)]
am
fe9ad097: am
b1f65358: am
5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit '
fe9ad0975ade10219a5fa9a77d034ba77735e393':
Support .asm being compiled by yasm targeted for x86.
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 16:18:13 +0000 (16:18 +0000)]
Merge "Added variables to support seperate vendor patition."
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 [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
Doug Zongker [Tue, 10 Jun 2014 21:13:42 +0000 (21:13 +0000)]
Merge "configure progress bar during block OTA script generation"
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
Bart Sears [Tue, 10 Jun 2014 18:41:52 +0000 (18:41 +0000)]
am
5c2225c5: am
7976b2be: resolved conflicts for merge of
0e23c5e3 to klp-modular-dev
* commit '
5c2225c592da49855dbc665edb9f03c18deddb78':
MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
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
Vineeta Srivastava [Mon, 9 Jun 2014 23:27:11 +0000 (23:27 +0000)]
Merge "Add synaptics to vendor owner whitelist"
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."
Doug Zongker [Mon, 9 Jun 2014 21:15:45 +0000 (14:15 -0700)]
configure progress bar during block OTA script generation
Emit script commands to produce a more accurate progress bar (for full
block OTAs) and a working progress bar (for incremental block OTAs) --
ones that are driven by the progress callback from the thing actually
writing the system image.
Change-Id: Ifca10be68cfdaab7135d23515bd0ae5be2f98a16
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
Erik Pasternak [Mon, 9 Jun 2014 15:55:48 +0000 (15:55 +0000)]
am
e1d76eed: Merge "Revert "Integrate build_font.py"" into lmp-preview-dev
* commit '
e1d76eed322e620213cd4f936a29229a7658c6a1':
Revert "Integrate build_font.py"
Deepanshu Gupta [Mon, 9 Jun 2014 15:55:29 +0000 (15:55 +0000)]
am
8723f9e2: Merge "Integrate build_font.py" into lmp-preview-dev
* commit '
8723f9e2127204e19b00b0c19d091bee7e3e1b0c':
Integrate build_font.py
Erik Pasternak [Sun, 8 Jun 2014 20:12:41 +0000 (20:12 +0000)]
Merge "Revert "Integrate build_font.py"" into lmp-preview-dev
Erik Pasternak [Sun, 8 Jun 2014 19:31:01 +0000 (19:31 +0000)]
Revert "Integrate build_font.py"
This CL broke the SDK builds.
This reverts commit
9eebd78f6ef844aec2401db5e3b69d08aec227a7.
Change-Id: I973b40688602461bd3b0f8c1e1beb53b9fbec83c
Deepanshu Gupta [Sat, 7 Jun 2014 23:33:11 +0000 (23:33 +0000)]
Merge "Integrate build_font.py" into lmp-preview-dev
Lajos Molnar [Fri, 6 Jun 2014 23:03:31 +0000 (23:03 +0000)]
am
93d45370: core_base.mk: add hevc software decoder
* commit '
93d45370bea37e2c1e5931181fef12c67e9d2f98':
core_base.mk: add hevc software decoder
Stephen Hines [Fri, 6 Jun 2014 21:33:48 +0000 (21:33 +0000)]
am
69d5bd7c: am
e266873b: am
1a8f0d3b: Merge "Move comment out of recipe section"
* commit '
69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7':
Move comment out of recipe section
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:43:44 +0000 (18:43 +0000)]
am
56ec31cf: am
3fe9a277: am
d0f0918b: Merge "Reenable ccache."
* commit '
56ec31cfca1ed5f9d833d73c327b2799601cd5a4':
Reenable ccache.
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
Lajos Molnar [Fri, 6 Jun 2014 05:28:45 +0000 (22:28 -0700)]
core_base.mk: add hevc software decoder
Bug:
14571712
Change-Id: I41c57023c6bcba73859b61052cacfd4ffd02e3dd
Adam Lesinski [Thu, 5 Jun 2014 22:27:26 +0000 (15:27 -0700)]
Merge commit '
2f9a705e' into manualmerge
Conflicts:
target/product/core_tiny.mk
Change-Id: I6d2f57be8d4e65768d51f6db65d78295d1d3e3fa
Vineeta Srivastava [Wed, 4 Jun 2014 22:45:50 +0000 (15:45 -0700)]
Add synaptics to vendor owner whitelist
Change-Id: Idef39568cbcc53cb50badcc8d59b7770eef10d5e
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
Eric Laurent [Thu, 5 Jun 2014 15:33:09 +0000 (15:33 +0000)]
Merge "add sound trigger service library"
Eric Laurent [Sat, 19 Apr 2014 00:37:49 +0000 (17:37 -0700)]
add sound trigger service library
Change-Id: I444396c5a1df13ad59c2a236849e9c729faed956
Ying Wang [Wed, 4 Jun 2014 22:32:29 +0000 (22:32 +0000)]
am
1cd740f1: am
1343ec16: am
b75fe469: am
eafdd2cd: Fix emulator builds
* commit '
1cd740f1f07f3a1293c5034c97d977ba699b105a':
Fix emulator builds
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
Andrew Hsieh [Wed, 4 Jun 2014 20:04:43 +0000 (20:04 +0000)]
am
51b6c144: (-s ours) Merge "Add -latomic to all target builds" into lmp-preview-dev
* commit '
51b6c144239583ea75b13103cfb4b3ac5fa00332':
Add -latomic to all target builds
Tim Murray [Wed, 4 Jun 2014 19:22:56 +0000 (19:22 +0000)]
am
45c39300: am
3c52ff07: am
e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
* commit '
45c3930084180857d7b09c0859805506e7ede847':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
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:55:21 +0000 (18:55 +0000)]
am
c3136cd9: (-s ours) am
d6e6f97a: (-s ours) am
e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
* commit '
c3136cd9988c9d1891751e9d64d714bb12c82d7f':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
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""
Tim Murray [Wed, 4 Jun 2014 18:43:28 +0000 (18:43 +0000)]
am
2148abfd: Merge "Add libsigchain to the embedded.mk makefile" into lmp-preview-dev
* commit '
2148abfdb0386ac301ced5d9b24493b6d0f0e749':
Add libsigchain to the embedded.mk makefile
Ying Wang [Wed, 4 Jun 2014 18:43:28 +0000 (18:43 +0000)]
am
e3e421f8: Move sdk staging dir to a product-specific dir
* commit '
e3e421f85125c2c173bcafa07e901b6248e9530c':
Move sdk staging dir to a product-specific dir
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:42:18 +0000 (17:42 +0000)]
am
e8dc1868: (-s ours) am
dc7ff054: am
bc080d51: am
2a386e0c: Allow to build the update.zip for emulator build.
* commit '
e8dc18680f107ea3f5c6f9376f496063c292cd98':
Allow to build the update.zip for emulator build.
Ying Wang [Wed, 4 Jun 2014 17:40:45 +0000 (17:40 +0000)]
Merge "Allow to build the update.zip for emulator build."
Qiwen Zhao [Wed, 4 Jun 2014 17:36:33 +0000 (17:36 +0000)]
am
eed384a9: (-s ours) am
5de36c46: (-s ours) am
a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
eed384a9b869b9238dd480e048988b2b35c53a66':
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
Steve Moyer [Wed, 4 Jun 2014 17:36:32 +0000 (17:36 +0000)]
am
67d25adb: (-s ours) am
c653faa8: (-s ours) am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
67d25adb9fb8f744b9c03a999b9474774167402a':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 17:36:31 +0000 (17:36 +0000)]
am
2664e5f0: (-s ours) am
1e1681db: (-s ours) am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
2664e5f02c79c18a1286fde0454f98361d08d42c':
DO NOT MERGE: Combine emulator test projects into a single apk
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
OSDN Git Service
