Ying Wang
ce346216ea
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.
2014-07-24 23:30:47 +00:00
Tim Murray
72c70d14d4
resolved conflicts for merge of 2812b27c
to lmp-dev-plus-aosp
...
Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
2014-07-24 14:27:05 -07:00
Tim Murray
2812b27c5f
am f82de5b8
: Merge "Switch host builds to use Clang by default."
...
* commit 'f82de5b89d70fb0e122f03a3956c5b01e66daca5':
Switch host builds to use Clang by default.
2014-07-24 21:04:24 +00:00
Dehao Chen
e7b374485f
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.
2014-07-24 19:46:34 +00:00
Ying Wang
1e148a4bc4
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
2014-07-24 19:46:33 +00:00
Ying Wang
7006112b60
am 0d660660
: Merge "Improve rules of split apks." into lmp-dev
...
* commit '0d660660dbdd84391c14cf21396d4f4fff923085':
Improve rules of split apks.
2014-07-24 19:46:32 +00:00
Ying Wang
6aef047362
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
2014-07-23 22:26:32 -07:00
Ying Wang
5de8ebc8f7
am 5d23800f
: am 1bb9adb8
: Merge "[MIPS64] Enable mips64 clang"
...
* commit '5d23800f2b61c03a97395815e94d2aa44eea8577':
[MIPS64] Enable mips64 clang
2014-07-24 01:49:26 +00:00
Ying Wang
5d23800f2b
am 1bb9adb8
: Merge "[MIPS64] Enable mips64 clang"
...
* commit '1bb9adb88004ebdbacf44a95bd4e08065960c5ab':
[MIPS64] Enable mips64 clang
2014-07-24 01:45:53 +00:00
Ying Wang
8478ab00d0
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.
2014-07-23 23:41:18 +00:00
Ying Wang
ebe0bacc80
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.
2014-07-23 23:37:56 +00:00
Ying Wang
e799869823
Merge "Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS" into lmp-dev
2014-07-23 18:56:15 +00:00
Ying Wang
00fe587974
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
2014-07-23 14:38:02 -07:00
Ying Wang
0d660660db
Merge "Improve rules of split apks." into lmp-dev
2014-07-23 18:56:15 +00:00
Ying Wang
7f625aad03
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
2014-07-23 16:38:06 -07:00
Ying Wang
1bb9adb880
Merge "[MIPS64] Enable mips64 clang"
2014-07-23 18:51:55 +00:00
Duane Sand
41ca444637
[MIPS64] Enable mips64 clang
...
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
2014-07-23 14:10:39 -07:00
Tim Murray
f82de5b89d
Merge "Switch host builds to use Clang by default."
2014-07-23 18:45:08 +00:00
Tim Murray
92d79cbb41
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
2014-07-24 09:25:58 -07:00
Ying Wang
6837ac6703
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
2014-07-23 18:45:08 +00:00
Dehao Chen
7092c79a14
Refactor FDO support code to ensure arm64 can also be built with FDO.
...
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
2014-07-23 16:34:07 -07:00
Dehao Chen
1cd4638594
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO." into lmp-dev
2014-07-23 18:44:51 +00:00
Dehao Chen
25671e15cc
Refactor FDO support code to ensure arm64 can also be built with FDO.
...
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
2014-07-23 16:23:46 -07:00
Svet Ganov
843025ad61
am 6693649a
: Merge "Add appwidget to system image." into lmp-dev
...
* commit '6693649a42177484c6439912c1d56712378a851c':
Add appwidget to system image.
2014-07-23 17:24:15 +00:00
Yohann Roussel
4a6f9c68de
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
2014-07-23 17:03:23 +00:00
Yohann Roussel
c324a62425
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 100aba5374
)
Change-Id: I39f3ede95ae68777ca5e3db4ab5c6ebeefc86ac6
2014-07-23 16:07:20 +02:00
Ying Wang
67b806cc29
am 84c26b69
: Delete .swp file added by accident.
...
* commit '84c26b694978eb6b9ee9400d15283707ea9b3eb9':
Delete .swp file added by accident.
2014-07-23 00:53:57 +00:00
Ying Wang
368cb5871d
am 1425e2d8
: Support LOCAL_PACKAGE_SPLITS.
...
* commit '1425e2d8c08663987f2d1004c55e6060d1ce6dfe':
Support LOCAL_PACKAGE_SPLITS.
2014-07-23 00:50:09 +00:00
Ying Wang
84c26b6949
Delete .swp file added by accident.
...
Also added .swp to .gitignore.
Change-Id: I51700f55230facde2e46574aa039d45ae5b29cdf
2014-07-22 17:42:35 -07:00
Ying Wang
1425e2d8c0
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
2014-07-22 17:37:11 -07:00
Daniel Rosenberg
2e4cb2f063
am 337bbf89
: Merge "Create a vendor build.prop for verifying versions" into lmp-dev
...
* commit '337bbf89d92f28bff85273ffefb71d3e5d7f57fc':
Create a vendor build.prop for verifying versions
2014-07-22 22:29:17 +00:00
Stephen Hines
fee5160c11
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.
2014-07-22 20:53:44 +00:00
Stephen Hines
786c565ea4
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.
2014-07-22 20:49:15 +00:00
Sebastien Hertz
6dded0d406
am 3389b9e8
: Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-dev
...
* commit '3389b9e88752a2b3a20fd6fea04ac6bedeec4afc':
Vary non-image Xmx for dex2oat on MIPS.
2014-07-22 17:13:40 +00:00
Tsu Chiang Chuang
a1492c7ef6
am 64a06072
: Merge "Include cts-junit target for cts tests." into lmp-dev
...
* commit '64a0607262c11beb4421b4902091078785dcf77d':
Include cts-junit target for cts tests.
2014-07-22 17:00:28 +00:00
Sebastien Hertz
0dd51404fd
resolved conflicts for merge of 2715dc67
to lmp-dev-plus-aosp
...
Change-Id: I48365572b92429659069b87250cae21a135cf155
2014-07-22 18:51:05 +02:00
Ying Wang
2469e15262
am ab4a98a8
: Remove unnecessary dependency of the sdk target.
...
* commit 'ab4a98a85d0af425904af81c72627457292c147f':
Remove unnecessary dependency of the sdk target.
2014-07-22 16:36:37 +00:00
Tsu Chiang Chuang
64a0607262
Merge "Include cts-junit target for cts tests." into lmp-dev
2014-07-22 16:29:55 +00:00
Stephen Hines
38470c3fff
Merge "Default to "prescott" as our baseline i686 host build architecture."
2014-07-22 16:25:43 +00:00
Svet Ganov
6693649a42
Merge "Add appwidget to system image." into lmp-dev
2014-07-22 16:21:19 +00:00
Daniel Rosenberg
337bbf89d9
Merge "Create a vendor build.prop for verifying versions" into lmp-dev
2014-07-22 16:21:19 +00:00
Daniel Rosenberg
40b61ca768
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>
2014-07-22 15:00:59 -07:00
Tsu Chiang Chuang
c73d200ca5
Include cts-junit target for cts tests.
...
(cherry picked from commit 1949a41e70
)
Change-Id: Ic1d05f0eb1ceb1ac732b57ba1322acd17758b8d3
2014-07-21 22:23:18 -07:00
Ying Wang
ab4a98a85d
Remove unnecessary dependency of the sdk target.
...
ALL_GENERATED_SOURCES forces to build heavy things already covered by
build cache.
Change-Id: I362bc450b9e303120d12ee8d53d75e86ef71e58f
2014-07-21 16:06:21 -07:00
Ying Wang
2d733b71e8
am 0ea63e0c
: Merge "Remove framework2" into lmp-dev
...
* commit '0ea63e0cbd974863f9c828951d3a9228de962db6':
Remove framework2
2014-07-21 22:36:34 +00:00
Ying Wang
0e4d929de0
am 2f7b92c9
: The order of SDK version matters.
...
* commit '2f7b92c90a5e58619fc88d5c7f4d8c36276a7b18':
The order of SDK version matters.
2014-07-21 20:53:00 +00:00
Ying Wang
2f7b92c90a
The order of SDK version matters.
...
Because some places assumes the last item is the latest public SDK
version number.
Change-Id: I0ac83ab204dcabec0b9399db1bebc77322808074
2014-07-21 13:44:06 -07:00
Ying Wang
4b4eeee01f
am 04862007
: Merge "Normalize SDK product name to sdk_<device_type>_<arch_name>" into lmp-dev
...
* commit '0486200762a0be6080579dd60044ae3ff88f616a':
Normalize SDK product name to sdk_<device_type>_<arch_name>
2014-07-21 16:56:57 +00:00
Ying Wang
434a28d2d6
am f55b304f
: Merge "Support "LOCAL_SDK_VERSION := system_current"" into lmp-dev
...
* commit 'f55b304fd1ae10f47c97583f9faae002fde4f4ee':
Support "LOCAL_SDK_VERSION := system_current"
2014-07-21 16:53:18 +00:00
Svet Ganov
acc5296cb9
Add appwidget to system image.
...
Change-Id: I0d5db3f39390065ec5067bb9a15924fdcb181692
2014-07-20 22:58:24 -07:00