Commit Graph

18572 Commits

Author SHA1 Message Date
Ying Wang 274ad525c1 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
2014-06-11 20:49:37 +00:00
Ying Wang 01c4f4622b am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."
* commit 'dceddd91d9a6516346e752b9f942747bea931cfa':
  Fix loophole in module expansion.
2014-06-11 20:49:20 +00:00
Ying Wang 70ae5e23fc am 0d276266: am 128cd1b7: am 6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '0d27626620676dbe72bf5c020008bb2dad20d75f':
  Add global variable HOST_LIBRARY_PATH.
2014-06-11 20:24:22 +00:00
Elliott Hughes 59c9bea1da am b5153477: am c7504124: am 47cdacd5: Merge "Remove libportable from core_base.mk."
* commit 'b5153477107fd0cba9e073c4445c11c78ee35c92':
  Remove libportable from core_base.mk.
2014-06-11 19:34:31 +00:00
Ying Wang f7988507f4 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.
2014-06-11 19:26:30 +00:00
Ying Wang 80d3bd1582 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
2014-06-11 17:58:43 +00:00
Ying Wang 541b1d0f7c 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.
2014-06-11 17:44:54 +00:00
Ying Wang 32aff8085a 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
2014-06-10 23:32:41 +00:00
Ying Wang 6bfbfee535 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
2014-06-10 23:28:52 +00:00
Ying Wang dceddd91d9 am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
  Fix loophole in module expansion.
2014-06-10 22:29:18 +00:00
Ying Wang 79b46720e6 am 02f98a26: Merge "Fix loophole in module expansion."
* commit '02f98a26c9e305077f11a5e2f81494dd3a0a2a2c':
  Fix loophole in module expansion.
2014-06-10 22:25:53 +00:00
Ying Wang 7d883401c0 Merge "Added variables to support seperate vendor patition." 2014-06-10 22:18:15 +00:00
Ying Wang a45a5d2797 Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted" 2014-06-10 22:15:14 +00:00
Ying Wang 6e85f8b0de 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
2014-06-10 16:24:31 -07:00
Ying Wang 02f98a26c9 Merge "Fix loophole in module expansion." 2014-06-10 21:59:54 +00:00
Ying Wang e1b867dde7 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
2014-06-10 14:30:30 -07:00
Doug Zongker a5eac7cadb Merge "configure progress bar during block OTA script generation" 2014-06-10 21:13:43 +00:00
Ying Wang 0d27626620 am 128cd1b7: am 6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '128cd1b7eb66ccb05de417a93d6e432447dc875a':
  Add global variable HOST_LIBRARY_PATH.
2014-06-10 20:35:08 +00:00
Ying Wang 128cd1b7eb am 6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '6cc4598d18c660d4e253970bc875be5fa08c770b':
  Add global variable HOST_LIBRARY_PATH.
2014-06-10 20:33:04 +00:00
Ying Wang 6cc4598d18 Merge "Add global variable HOST_LIBRARY_PATH." 2014-06-10 20:31:23 +00:00
Elliott Hughes b515347710 am c7504124: am 47cdacd5: Merge "Remove libportable from core_base.mk."
* commit 'c75041243c1c189e6972eb8680c83f1b17dacfd7':
  Remove libportable from core_base.mk.
2014-06-10 19:27:47 +00:00
Elliott Hughes c75041243c am 47cdacd5: Merge "Remove libportable from core_base.mk."
* commit '47cdacd5e633c8256a5dd32c769b5469882fc0aa':
  Remove libportable from core_base.mk.
2014-06-10 19:25:57 +00:00
Elliott Hughes 47cdacd5e6 Merge "Remove libportable from core_base.mk." 2014-06-10 19:23:53 +00:00
Elliott Hughes 4e8c6991e5 Remove libportable from core_base.mk.
Change-Id: I3fae0625c68db885bd2fba502d31fe3c524d4f47
2014-06-10 12:19:01 -07:00
Ying Wang c4595868c4 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
2014-06-10 12:04:56 -07:00
Bart Sears b602f7b147 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
2014-06-10 18:41:52 +00:00
Ying Wang 2d19cbd279 resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
2014-06-10 09:45:45 -07:00
Ying Wang 135e11df38 am c3838620: Merge "Switch to 32-bit-by-default host multilib build."
* commit 'c383862020034b3db4e365aaf501a84a35e85ffe':
  Switch to 32-bit-by-default host multilib build.
