openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
15,886 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

15886 Commits

Author SHA1 Message Date
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 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 cc2a47bf64 Merge "Check existence of both 64-bit and 32-bit module variants." 2014-06-10 22:20:24 +00:00
Ying Wang ff3a904522 Check existence of both 64-bit and 32-bit module variants. 
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.

Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
 2014-06-10 19:23:29 -07:00
Ying Wang d707b5aa74 Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15" 2014-06-10 22:15:14 +00:00
Ying Wang c34f37c7b5 Merge "Allow to opt out both multilib in native test." 2014-06-10 22:15:14 +00:00
Ying Wang ad10cc76b6 Allow to opt out both multilib in native test. 
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.

Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
 2014-06-10 17:52:20 -07: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 b2ba5636f1 Merge "Revert "Don't rename host libraries if only one arch is build."" 2014-06-10 22:08:45 +00:00
Ying Wang 532f1127af Revert "Don't rename host libraries if only one arch is build." 
This reverts commit b1f7fb7a50.

Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
 2014-06-11 01:12:18 +00: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 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 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 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 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 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
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
Stephen Hines 1a8f0d3b6d Merge "Move comment out of recipe section" 2014-06-06 21:07:25 +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 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
Tim Murray 3c52ff0714 am e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 
* commit 'e564c0cbd08c728d84e62308c741b30f3bd542f8':
  Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
 2014-06-04 19:05:45 +00:00
Tim Murray e564c0cbd0 Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 2014-06-04 19:00:38 +00:00
Qiwen Zhao d6e6f97a8e am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk"" 
* commit 'e8e7ebbde46df2a4dafc4c90a53abd911d1255ec':
  Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
 2014-06-04 18:27:18 +00:00
Qiwen Zhao e8e7ebbde4 Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk"" 
This reverts commit a5abefbbb5.
 2014-06-04 11:21:21 -07:00
Qiwen Zhao 5de36c46d8 am a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk" 
* commit 'a5abefbbb527490dd76e34780dc2bfc6ed6a437d':
  Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
 2014-06-04 17:12:13 +00:00
Qiwen Zhao a5abefbbb5 Revert "DO NOT MERGE: Combine emulator test projects into a single apk" 
This reverts commit 0ced06ea0f.
 2014-06-04 10:02:29 -07:00
Steve Moyer c653faa887 am 37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk 
* commit '37773821f150778c48ef3519407d8ee71dd66a30':
  DO NOT MERGE: Combine emulator test projects into a single apk
 2014-06-04 16:55:53 +00:00
Steve Moyer 1e1681db51 am 008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk 
* commit '008dc16cb06976620c0fa1e51942f2d1c6af54f3':
  DO NOT MERGE: Combine emulator test projects into a single apk
 2014-06-04 16:55:52 +00:00
Steve Moyer 37773821f1 DO NOT MERGE: Combine emulator test projects into a single apk 
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
 2014-06-04 09:41:24 -07:00
Steve Moyer 008dc16cb0 DO NOT MERGE: Combine emulator test projects into a single apk 
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
 2014-06-04 09:38:32 -07:00
Serban Constantinescu 93694e63ee AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15 
A sensible default for the 32bit CPU_VARIANT of an ARM64 build is
cortex-a15. Please note that the AArch32 execution state of ARMv8
is a superset of ARMv7.

Change-Id: Id2b655172750e04609ae9ba22d621fe83cd69b1a
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
 2014-06-04 16:19:24 +01:00
Stephen Hines 5339640da6 Switch name from tblgen -> llvm-tblgen for consistency with upstream tools. 
Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
 2014-06-03 18:28:44 -07:00
Primiano Tucci 1d6506ca4b Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler." 2014-06-03 09:29:51 +00:00
Ying Wang 7f349dc968 am 40b7e342: Merge "Move sdk staging dir to a product-specific dir" 
* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
 2014-06-03 01:22:51 +00:00
Ying Wang 40b7e34240 Merge "Move sdk staging dir to a product-specific dir" 2014-06-03 01:20:30 +00:00