p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,407 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

16407 Commits

Author SHA1 Message Date
Ying Wang 19aa28379f am 49d9a894: am cec9dc14: Merge "Don\'t rename host libraries if only one arch is build." 
* commit '49d9a894dcc83ecbc4589d315a9c0799ee6d8846':
  Don't rename host libraries if only one arch is build.
 2014-06-11 00:27:46 +00:00
Ying Wang 49d9a894dc am cec9dc14: Merge "Don\'t rename host libraries if only one arch is build." 
* commit 'cec9dc14185dd1df6704a4af226ffbb2a1b9cd87':
  Don't rename host libraries if only one arch is build.
 2014-06-11 00:24:10 +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 cec9dc1418 Merge "Don't rename host libraries if only one arch is build." 2014-06-10 22:15:14 +00:00
Ying Wang b1f7fb7a50 Don't rename host libraries if only one arch is build. 
This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.

Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
 2014-06-10 17:18:08 -07: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
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
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
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
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
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
Stephen Hines 1a8f0d3b6d Merge "Move comment out of recipe section" 2014-06-06 21:07:25 +00:00
Bart Sears 3b118a55b9 MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE 
Make is so.

Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0
 2014-06-06 20:41:08 +00:00
Stephen Hines 8ff9252680 Move comment out of recipe section 
If we keep a comment in the recipe, it prints out whenever that component
gets built.

Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
 2014-06-06 12:51:47 -07:00
Ying Wang 56ec31cfca am 3fe9a277: am d0f0918b: Merge "Reenable ccache." 
* commit '3fe9a277fe1f21b947bb7ac5d093d969eb10dc6b':
  Reenable ccache.
 2014-06-06 18:40:14 +00:00
Ying Wang 3fe9a277fe am d0f0918b: Merge "Reenable ccache." 
* commit 'd0f0918b8fa2a1794050a3cecf3ad3943ad378ab':
  Reenable ccache.
 2014-06-06 18:24:31 +00:00
Ying Wang d0f0918b8f Merge "Reenable ccache." 2014-06-06 18:21:09 +00:00
Ying Wang 67ed25f3a6 Reenable ccache. 
The previous commit 994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.

Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
 2014-06-06 11:18:04 -07:00
Ying Wang 7b913ce6fa Support .asm being compiled by yasm targeted for x86. 
Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
 2014-06-06 11:00:36 -07:00
Adam Lesinski 2f9a705e5e am 3f1b5c52: Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev 
* commit '3f1b5c52d27165fc5aa0fbf443f10e8ad3e81ab7':
  The public Telephony APIs must be present in all Android products
 2014-06-05 22:21:32 +00:00
Adam Lesinski 3f1b5c52d2 Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev 2014-06-05 22:19:27 +00:00
Ying Wang 1cd740f1f0 am 1343ec16: am b75fe469: am eafdd2cd: Fix emulator builds 
* commit '1343ec169c1bbbf7c5f1d5d2ce6d30d27bbea992':
  Fix emulator builds
 2014-06-04 22:30:05 +00:00
Ying Wang 1343ec169c am b75fe469: am eafdd2cd: Fix emulator builds 
* commit 'b75fe4696e847ef49aa9b11693243c00de497808':
  Fix emulator builds
 2014-06-04 22:24:51 +00:00
Ying Wang b75fe4696e am eafdd2cd: Fix emulator builds 
* commit 'eafdd2cd878c8fd23033302a2c5010505412981f':
  Fix emulator builds
 2014-06-04 22:21:38 +00:00
Ying Wang eafdd2cd87 Fix emulator builds 
which don't have boot.img.

Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
 2014-06-04 15:16:17 -07:00
Tim Murray 45c3930084 am 3c52ff07: am e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 
* commit '3c52ff07141c236b51a2ccfe5fdb3de33421bd3b':
  Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
 2014-06-04 19:20:29 +00:00