Ying Wang
defccfe52f
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.
2014-07-26 00:52:21 +00:00
Ying Wang
53e19fd4e2
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.
2014-07-26 00:48:25 +00:00
Edwin Wong
4d366fb6d5
am dbb3d2e7
: Add libdrmclearkeyplugin.so to image.
...
* commit 'dbb3d2e732b5b66bade851bb1791c2040f233ef2':
Add libdrmclearkeyplugin.so to image.
2014-07-25 23:42:09 +00:00
Edwin Wong
dbb3d2e732
Add libdrmclearkeyplugin.so to image.
...
The library will be added to /system/vendor/lib/mediadrm.
Change-Id: Iebfd00077c2a13e4ad4296aedba21230a7e4f37f
2014-07-25 23:25:20 +00:00
Stephen Hines
f8ab364202
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.
2014-07-25 20:00:00 +00:00
Yohann Roussel
f0f5f695de
am 4e0693cf
: am 970d053c
: Merge "Fix doc target for multidex support library."
...
* commit '4e0693cf6c3420d1cc8fcd7768a339458612b28d':
Fix doc target for multidex support library.
2014-07-25 18:45:02 +00:00
Przemyslaw Szczepaniak
28665b5850
am ac6a9195
: Switch NDK arm64 libraries to 4.9.
...
* commit 'ac6a9195cadc83a50cea376fc61268db6fc2f129':
Switch NDK arm64 libraries to 4.9.
2014-07-25 17:27:29 +00:00
Przemyslaw Szczepaniak
ac6a9195ca
Switch NDK arm64 libraries to 4.9.
...
Change-Id: Iffc30e34b798896d9259ca1dfc3ff2d21683d6a4
(cherry picked from commit 5895dd13a7
)
2014-07-25 13:44:34 +00:00
Yohann Roussel
4e0693cf6c
am 970d053c
: Merge "Fix doc target for multidex support library."
...
* commit '970d053c975e9ee38e61fc00506362a76fcc153d':
Fix doc target for multidex support library.
2014-07-25 12:53:32 +00:00
Tim Murray
4f8e50d8e5
am d161be2d
: am 77d93bce
: Merge "fix build"
...
* commit 'd161be2d063565ecab6d1fce4440d496d8928abc':
fix build
2014-07-25 01:03:35 +00:00
Tim Murray
71ecd1dd0f
am eb9563f9
: am 16d43086
: Merge "Fix Windows SDK build to not use clang."
...
* commit 'eb9563f9ab610ca09bf99c6975f70c14c35683bd':
Fix Windows SDK build to not use clang.
2014-07-25 01:03:32 +00:00
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
Stephen Hines
e9bf1bdac6
Merge "Default to "prescott" as our baseline i686 host build architecture." into lmp-dev
2014-07-24 22:43:15 +00:00
Stephen Hines
76bd60b7da
Default to "prescott" as our baseline i686 host build architecture.
...
Bug: 16408818
Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
2014-07-25 00:42:14 -07:00
Tim Murray
d161be2d06
am 77d93bce
: Merge "fix build"
...
* commit '77d93bceb06dd3983868327b03a726bf5d8ae079':
fix build
2014-07-24 22:25:59 +00:00
Tim Murray
eb9563f9ab
am 16d43086
: Merge "Fix Windows SDK build to not use clang."
...
* commit '16d43086e91b76876f195b6d7a7c2e9d021b8293':
Fix Windows SDK build to not use clang.
2014-07-24 22:12:14 +00:00
Tim Murray
77d93bceb0
Merge "fix build"
2014-07-24 22:07:52 +00:00
Tim Murray
f3ca3d560a
fix build
...
Change-Id: I28799d5523e1d2d2500a82b3d323c58486aacdbc
2014-07-24 15:20:18 -07:00
Tim Murray
5ca1dc15a1
Fix Windows SDK build to not use clang.
...
bug 16172793
Change-Id: I7bf76cae49ec17bf50eb657b0e38234b7cb55e85
2014-07-24 14:43:33 -07: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
Yohann Roussel
970d053c97
Merge "Fix doc target for multidex support library."
2014-07-23 19:30:00 +00:00
Yohann Roussel
5679e356d2
Fix doc target for multidex support library.
...
Change-Id: I0136c6cd8a3af0dc9d12b9424f96e9527cde68e2
2014-07-24 17:24:30 +02:00
Tim Murray
16d43086e9
Merge "Fix Windows SDK build to not use clang."
2014-07-23 18:56:15 +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
Ying Wang
45040bdbb8
Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
2014-07-23 18:04:01 +00: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