OSDN Git Service
Ying Wang [Wed, 30 Jul 2014 17:05:16 +0000 (10:05 -0700)]
resolved conflicts for merge of
fe07e791 to lmp-dev-plus-aosp
Change-Id: I9215d5a4ffacb295addc4349dd028ccbfba71730
Brian Carlstrom [Wed, 30 Jul 2014 16:53:12 +0000 (09:53 -0700)]
resolved conflicts for merge of
a8138028 to lmp-dev-plus-aosp
Change-Id: I5573d097d741f4922b791b33de5c941af08127c6
Ying Wang [Wed, 30 Jul 2014 16:40:51 +0000 (16:40 +0000)]
am
8f509bad: Merge "Remove the unused large_emu_hw.mk"
* commit '
8f509bad6d1eaa9928ff54eca220ba3e72214ac7':
Remove the unused large_emu_hw.mk
Brian Carlstrom [Wed, 30 Jul 2014 16:33:06 +0000 (16:33 +0000)]
am
073dc97c: Merge "Add PROP_NAME_MAX validation"
* commit '
073dc97cf2d8417709f4c77808a4cd6e8f17575e':
Add PROP_NAME_MAX validation
Ying Wang [Wed, 30 Jul 2014 16:22:08 +0000 (16:22 +0000)]
am
3f191617: am
7a739f35: Merge "Use hermetic host toolchains."
* commit '
3f1916174823fe6fd034ba07c762fae9a0143e44':
Use hermetic host toolchains.
Ying Wang [Wed, 30 Jul 2014 16:22:00 +0000 (16:22 +0000)]
am
18c20aae: am
aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
* commit '
18c20aae44b5736b673c8776202e1e76b6bd81cd':
Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
Brian Carlstrom [Wed, 30 Jul 2014 16:30:10 +0000 (16:30 +0000)]
Merge "Add PROP_NAME_MAX validation"
Ying Wang [Wed, 30 Jul 2014 16:17:10 +0000 (16:17 +0000)]
am
7a739f35: Merge "Use hermetic host toolchains."
* commit '
7a739f35857f7c3b7d2de24c56c6eb86bc4818d7':
Use hermetic host toolchains.
Ying Wang [Wed, 30 Jul 2014 16:17:06 +0000 (16:17 +0000)]
am
aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
* commit '
aea1cae4f5a3fcc5e6ecdca24409f102469b411b':
Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
Brian Carlstrom [Tue, 29 Jul 2014 23:08:25 +0000 (16:08 -0700)]
Add PROP_NAME_MAX validation
Change-Id: I49179c83ae163de6f6fb398c5de60c5d296ca009
Ying Wang [Wed, 30 Jul 2014 16:14:03 +0000 (16:14 +0000)]
Merge "Use hermetic host toolchains."
Ying Wang [Wed, 30 Jul 2014 16:13:38 +0000 (16:13 +0000)]
Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
Ying Wang [Tue, 29 Jul 2014 21:08:33 +0000 (14:08 -0700)]
Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit
a4f84fdfed9a805d69b37de997512cd0616b3ff8.
Added "export CCACHE_CPP2 := true" to work around ccache bug with clang.
See:
http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html
Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
Ying Wang [Tue, 29 Jul 2014 19:09:13 +0000 (19:09 +0000)]
am
a961a09e: Fix error: \'NoneType\' object is not iterable
* commit '
a961a09e59dcf130435cf5ff052c4f2d7e3986ea':
Fix error: 'NoneType' object is not iterable
Ying Wang [Tue, 29 Jul 2014 18:42:37 +0000 (11:42 -0700)]
Fix error: 'NoneType' object is not iterable
Change-Id: I5a54edbed0e5e5481a570b93c07d50f6ca3e18e0
Ying Wang [Tue, 29 Jul 2014 18:08:05 +0000 (11:08 -0700)]
resolved conflicts for merge of
9929fd66 to lmp-dev-plus-aosp
Change-Id: I7f3b4111bb508e61d279fc4a78b2a2ebe8cfd6d9
Ying Wang [Tue, 29 Jul 2014 18:01:17 +0000 (18:01 +0000)]
am
ecc42675: Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"
* commit '
ecc4267564116197b719baf9ecc24a9f0652fbb5':
Allow LOCAL_ASSET_DIR point to nonexistent dir
Ying Wang [Tue, 29 Jul 2014 17:55:19 +0000 (17:55 +0000)]
Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"
Ying Wang [Tue, 29 Jul 2014 17:34:30 +0000 (10:34 -0700)]
Allow LOCAL_ASSET_DIR point to nonexistent dir
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.
Change-Id: Id53433c0d3a4c7af601283755199fde6a59cdfaf
Yohann Roussel [Tue, 29 Jul 2014 13:14:59 +0000 (13:14 +0000)]
am
355520e3: Merge "Fix doc target for multidex support library." into lmp-dev
* commit '
355520e35ed69c60b755fbca630b9939f35b6eb2':
Fix doc target for multidex support library.
Ying Wang [Mon, 28 Jul 2014 22:14:51 +0000 (15:14 -0700)]
Use hermetic host toolchains.
Change-Id: I6bb72b5728d1075be9645f8473dcf3db759fa66a
Marcin Kosiba [Mon, 28 Jul 2014 11:57:17 +0000 (11:57 +0000)]
am
bf4ac764: am
6be7d2e5: Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
* commit '
bf4ac764cdc7bf6b09e30b79ca6088ef17de9e07':
Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
Marcin Kosiba [Mon, 28 Jul 2014 09:06:07 +0000 (09:06 +0000)]
am
6be7d2e5: Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
* commit '
6be7d2e5bb9da9b1b5c06886466d089637529dcc':
Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
Vignesh Venkatasubramanian [Sat, 26 Jul 2014 02:40:35 +0000 (02:40 +0000)]
am
82af97fc: Add opus entries in generic makefiles.
* commit '
82af97fc274c27da7099c46f84ad48f6f9624537':
Add opus entries in generic makefiles.
Vignesh Venkatasubramanian [Wed, 28 May 2014 15:06:11 +0000 (08:06 -0700)]
Add opus entries in generic makefiles.
libopus is necessary for opus software decoding support. add that to
base.mk and add an entry for libstagefright_soft_opusdec to
core_base.mk.
Change-Id: Iddd6ab2b2a84bb966b7e635a6aa73efb6a803e98
Ying Wang [Sat, 26 Jul 2014 00:52:21 +0000 (00:52 +0000)]
am
53e19fd4: am
45040bdb: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
* commit '
53e19fd4e259ea47e6b81b8472fbdc6041ca7044':
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.
Ying Wang [Sat, 26 Jul 2014 00:48:25 +0000 (00:48 +0000)]
am
45040bdb: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
* commit '
45040bdbb8c3a543746538b1e08b5ac53c427099':
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.
Edwin Wong [Fri, 25 Jul 2014 23:42:09 +0000 (23:42 +0000)]
am
dbb3d2e7: Add libdrmclearkeyplugin.so to image.
* commit '
dbb3d2e732b5b66bade851bb1791c2040f233ef2':
Add libdrmclearkeyplugin.so to image.
Edwin Wong [Thu, 24 Jul 2014 01:46:57 +0000 (18:46 -0700)]
Add libdrmclearkeyplugin.so to image.
The library will be added to /system/vendor/lib/mediadrm.
Change-Id: Iebfd00077c2a13e4ad4296aedba21230a7e4f37f
Ying Wang [Wed, 30 Jul 2014 16:37:21 +0000 (16:37 +0000)]
Merge "Remove the unused large_emu_hw.mk"
Ying Wang [Thu, 21 Nov 2013 00:41:18 +0000 (16:41 -0800)]
Remove the unused large_emu_hw.mk
Change-Id: Iea8330e00983f4eac44d8a072c1bf185afcf6a80
Conflicts:
target/product/large_emu_hw.mk
Stephen Hines [Fri, 25 Jul 2014 20:00:00 +0000 (20:00 +0000)]
am
e9bf1bda: Merge "Default to "prescott" as our baseline i686 host build architecture." into lmp-dev
* commit '
e9bf1bdac6cdcde840f19d6b40dbd9bdcb5ab9b2':
Default to "prescott" as our baseline i686 host build architecture.
Yohann Roussel [Fri, 25 Jul 2014 18:45:02 +0000 (18:45 +0000)]
am
4e0693cf: am
970d053c: Merge "Fix doc target for multidex support library."
* commit '
4e0693cf6c3420d1cc8fcd7768a339458612b28d':
Fix doc target for multidex support library.
Przemyslaw Szczepaniak [Fri, 25 Jul 2014 17:27:29 +0000 (17:27 +0000)]
am
ac6a9195: Switch NDK arm64 libraries to 4.9.
* commit '
ac6a9195cadc83a50cea376fc61268db6fc2f129':
Switch NDK arm64 libraries to 4.9.
Przemyslaw Szczepaniak [Thu, 17 Jul 2014 16:54:41 +0000 (17:54 +0100)]
Switch NDK arm64 libraries to 4.9.
Change-Id: Iffc30e34b798896d9259ca1dfc3ff2d21683d6a4
(cherry picked from commit
5895dd13a7c96a3100048dae8fc1195abc8c9beb)
Yohann Roussel [Fri, 25 Jul 2014 12:53:32 +0000 (12:53 +0000)]
am
970d053c: Merge "Fix doc target for multidex support library."
* commit '
970d053c975e9ee38e61fc00506362a76fcc153d':
Fix doc target for multidex support library.
Tim Murray [Fri, 25 Jul 2014 01:03:35 +0000 (01:03 +0000)]
Tim Murray [Fri, 25 Jul 2014 01:03:32 +0000 (01:03 +0000)]
am
eb9563f9: am
16d43086: Merge "Fix Windows SDK build to not use clang."
* commit '
eb9563f9ab610ca09bf99c6975f70c14c35683bd':
Fix Windows SDK build to not use clang.
Ying Wang [Thu, 24 Jul 2014 23:30:47 +0000 (23:30 +0000)]
am
6aef0473: Support to set up TARGET_COPY_OUT_VENDOR in board config.
* commit '
6aef04736294976b3bedaae5cb581a01f6387cc7':
Support to set up TARGET_COPY_OUT_VENDOR in board config.
Stephen Hines [Fri, 25 Jul 2014 19:54:37 +0000 (19:54 +0000)]
Merge "Default to "prescott" as our baseline i686 host build architecture." into lmp-dev
Stephen Hines [Sat, 19 Jul 2014 00:34:14 +0000 (17:34 -0700)]
Default to "prescott" as our baseline i686 host build architecture.
Bug:
16408818
Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
Tim Murray [Thu, 24 Jul 2014 22:25:59 +0000 (22:25 +0000)]
Tim Murray [Thu, 24 Jul 2014 22:12:14 +0000 (22:12 +0000)]
am
16d43086: Merge "Fix Windows SDK build to not use clang."
* commit '
16d43086e91b76876f195b6d7a7c2e9d021b8293':
Fix Windows SDK build to not use clang.
Tim Murray [Thu, 24 Jul 2014 22:20:58 +0000 (22:20 +0000)]
Merge "fix build"
Tim Murray [Thu, 24 Jul 2014 22:20:18 +0000 (15:20 -0700)]
fix build
Change-Id: I28799d5523e1d2d2500a82b3d323c58486aacdbc
Tim Murray [Thu, 24 Jul 2014 21:42:53 +0000 (14:42 -0700)]
Fix Windows SDK build to not use clang.
bug
16172793
Change-Id: I7bf76cae49ec17bf50eb657b0e38234b7cb55e85
Tim Murray [Thu, 24 Jul 2014 21:27:05 +0000 (14:27 -0700)]
resolved conflicts for merge of
2812b27c to lmp-dev-plus-aosp
Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
Tim Murray [Thu, 24 Jul 2014 21:04:24 +0000 (21:04 +0000)]
am
f82de5b8: Merge "Switch host builds to use Clang by default."
* commit '
f82de5b89d70fb0e122f03a3956c5b01e66daca5':
Switch host builds to use Clang by default.
Dehao Chen [Thu, 24 Jul 2014 19:46:34 +0000 (19:46 +0000)]
am
1cd46385: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO." into lmp-dev
* commit '
1cd4638594d21ca4643b3b96c894f93a0bd1e87a':
Refactor FDO support code to ensure arm64 can also be built with FDO.
Ying Wang [Thu, 24 Jul 2014 19:46:33 +0000 (19:46 +0000)]
am
e7998698: Merge "Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS" into lmp-dev
* commit '
e7998698236cf460b91f4245a5447498015cf439':
Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS
Ying Wang [Thu, 24 Jul 2014 19:46:32 +0000 (19:46 +0000)]
am
0d660660: Merge "Improve rules of split apks." into lmp-dev
* commit '
0d660660dbdd84391c14cf21396d4f4fff923085':
Improve rules of split apks.
Yohann Roussel [Tue, 29 Jul 2014 09:30:14 +0000 (09:30 +0000)]
Merge "Fix doc target for multidex support library." into lmp-dev
Yohann Roussel [Thu, 24 Jul 2014 15:24:30 +0000 (17:24 +0200)]
Fix doc target for multidex support library.
(cherry picked from commit
5679e356d298c58e839f03c45050192e813e79f8)
Change-Id: I2e97f59796046d94c9b03dbc89ec1d2153b54ce1
Ying Wang [Thu, 24 Jul 2014 03:20:49 +0000 (20:20 -0700)]
Support to set up TARGET_COPY_OUT_VENDOR in board config.
We first define TARGET_COPY_OUT_VENDOR as a placeholder. In product
config makefiiles we actually get the placeholders in
PRODUCT_COPY_FILES. A device can set up TARGET_COPY_OUT_VENDOR in its
BoardConfig.mk. We substitute the placeholder with the real
TARGET_COPY_OUT_VENDOR value after loading the BoardConfig.mk.
With this change, we can support building vendor stuff to
system.img (the default) or a separate vendor.img.
Bug:
16515152
Change-Id: I5b601d7a8b34fe032a1bac02aa5c204a3765691d
Ying Wang [Thu, 24 Jul 2014 01:49:26 +0000 (01:49 +0000)]
am
5d23800f: am
1bb9adb8: Merge "[MIPS64] Enable mips64 clang"
* commit '
5d23800f2b61c03a97395815e94d2aa44eea8577':
[MIPS64] Enable mips64 clang
Ying Wang [Thu, 24 Jul 2014 01:45:53 +0000 (01:45 +0000)]
am
1bb9adb8: Merge "[MIPS64] Enable mips64 clang"
* commit '
1bb9adb88004ebdbacf44a95bd4e08065960c5ab':
[MIPS64] Enable mips64 clang
Ying Wang [Wed, 23 Jul 2014 23:41:18 +0000 (23:41 +0000)]
am
ebe0bacc: am
6837ac67: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
* commit '
ebe0bacc8063f74da5bacb80c5e0b97a00a7351c':
Refactor FDO support code to ensure arm64 can also be built with FDO.
Ying Wang [Wed, 23 Jul 2014 23:37:56 +0000 (23:37 +0000)]
am
6837ac67: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
* commit '
6837ac67035518f5c36c91ae07ec95010c7071bd':
Refactor FDO support code to ensure arm64 can also be built with FDO.
Marcin Kosiba [Mon, 28 Jul 2014 09:02:13 +0000 (09:02 +0000)]
Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
Dan Albert [Sat, 26 Jul 2014 20:35:06 +0000 (20:35 +0000)]
Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
This broke the world.
This reverts commit
3b7a4d811df5b326e714984edd7dd3e2b11e16d5.
Change-Id: Iefb01b8642a92bcc718d2c745e8ce1346ba50143
Yohann Roussel [Fri, 25 Jul 2014 12:44:51 +0000 (12:44 +0000)]
Merge "Fix doc target for multidex support library."
Yohann Roussel [Thu, 24 Jul 2014 15:24:30 +0000 (17:24 +0200)]
Fix doc target for multidex support library.
Change-Id: I0136c6cd8a3af0dc9d12b9424f96e9527cde68e2
Tim Murray [Thu, 24 Jul 2014 22:08:41 +0000 (22:08 +0000)]
Merge "Fix Windows SDK build to not use clang."
Ying Wang [Wed, 23 Jul 2014 23:38:43 +0000 (23:38 +0000)]
Merge "Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS" into lmp-dev
Ying Wang [Wed, 23 Jul 2014 21:35:40 +0000 (14:35 -0700)]
Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS
In prebuilt app module, you can use LOCAL_PACKAGE_SPLITS to specify a
list of prebuilt split apks. The build system will sign and zipalign the
apks and install them with the same file names.
Note that you need to put all the source split apks in the same folder.
Bug:
16319961
Change-Id: Id2b6d743c1edc5e436007ec11acece1748adad45
Ying Wang [Wed, 23 Jul 2014 23:38:29 +0000 (23:38 +0000)]
Merge "Improve rules of split apks." into lmp-dev
Ying Wang [Wed, 23 Jul 2014 17:27:57 +0000 (10:27 -0700)]
Improve rules of split apks.
- Better messaging if the expected split apk isn't generated by the aapt
command in the base apk rule; Remove the built base apk, so make will
rerun aapt after the user changes the splitting parameters.
- Use cleaner static pattern rules instead of running $(foreach) with
$(eval).
Bug:
16319961
Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
Ying Wang [Thu, 24 Jul 2014 01:42:13 +0000 (01:42 +0000)]
Merge "[MIPS64] Enable mips64 clang"
Duane Sand [Tue, 3 Jun 2014 23:05:59 +0000 (16:05 -0700)]
[MIPS64] Enable mips64 clang
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
Tim Murray [Thu, 24 Jul 2014 20:59:29 +0000 (20:59 +0000)]
Merge "Switch host builds to use Clang by default."
Tim Murray [Fri, 4 Apr 2014 21:38:29 +0000 (14:38 -0700)]
Switch host builds to use Clang by default.
If LOCAL_CLANG is not set to false for a host module, clang will be used instead of gcc.
This also enables the integrated assembler by default for Darwin host builds.
bug
16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
Ying Wang [Wed, 23 Jul 2014 23:35:05 +0000 (23:35 +0000)]
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
Dehao Chen [Wed, 23 Jul 2014 21:28:58 +0000 (14:28 -0700)]
Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
Dehao Chen [Wed, 23 Jul 2014 23:44:54 +0000 (23:44 +0000)]
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO." into lmp-dev
Dehao Chen [Wed, 23 Jul 2014 21:28:58 +0000 (14:28 -0700)]
Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
Ying Wang [Sat, 26 Jul 2014 00:43:50 +0000 (00:43 +0000)]
Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
Svet Ganov [Wed, 23 Jul 2014 17:24:15 +0000 (17:24 +0000)]
am
6693649a: Merge "Add appwidget to system image." into lmp-dev
* commit '
6693649a42177484c6439912c1d56712378a851c':
Add appwidget to system image.
Yohann Roussel [Wed, 23 Jul 2014 17:03:23 +0000 (17:03 +0000)]
am
c324a624: Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
* commit '
c324a624256da3e53cea5a6c3e2b57937fc6ac24':
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
Yohann Roussel [Thu, 17 Jul 2014 14:52:58 +0000 (16:52 +0200)]
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
This keeps only the real sources in doc target and fixes some error
messages caused by trying to generate docs of the tests.
(cherry picked from commit
100aba5374376f679602387db59fccd609b8abe3)
Change-Id: I39f3ede95ae68777ca5e3db4ab5c6ebeefc86ac6
Ying Wang [Wed, 23 Jul 2014 00:53:57 +0000 (00:53 +0000)]
am
84c26b69: Delete .swp file added by accident.
* commit '
84c26b694978eb6b9ee9400d15283707ea9b3eb9':
Delete .swp file added by accident.
Ying Wang [Wed, 23 Jul 2014 00:50:09 +0000 (00:50 +0000)]
am
1425e2d8: Support LOCAL_PACKAGE_SPLITS.
* commit '
1425e2d8c08663987f2d1004c55e6060d1ce6dfe':
Support LOCAL_PACKAGE_SPLITS.
Ying Wang [Wed, 23 Jul 2014 00:42:35 +0000 (17:42 -0700)]
Delete .swp file added by accident.
Also added .swp to .gitignore.
Change-Id: I51700f55230facde2e46574aa039d45ae5b29cdf
Ying Wang [Tue, 22 Jul 2014 22:42:11 +0000 (15:42 -0700)]
Support LOCAL_PACKAGE_SPLITS.
Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables
and generates multiple apks. The build system sets up rules to sign and
zipalign the split apks.
Bug:
16319961
Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
Daniel Rosenberg [Tue, 22 Jul 2014 22:29:17 +0000 (22:29 +0000)]
am
337bbf89: Merge "Create a vendor build.prop for verifying versions" into lmp-dev
* commit '
337bbf89d92f28bff85273ffefb71d3e5d7f57fc':
Create a vendor build.prop for verifying versions
Stephen Hines [Tue, 22 Jul 2014 20:53:44 +0000 (20:53 +0000)]
am
786c565e: am
38470c3f: Merge "Default to "prescott" as our baseline i686 host build architecture."
* commit '
786c565ea440de736af66b1b36ee72b6287bc1cc':
Default to "prescott" as our baseline i686 host build architecture.
Stephen Hines [Tue, 22 Jul 2014 20:49:15 +0000 (20:49 +0000)]
am
38470c3f: Merge "Default to "prescott" as our baseline i686 host build architecture."
* commit '
38470c3fffd25a300045d62cccc8ab129cb71349':
Default to "prescott" as our baseline i686 host build architecture.
Sebastien Hertz [Tue, 22 Jul 2014 17:13:40 +0000 (17:13 +0000)]
am
3389b9e8: Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-dev
* commit '
3389b9e88752a2b3a20fd6fea04ac6bedeec4afc':
Vary non-image Xmx for dex2oat on MIPS.
Tsu Chiang Chuang [Tue, 22 Jul 2014 17:00:28 +0000 (17:00 +0000)]
am
64a06072: Merge "Include cts-junit target for cts tests." into lmp-dev
* commit '
64a0607262c11beb4421b4902091078785dcf77d':
Include cts-junit target for cts tests.
Sebastien Hertz [Tue, 22 Jul 2014 16:51:05 +0000 (18:51 +0200)]
resolved conflicts for merge of
2715dc67 to lmp-dev-plus-aosp
Change-Id: I48365572b92429659069b87250cae21a135cf155
Ying Wang [Tue, 22 Jul 2014 16:36:37 +0000 (16:36 +0000)]
am
ab4a98a8: Remove unnecessary dependency of the sdk target.
* commit '
ab4a98a85d0af425904af81c72627457292c147f':
Remove unnecessary dependency of the sdk target.
Tsu Chiang Chuang [Tue, 22 Jul 2014 16:44:54 +0000 (16:44 +0000)]
Merge "Include cts-junit target for cts tests." into lmp-dev
Stephen Hines [Tue, 22 Jul 2014 20:45:32 +0000 (20:45 +0000)]
Merge "Default to "prescott" as our baseline i686 host build architecture."
Svet Ganov [Wed, 23 Jul 2014 17:12:06 +0000 (17:12 +0000)]
Merge "Add appwidget to system image." into lmp-dev
Daniel Rosenberg [Tue, 22 Jul 2014 22:21:09 +0000 (22:21 +0000)]
Merge "Create a vendor build.prop for verifying versions" into lmp-dev
Daniel Rosenberg [Tue, 22 Jul 2014 00:21:20 +0000 (17:21 -0700)]
Create a vendor build.prop for verifying versions
The vendor build.prop contains the fingerprint for the build, and
timestamps. It allows you to tell if the vendor partition matches
the system partition.
Change-Id: Icf261571e82823928b2562e66e48fbcb0da55801
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Tsu Chiang Chuang [Thu, 26 Jun 2014 18:40:02 +0000 (11:40 -0700)]
Include cts-junit target for cts tests.
(cherry picked from commit
1949a41e70c70fd71fb8decf9fb2f98aab3b7198)
Change-Id: Ic1d05f0eb1ceb1ac732b57ba1322acd17758b8d3
Ying Wang [Mon, 21 Jul 2014 23:06:21 +0000 (16:06 -0700)]
Remove unnecessary dependency of the sdk target.
ALL_GENERATED_SOURCES forces to build heavy things already covered by
build cache.
Change-Id: I362bc450b9e303120d12ee8d53d75e86ef71e58f
Ying Wang [Mon, 21 Jul 2014 22:36:34 +0000 (22:36 +0000)]
am
0ea63e0c: Merge "Remove framework2" into lmp-dev
* commit '
0ea63e0cbd974863f9c828951d3a9228de962db6':
Remove framework2
Ying Wang [Mon, 21 Jul 2014 20:53:00 +0000 (20:53 +0000)]
am
2f7b92c9: The order of SDK version matters.
* commit '
2f7b92c90a5e58619fc88d5c7f4d8c36276a7b18':
The order of SDK version matters.
Ying Wang [Mon, 21 Jul 2014 20:44:06 +0000 (13:44 -0700)]
The order of SDK version matters.
Because some places assumes the last item is the latest public SDK
version number.
Change-Id: I0ac83ab204dcabec0b9399db1bebc77322808074