Commit Graph

19308 Commits

Author SHA1 Message Date
Ying Wang 1dd586eea2 am 3f191617: am 7a739f35: Merge "Use hermetic host toolchains."
* commit '3f1916174823fe6fd034ba07c762fae9a0143e44':
  Use hermetic host toolchains.
2014-07-30 16:22:08 +00:00
Ying Wang b53efd68b5 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.""
2014-07-30 16:22:00 +00:00
Ying Wang 3f19161748 am 7a739f35: Merge "Use hermetic host toolchains."
* commit '7a739f35857f7c3b7d2de24c56c6eb86bc4818d7':
  Use hermetic host toolchains.
2014-07-30 16:17:10 +00:00
Ying Wang 18c20aae44 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.""
2014-07-30 16:17:06 +00:00
Ying Wang 7a739f3585 Merge "Use hermetic host toolchains." 2014-07-29 21:36:05 +00:00
Ying Wang aea1cae4f5 Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""" 2014-07-29 21:36:05 +00:00
Ying Wang 1b0fc43557 Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit a4f84fdfed.
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
2014-07-29 18:05:27 -07:00
Ying Wang 1be3983ab3 am a961a09e: Fix error: \'NoneType\' object is not iterable
* commit 'a961a09e59dcf130435cf5ff052c4f2d7e3986ea':
  Fix error: 'NoneType' object is not iterable
2014-07-29 19:09:13 +00:00
Ying Wang a961a09e59 Fix error: 'NoneType' object is not iterable
Change-Id: I5a54edbed0e5e5481a570b93c07d50f6ca3e18e0
2014-07-29 11:42:37 -07:00
Ying Wang bb3b27ac34 resolved conflicts for merge of 9929fd66 to lmp-dev-plus-aosp
Change-Id: I7f3b4111bb508e61d279fc4a78b2a2ebe8cfd6d9
2014-07-29 11:08:05 -07:00
Ying Wang 9929fd661c am ecc42675: Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"
* commit 'ecc4267564116197b719baf9ecc24a9f0652fbb5':
  Allow LOCAL_ASSET_DIR point to nonexistent dir
2014-07-29 18:01:17 +00:00
Ying Wang ecc4267564 Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir" 2014-07-29 17:36:25 +00:00
Ying Wang bfcdf060ba 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
2014-07-29 10:34:30 -07:00
Yohann Roussel a55c55ff5a am 355520e3: Merge "Fix doc target for multidex support library." into lmp-dev
* commit '355520e35ed69c60b755fbca630b9939f35b6eb2':
  Fix doc target for multidex support library.
2014-07-29 13:14:59 +00:00
Ying Wang 5e2ebcbe26 Use hermetic host toolchains.
Change-Id: I6bb72b5728d1075be9645f8473dcf3db759fa66a
2014-07-28 15:14:51 -07:00
Marcin Kosiba dc5be215db 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."
2014-07-28 11:57:17 +00:00
Marcin Kosiba bf4ac764cd 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."
2014-07-28 09:06:07 +00:00
Vignesh Venkatasubramanian ea63b7ae40 am 82af97fc: Add opus entries in generic makefiles.
* commit '82af97fc274c27da7099c46f84ad48f6f9624537':
  Add opus entries in generic makefiles.
2014-07-26 02:40:35 +00:00
Vignesh Venkatasubramanian 82af97fc27 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
2014-07-26 01:08:12 +00:00
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
Yohann Roussel 355520e35e Merge "Fix doc target for multidex support library." into lmp-dev 2014-07-24 15:36:05 +00:00
Yohann Roussel 85cacbe0e0 Fix doc target for multidex support library.
(cherry picked from commit 5679e356d2)

Change-Id: I2e97f59796046d94c9b03dbc89ec1d2153b54ce1
2014-07-25 17:14:35 +02: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