2014-06-10 16:31:39 +00:00
Ying Wang c383862020 Merge "Switch to 32-bit-by-default host multilib build." 2014-06-10 16:26:42 +00:00
Ying Wang 2713fcebba 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
2014-06-09 17:48:05 -07:00
Vineeta Srivastava 19f6933724 Merge "Add synaptics to vendor owner whitelist" 2014-06-09 23:27:11 +00:00
Ying Wang b06c655e58 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
2014-06-09 23:00:02 +00:00
Ying Wang 322362cf01 am c0275247: Merge "build native tests for 32-bit and 64-bit"
* commit 'c02752473f958cb1b23ca2f7d3fd1973b665e3c4':
  build native tests for 32-bit and 64-bit
2014-06-09 22:57:48 +00:00
Ying Wang c02752473f Merge "build native tests for 32-bit and 64-bit" 2014-06-09 22:53:00 +00:00
Ying Wang fe9ad0975a 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.
2014-06-09 21:51:01 +00:00
Ying Wang b1f65358a8 am 5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit '5ad17493cdb329087459ef7cddaed20cb1bba707':
  Support .asm being compiled by yasm targeted for x86.
2014-06-09 21:47:40 +00:00
Ying Wang 5ad17493cd Merge "Support .asm being compiled by yasm targeted for x86." 2014-06-09 21:43:56 +00:00
Doug Zongker 4b9596fe00 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
2014-06-09 14:15:45 -07:00
Bart Sears 5c2225c592 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
2014-06-09 21:12:45 +00:00
Erik Pasternak 30e677081b am e1d76eed: Merge "Revert "Integrate build_font.py"" into lmp-preview-dev
* commit 'e1d76eed322e620213cd4f936a29229a7658c6a1':
  Revert "Integrate build_font.py"
2014-06-09 15:55:48 +00:00
Deepanshu Gupta 12d786b56d am 8723f9e2: Merge "Integrate build_font.py" into lmp-preview-dev
* commit '8723f9e2127204e19b00b0c19d091bee7e3e1b0c':
  Integrate build_font.py
2014-06-09 15:55:29 +00:00
Erik Pasternak e1d76eed32 Merge "Revert "Integrate build_font.py"" into lmp-preview-dev 2014-06-08 20:12:41 +00:00
Erik Pasternak 21cf439581 Revert "Integrate build_font.py"
This CL broke the SDK builds.

This reverts commit 9eebd78f6e.

Change-Id: I973b40688602461bd3b0f8c1e1beb53b9fbec83c
2014-06-08 19:31:01 +00:00
Deepanshu Gupta 8723f9e212 Merge "Integrate build_font.py" into lmp-preview-dev 2014-06-07 23:33:12 +00:00
Lajos Molnar f1831cb022 am 93d45370: core_base.mk: add hevc software decoder
* commit '93d45370bea37e2c1e5931181fef12c67e9d2f98':
  core_base.mk: add hevc software decoder
2014-06-06 23:03:31 +00:00
Stephen Hines d17e71f185 am 69d5bd7c: am e266873b: am 1a8f0d3b: Merge "Move comment out of recipe section"
* commit '69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7':
  Move comment out of recipe section
2014-06-06 21:33:48 +00:00
Stephen Hines 69d5bd7cbc am e266873b: am 1a8f0d3b: Merge "Move comment out of recipe section"
* commit 'e266873b211289ce07420ec2c51208ff83c49c36':
  Move comment out of recipe section
2014-06-06 21:30:57 +00:00
Bart Sears 7976b2be9e 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.
2014-06-06 14:21:28 -07:00
Stephen Hines e266873b21 am 1a8f0d3b: Merge "Move comment out of recipe section"
* commit '1a8f0d3b6dc316034e1e3b28702fead4108ec8d3':
  Move comment out of recipe section
2014-06-06 21:17:40 +00:00
Bart Sears 0e23c5e305 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
2014-06-06 21:07:46 +00:00