StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,675 Commits 1 Branch 0 Tags
0933e17bb65aed74349dd64caef6f68f8c29d67c
Commit Graph

24675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
1c79b73b69 am 479de877: am a101f558: am ecbc5b40: Merge "Build static ckati on Linux." 
* commit '479de8779ef74c0976f81cba00492aa17cfb6c36':
  Build static ckati on Linux.
 2015-08-06 18:02:38 +00:00
Tao Bao
7c6a2a4ccf resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp 
Change-Id: If44e033d2163b1e357be78b5a9e1b6092baf5063
 2015-08-06 11:01:31 -07:00
Ying Wang
479de8779e am a101f558: am ecbc5b40: Merge "Build static ckati on Linux." 
* commit 'a101f55893ecaa59666faa653a926ea49d57212a':
  Build static ckati on Linux.
 2015-08-06 17:55:13 +00:00
Tao Bao
610520ad20 am 40467cbf: Merge "build: Support packaging for system_root_image." 
* commit '40467cbfbbc2a59d9b80f5c5ee97bd1a64bc2858':
  build: Support packaging for system_root_image.
 2015-08-06 17:49:49 +00:00
Ying Wang
a101f55893 am ecbc5b40: Merge "Build static ckati on Linux." 
* commit 'ecbc5b401a55ab4e9e0e9cc9bf720044c4d4a829':
  Build static ckati on Linux.
 2015-08-06 17:49:48 +00:00
