StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,302 Commits 1 Branch 0 Tags
38a534b6939630039d0c78c2f9f20dd8fde64c85
Commit Graph

23302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
38a534b693 resolved conflicts for merge of 610754e5 to cw-e-dev 
Change-Id: Ia0d0d82c7fec86e1585a9e2c90ac877c363ed491
 2015-07-08 10:43:31 -07:00
Dirk Dougherty
26b3ec5a68 am 0da02191: am aee6585c: Update js/css versions and add pt-br. 
* commit '0da02191ccc2030a3b4ac81500fdcabb72570049':
  Update js/css versions and add pt-br.
 2015-07-08 11:44:24 +00:00
Dirk Dougherty
0da02191cc am aee6585c: Update js/css versions and add pt-br. 
* commit 'aee6585c3237b11f33b83e9dd96d93449e3e2259':
  Update js/css versions and add pt-br.
 2015-07-08 11:29:45 +00:00
Dirk Dougherty
bb18cb1a0c am 4187cee6: am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string). 
* commit '4187cee61b234a135ae2a62c876681a92e911893':
  Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
 2015-07-08 11:21:57 +00:00
Dirk Dougherty
aee6585c32 Update js/css versions and add pt-br. 
Change-Id: I0c5f8c8a3c77283e7f53d1c241d09aa39bca4292
 2015-07-08 04:12:19 -07:00
Dirk Dougherty
4187cee61b am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string). 
* commit '0b9e204df09d9630db24f61bb427110501df6743':
  Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
 2015-07-08 11:06:54 +00:00
Tao Bao
610754e5ad Scan all init.*.rc files for flash_recovery service. 
Clockwork builds may rename init.rc to init.core.rc. Change the OTA
script to scan all init.*.rc files to determine the proper location for
install-recovery.sh.

Bug: 22128990
Change-Id: If96bd0b81090683ad0bbfddb735d390204849d9f
 2015-07-07 20:52:01 -07:00
dcashman
2a3a2dc33c Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev 2015-07-06 15:51:07 +00:00
Chris Elliott
a80307b88e am a0cca8e6: (-s ours) am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev 
* commit 'a0cca8e66ac124c5d78fe35e10ece83c5314734b':
  DO NOT MERGE Fix the syntax error in the edify script generator
 2015-07-02 22:48:42 +00:00
Chris Elliott
a0cca8e66a am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev 
* commit '1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d':
  DO NOT MERGE Fix the syntax error in the edify script generator
 2015-07-02 22:36:55 +00:00
Dirk Dougherty
0b9e204df0 Support matching unicode characters in suggestions by changing match(regex) to indexOf(string). 
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2
 2015-07-02 14:21:55 -07:00
Chris Elliott
1e253e76b9 Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev 2015-07-02 20:18:35 +00:00
Tao Bao
4dacce92ce DO NOT MERGE Fix the syntax error in the edify script generator 
file_getprop() always expects two arguments.

Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
 2015-07-02 13:17:21 -07:00
Tao Bao
414b80e17e am 41bcf3e4: (-s ours) Fix build. 
* commit '41bcf3e425b9a1792b65b16b1c115b018348bde7':
  Fix build.
 2015-07-02 03:28:43 +00:00
Tao Bao
41bcf3e425 Fix build. 
Change-Id: Id3eb4821a3c3061063a00294bfa268693c773eb8
 2015-07-01 19:38:34 -07:00
Tao Bao
94a52c3609 am 608d9d24: (-s ours) am 1aa1af0e: sparse_img.py: Don\'t write empty map groups. 
* commit '608d9d2452ba547875691f4df7ba313239177395':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 02:14:36 +00:00
Simon Wilson
3ea36f4fd2 am e416a41f: (-s ours) am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups." 
* commit 'e416a41f3ae1132c0eb53d78d3d6bc60f2f0d052':
  Revert "sparse_img.py: Don't write empty map groups."
 2015-07-02 02:07:09 +00:00
Tao Bao
8bd720257e resolved conflicts for merge of 8787cd6d to mnc-dev 
Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f
 2015-07-01 18:06:33 -07:00
Tao Bao
608d9d2452 am 1aa1af0e: sparse_img.py: Don\'t write empty map groups. 
* commit '1aa1af0e997699bc025e4f0a754692068328d7e6':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 00:47:51 +00:00
Simon Wilson
e416a41f3a am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups." 
* commit '16401ad4256178fbe7a2cd8588e6dbf9a6c63180':
  Revert "sparse_img.py: Don't write empty map groups."
 2015-07-02 00:47:50 +00:00
Tao Bao
8787cd6d4e resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-dev 
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
 2015-07-01 17:44:53 -07:00
Tao Bao
1aa1af0e99 sparse_img.py: Don't write empty map groups. 
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I4a1f0105ada2e1573c3d6162457b83725e0d8971
 2015-07-01 11:24:30 -07:00
Simon Wilson
16401ad425 Revert "sparse_img.py: Don't write empty map groups." 
This reverts commit 7f9470cda3.

Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
 2015-07-01 18:10:28 +00:00
Tao Bao
7f9470cda3 sparse_img.py: Don't write empty map groups. 
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
 2015-07-01 10:10:31 -07:00
