StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,326 Commits 1 Branch 0 Tags
d036711427ff7ecbf603b51e04c75986504138d9
Commit Graph

5249 Commits

Author SHA1 Message Date
Elliott Hughes
e82d33d997 Remove useless stuff from "AndroidConfig.h". 
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.

Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
 2014-06-12 15:36:52 -07:00
Wink Saville
273c22cbc0 Merge kwd to master 
Add ims-common support from kwd

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
 2014-06-11 15:21:03 -07:00
Ying Wang
0d26882d85 am 2ebf7c1c: am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants." 
* commit '2ebf7c1c5f3e04f13fa7d80dcc5d060306a8a475':
  Check existence of both 64-bit and 32-bit module variants.
 2014-06-11 21:37:45 +00:00
Dianne Hackborn
0c651756f0 Merge "Update to reflect KKWT's graduation to API 20." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Dianne Hackborn
997b896eeb Update to reflect KKWT's graduation to API 20. 
Change-Id: I4716e71d72b2526fe635079d1b15f623db842c21
 2014-06-11 14:24:32 -07:00
Ying Wang
1ebacee598 am 4706eb3f: am c72592b7: am b2ba5636: Merge "Revert "Don\'t rename host libraries if only one arch is build."" 
* commit '4706eb3f223890d4578a234c8ca786570f00f3a7':
  Revert "Don't rename host libraries if only one arch is build."
 2014-06-11 20:50:05 +00:00
Ying Wang
f2073a55fa am f1b35fb1: am fd76c34a: am c34f37c7: Merge "Allow to opt out both multilib in native test." 
* commit 'f1b35fb159cb823be2172ecdf425e902d6c1bbc3':
  Allow to opt out both multilib in native test.
 2014-06-11 20:49:55 +00:00
Ying Wang
1f5a7c21de am 19aa2837: am 49d9a894: am cec9dc14: Merge "Don\'t rename host libraries if only one arch is build." 
* commit '19aa28379f86b0938b3c6bef41ca6b89b6d91711':
  Don't rename host libraries if only one arch is build.
 2014-06-11 20:49:51 +00:00
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
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
2ebf7c1c5f am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants." 
* commit '6b468193536c1925944ccbf6269ee057e080aef4':
  Check existence of both 64-bit and 32-bit module variants.
 2014-06-11 02:29:37 +00:00
Deepanshu Gupta
887cd0c71e Integrate build_font.py again 
Executle the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
 2014-06-10 18:41:29 -07:00
Ying Wang
4706eb3f22 am c72592b7: am b2ba5636: Merge "Revert "Don\'t rename host libraries if only one arch is build."" 
* commit 'c72592b7bdcfbedd51198b09917a7c331a552544':
  Revert "Don't rename host libraries if only one arch is build."
 2014-06-11 01:18:28 +00:00
Ying Wang
f1b35fb159 am fd76c34a: am c34f37c7: Merge "Allow to opt out both multilib in native test." 
* commit 'fd76c34a1700d18677a461fb3ae777dd13f813ad':
  Allow to opt out both multilib in native test.
 2014-06-11 01:09:44 +00:00
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
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
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
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
7d883401c0 Merge "Added variables to support seperate vendor patition." 2014-06-10 22:18:15 +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
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
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
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
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
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
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
5ad17493cd Merge "Support .asm being compiled by yasm targeted for x86." 2014-06-09 21:43:56 +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
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
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
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
dd4db3058a am 56ec31cf: am 3fe9a277: am d0f0918b: Merge "Reenable ccache." 
* commit '56ec31cfca1ed5f9d833d73c327b2799601cd5a4':
  Reenable ccache.
 2014-06-06 18:43:44 +00:00
Ying Wang
56ec31cfca am 3fe9a277: am d0f0918b: Merge "Reenable ccache." 
* commit '3fe9a277fe1f21b947bb7ac5d093d969eb10dc6b':
  Reenable ccache.
 2014-06-06 18:40:14 +00:00