Tao Bao
40467cbfbb Merge "build: Support packaging for system_root_image." 2015-08-06 17:43:46 +00:00
Tao Bao
62bd479fdf build: Support packaging for system_root_image. 
If system image contains the root directory
(BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.

Change-Id: I817776ca97194991308b2131d0e34ab136283464
 2015-08-05 16:39:39 -07:00
Tao Bao
7a5bf8a645 releasetools: Support packaging for system_root_image. 
For system images that contain the root directory, we need to find the
root directory at ROOT/ instead of BOOT/RAMDISK/.

Change-Id: Ica345c8b1b03475f8ac6c44fd576045fcf17c882
 2015-08-05 16:28:55 -07:00
Christopher Wiley
fe4f4de105 am 422e972b: resolved conflicts for merge of 7d1be400 to mnc-dr-dev-plus-aosp 
* commit '422e972b0548a7f3d2b76e6a5ec9dd77c05283cb':
  Add build rules to generate native DBus interfaces
 2015-08-05 20:35:50 +00:00
Christopher Wiley
422e972b05 resolved conflicts for merge of 7d1be400 to mnc-dr-dev-plus-aosp 
Change-Id: I2c62de9beb50ea1661b114a9d02b11ba73a28d82
 2015-08-05 10:20:42 -07:00
Ying Wang
ecbc5b401a Merge "Build static ckati on Linux." 2015-08-05 16:43:59 +00:00
Christopher Wiley
7d1be40047 am 5923fcd0: Merge "Add build rules to generate native DBus interfaces" 
* commit '5923fcd02131abfd1bc8f39704edc6c7e8100154':
  Add build rules to generate native DBus interfaces
 2015-08-05 15:46:44 +00:00
Christopher Wiley
5923fcd021 Merge "Add build rules to generate native DBus interfaces" 2015-08-05 15:40:00 +00:00
Paul Miller
ae61c885c6 am 450c53ac: am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider" 
* commit '450c53ace6a8c61f0fdf2058307b5e04db617f49':
  Replace Browser with Browser2 and BookmarkProvider
 2015-08-04 23:43:29 +00:00
Paul Miller
450c53ace6 am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider" 
* commit 'fa977ff366f54c6ae244f3ba99e3481f7d29796d':
  Replace Browser with Browser2 and BookmarkProvider
 2015-08-04 23:35:33 +00:00
Paul Miller
fa977ff366 am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider" 
* commit '09185f5a8f943aeac3d6ace37a73870f5eedc6f4':
  Replace Browser with Browser2 and BookmarkProvider
 2015-08-04 23:26:56 +00:00
Paul Miller
09185f5a8f Merge "Replace Browser with Browser2 and BookmarkProvider" 2015-08-04 23:20:29 +00:00
Ying Wang
82407825c3 am d2d30242: am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master 
* commit 'd2d3024292278a0a0723c901bee71c362735d6b1':
  Ignore .*.java files when collecting .java files.
 2015-08-04 20:55:15 +00:00
Ying Wang
d2d3024292 am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master 
* commit 'bd555f1523ec3faafe1e3c6cefce9fe0c96090c1':
  Ignore .*.java files when collecting .java files.
 2015-08-04 20:42:56 +00:00
Ying Wang
bd555f1523 resolved conflicts for merge of d86f39ca to stage-aosp-master 
Change-Id: Ifceb6705eeaaacc9f49788bc0e37a27e398beef0
 2015-08-04 13:36:07 -07:00
Ying Wang
d86f39cab7 Merge "Ignore .*.java files when collecting .java files." 2015-08-04 19:52:06 +00:00
Ying Wang
4aedea90e8 Ignore .*.java files when collecting .java files. 
Bug: 22934689
Change-Id: I6c9cc8f37d09eb190946e596e5d1ba0c3b318088
 2015-08-04 12:46:13 -07:00
Ying Wang
082b8ecb7b am f2ee86d1: am 5c78a488: am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build." 
* commit 'f2ee86d1712edf1c5b1b5b920883b037c661ab4f':
  Fix writing clean_steps.mk in the first build.
 2015-08-04 19:37:08 +00:00
Ying Wang
f2ee86d171 am 5c78a488: am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build." 
* commit '5c78a488d0b7d293c254493a9fc5fc71bc50b011':
  Fix writing clean_steps.mk in the first build.
 2015-08-04 19:28:00 +00:00
Ying Wang
0a0e6eae3f Build static ckati on Linux. 
Bug: 22798670
Change-Id: I3aaf127627c1c478ab3af2549e49506d4d1f19df
 2015-08-04 12:23:27 -07:00
Ying Wang
5c78a488d0 am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build." 
* commit 'fd43aa8a02d8415121694b4edd15ea8d549a7d3d':
  Fix writing clean_steps.mk in the first build.
 2015-08-04 19:21:38 +00:00
Ying Wang
fd43aa8a02 Merge "Fix writing clean_steps.mk in the first build." 2015-08-04 19:14:57 +00:00
Ying Wang
eadaa954ce Fix writing clean_steps.mk in the first build. 
Change-Id: Ieddc799f38e5d1522e329e8300bd9f49c26c70ae
 2015-08-04 12:11:54 -07:00
Stephen Smalley
d3a803e668 build: switch over to file_contexts.bin only 
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.

Depends on
   I75a781100082c23536f70ce3603f7de42408b5ba
   I43806d564b83d57f05f5c36c8eba7b1ff4831b04
   Id560d093440a2aba99cef28c20133b35feebf950
   I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400

Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2015-08-04 14:59:06 -04:00
Richard Haines
a65637d230 Update embedded.mk to support file_contexts.bin 
This change supports external/libselinux changes to implement
a PCRE formatted binary file_contexts file.

Change-Id: I75a781100082c23536f70ce3603f7de42408b5ba
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
 2015-08-04 14:53:12 -04:00
Ying Wang
23d8c546cc am cf3a0c52: am 32350fc5: am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG." 
* commit 'cf3a0c52acc2e431294b927bc8923677f807794c':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:54:49 +00:00
Ying Wang
27c9e3ea48 am dc6d2ada: am 60df3444: am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit 'dc6d2adaa851386ee01036db9a00912bd29a5115':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:54:48 +00:00
Ying Wang
cf3a0c52ac am 32350fc5: am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG." 
* commit '32350fc547569de75045171eb37e7feac16e93fd':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:47:26 +00:00
Ying Wang
dc6d2adaa8 am 60df3444: am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '60df344458f75ed9100e03f6012a73daf52d0807':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:45:41 +00:00
Ying Wang
60df344458 am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '0247fe72c05eb27ffb20f14d4b05458bb8641a38':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:36:32 +00:00
Ying Wang
0247fe72c0 am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '16d0b4cff1b643ee6bb70a3cf4541f34c4bc2210':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:28:49 +00:00
Ying Wang
16d0b4cff1 am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:20:54 +00:00
Ying Wang
32350fc547 am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG." 
* commit '5c3adca4011db8fd98a3b7beab76b5b02cbab063':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:18:48 +00:00
Ying Wang
5c3adca401 Merge "Don't prepend CC_WRAPPER to CLANG." 2015-08-03 21:13:37 +00:00
Ying Wang
3e3d7b5ce5 Don't prepend CC_WRAPPER to CLANG. 
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
(cherry-pick from commit 66c8e8c756)
 2015-08-03 14:08:54 -07:00
Ying Wang
66c8e8c756 Don't prepend CC_WRAPPER to CLANG. 
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
 2015-08-03 14:06:58 -07:00
Ying Wang
292a528f11 am 178b20db: am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build." 
* commit '178b20dbf4ddb3b32eb2230f41aca25c138b632f':
  Build 64-bit host tools in Linux/Mac SDK build.
 2015-08-03 18:08:54 +00:00
Daniel Rosenberg
6344247985 am 0f49fed7: am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery" 
* commit '0f49fed7cfcb08221e91f1a6a9934bfbbde970cf':
  build: core: Fix issue in recovery
 2015-08-03 18:08:53 +00:00
Daniel Rosenberg
25b1afe4a6 am 7d3ad604: am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory" 
* commit '7d3ad6040a31c417eae10e12ab990f7f628239ad':
  Add support for system images that contain the root directory
 2015-08-03 18:08:52 +00:00
Daniel Rosenberg
85e6106db7 am 68fd2113: am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image" 
* commit '68fd21137b09523ebaa3748e57d7eedd0d0ec2ef':
  Add ro.build.system_root_image
 2015-08-03 18:08:50 +00:00
Ying Wang
178b20dbf4 am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build." 
* commit 'ede3e3103565175fc15b76cd6f9daf7e2b93393b':
  Build 64-bit host tools in Linux/Mac SDK build.
 2015-08-03 18:02:04 +00:00
Daniel Rosenberg
0f49fed7cf am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery" 
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery
 2015-08-03 17:57:24 +00:00
Daniel Rosenberg
7d3ad6040a am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory" 
* commit 'b139ae078c8b2598889c2fde1a39a9d64f27dc62':
  Add support for system images that contain the root directory
 2015-08-03 17:57:23 +00:00
Daniel Rosenberg
68fd21137b am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image" 
* commit '545f226db0978639aba41f16f623a395dad4209c':
  Add ro.build.system_root_image
 2015-08-03 17:56:45 +00:00
Dianne Hackborn
bf8b57b45f am cdbcce02: (-s ours) am 969016a3: am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev 
* commit 'cdbcce029c03ee025aecb669bd99cb4eeae7cf69':
  Remove M codename, version number is 6.0.
 2015-08-01 17:52:25 +00:00