dcashman
19eeccdaf2 Allow init to create /mnt/sdcard symlink. 
Addresses the following denial:
avc:  denied  { create } for  pid=1 comm="init" name="sdcard" scontext=u:r:init:s0 tcontext=u:object_r:tmpfs:s0 tclass=lnk_file permissive=0

Bug: 22084499
Change-Id: Icffef8330d07b00f36fda11374e39e0df7181ca3
 2015-07-01 09:14:18 -07:00
Tao Bao
c7a6f1e4f8 Retry adjusting the size computation for reserved blocks. 
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
 2015-06-29 20:45:53 -07:00
Tao Bao
2384d01c1c Revert "Adjust the size computation for reserved blocks" 
We should not change the parameter to mkfs_ext4. Bug filed at
b/22174684. Will come up with a new CL.

This reverts commit efbb5d2e69.

Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
 2015-06-29 12:55:38 -07:00
Dianne Hackborn
578a9efd83 Merge "Raise API level to 23." into mnc-dev 2015-06-27 00:29:20 +00:00
Ying Wang
95a7311ac5 am 78d1cba0: (-s ours) Fix conflict resolving error in ef5dc90bba 
* commit '78d1cba0f42d023483e64d5c7b6f9e1c8b236ed4':
  Fix conflict resolving error in ef5dc90bba
 2015-06-26 23:06:46 +00:00
Dianne Hackborn
a42551685f Raise API level to 23. 
Now apps can target both MNC and 23.

Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
 2015-06-26 15:54:10 -07:00
Ying Wang
78d1cba0f4 Fix conflict resolving error in ef5dc90bba 
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
 2015-06-26 14:06:32 -07:00
Ying Wang
742f5832b1 Raise progaurd library to platform libraries even for "current" SDK. 
Without this change, if an app with "LOCAL_SDK_VERSION := current" links
against a static library that uses removed APIs, the app will fail
ProGuard processing because the removed APIs can't be found in the
current SDK. This works around the issue.

Bug: 18510449
Bug: 20667396
Change-Id: Ia6e2a81cf5ecba972d155e56238ea946f8539411
 2015-06-26 19:37:28 +00:00
Mohamad Ayyash
aae1a0ba48 resolved conflicts for merge of 1a4658cd to mnc-dev 2015-06-25 17:24:05 -07:00
Mohamad Ayyash
1a4658cd3b resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-dev 2015-06-24 16:54:12 -07:00
Mohamad Ayyash
4f177cc6e9 am 48cb24a6: am 648e40e8: build_image.py: Make sparse squashfs images 
* commit '48cb24a655b58c3b2147f120223627a357ad6372':
  build_image.py: Make sparse squashfs images
 2015-06-24 23:16:18 +00:00
Mohamad Ayyash
07a7590f08 Merge "build_image.py: Make sparse squashfs images" into mnc-dev 2015-06-24 23:15:56 +00:00
Simon Wilson
b7b7aedeb3 Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev 2015-06-24 23:14:07 +00:00
Mohamad Ayyash
914811a9f2 Merge "Add img2simg in host and ota packages" into mnc-dev 2015-06-24 23:13:51 +00:00
Mohamad Ayyash
ef5dc90bba Add img2simg in host and ota packages 
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2015-06-24 16:13:07 -07:00
Simon Wilson
6d5ddc32ab resolved conflicts for merge of ecfc97f7 to mnc-dev 
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
 2015-06-24 16:06:34 -07:00
Mohamad Ayyash
353265b081 Add img2simg in host and ota packages 
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2015-06-24 23:01:27 +00:00
Mohamad Ayyash
48cb24a655 am 648e40e8: build_image.py: Make sparse squashfs images 
* commit '648e40e8660135f37adad5981a48250476c2f3fd':
  build_image.py: Make sparse squashfs images
 2015-06-24 22:52:10 +00:00
Simon Wilson
ecfc97f772 resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev 
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
 2015-06-24 15:42:27 -07:00
Mohamad Ayyash
4826dee78d am 9ca7fa89: resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev 
* commit '9ca7fa8993bceb97a6256b60742eeda2f699560b':
  common.py: Add support for squashfs
 2015-06-24 22:26:02 +00:00
Mohamad Ayyash
9ca7fa8993 resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev 2015-06-24 15:04:38 -07:00
Adam Powell
30638322e7 Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev 2015-06-24 20:32:15 +00:00
Adam Powell
0cf80f3ab8 Bump PLATFORM_PREVIEW_SDK_VERSION to 2 
Change-Id: I6633e0077a6a89ef737d7c4b686aab033d94c41b
 2015-06-24 13:04:22 -07:00
Mohamad Ayyash
648e40e866 build_image.py: Make sparse squashfs images 
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2015-06-24 10:54:16 -07:00
Mohamad Ayyash
fa6c8a9b79 build_image.py: Make sparse squashfs images 
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2015-06-24 10:44:52 -07:00
Michael Wright
7371a7a5b5 Add hid command to base build 
Bug: 21662862
Change-Id: I11ed67b8f0efd1232ddfbb6e0a5f4bdbb065397e
 2015-06-24 15:55:47 +01:00