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

23828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
e9c462b00a am 1747e35a: am a0021026: Merge "fix up ota_from_target_files symlink detection." 
* commit '1747e35a090cff66b117128c7bffd2e8b5050f37':
  fix up ota_from_target_files symlink detection.
 2015-07-07 17:18:59 +00:00
Tao Bao
1747e35a09 am a0021026: Merge "fix up ota_from_target_files symlink detection." 
* commit 'a00210263efdce91c8035e34e062c67e8828c4a5':
  fix up ota_from_target_files symlink detection.
 2015-07-07 17:02:47 +00:00
Tao Bao
a00210263e Merge "fix up ota_from_target_files symlink detection." 2015-07-07 16:48:51 +00:00
Ying Wang
2ffb3147bc fix up ota_from_target_files symlink detection. 
Change-Id: I10b668096d4e61e75473dd805f96387049f29b79
 2015-07-06 14:02:01 -07:00
Tao Bao
c607474ec2 am 11d4406e: am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property." 
* commit '11d4406eb9796819baeafda3142b16f9cc63d532':
  Fix OTA scripts to generate incremental BBOTA with OEM property.
 2015-07-06 16:49:18 +00:00
Tao Bao
11d4406eb9 am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property." 
* commit '48a27bcbb15774d0360fa344420a53cc72cd6708':
  Fix OTA scripts to generate incremental BBOTA with OEM property.
 2015-07-06 16:40:49 +00:00
Tao Bao
48a27bcbb1 Merge "Fix OTA scripts to generate incremental BBOTA with OEM property." 2015-07-06 16:31:51 +00:00
dcashman
e7733e55f6 am 2a3a2dc3: Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev 
* commit '2a3a2dc33c7e5cbd9da95ece2eec0c100e9fbc14':
  Allow init to create /mnt/sdcard symlink.
 2015-07-06 16:06:06 +00:00
dcashman
2a3a2dc33c Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev 2015-07-06 15:51:07 +00:00
Tao Bao
3806c231a9 Fix OTA scripts to generate incremental BBOTA with OEM property. 
Bug: 21803136
Change-Id: I3a45e8aea0b4f4f4f2acb4c9c8a7fad7a014680c
 2015-07-05 21:08:33 -07:00
Ying Wang
1f59fcb23d am 8f908ade: am 2e26f896: Merge "Simplify LOCAL_NO_CRT." 
* commit '8f908ade58fd21d5bb27b7a42f8f07553c237df6':
  Simplify LOCAL_NO_CRT.
 2015-07-04 02:58:23 +00:00
Elliott Hughes
a02bca2e7a am b661c37f: am cd26a2dd: Merge "Remove HAVE_STDINT_H namespace pollution." 
* commit 'b661c37f4dad27b1917c99eac3220a2a4057565d':
  Remove HAVE_STDINT_H namespace pollution.
 2015-07-04 02:58:21 +00:00
Stephen Hines
8e75fb2acb am fc493003: am b2275868: Merge "Add LOCAL_NO_LIBGCC." 
* commit 'fc4930034fc2694decc264ba2d217ab60e50d182':
  Add LOCAL_NO_LIBGCC.
 2015-07-04 02:58:18 +00:00
Chris Elliott
80a863d02b am a80307b8: 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 'a80307b88efe12f5f604d9657ade824f83b69c20':
  DO NOT MERGE Fix the syntax error in the edify script generator
 2015-07-02 23:12:39 +00:00
Ying Wang
8f908ade58 am 2e26f896: Merge "Simplify LOCAL_NO_CRT." 
* commit '2e26f896a65563f750f2d459d13cc8edfa705d95':
  Simplify LOCAL_NO_CRT.
 2015-07-02 23:06:54 +00:00
Ying Wang
2e26f896a6 Merge "Simplify LOCAL_NO_CRT." 2015-07-02 22:59:38 +00:00
Ying Wang
491fca9809 Simplify LOCAL_NO_CRT. 
Change-Id: If2486e4861071df6b225fe7f387530a38f554484
 2015-07-02 15:58:34 -07: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
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
Elliott Hughes
b661c37f4d am cd26a2dd: Merge "Remove HAVE_STDINT_H namespace pollution." 
* commit 'cd26a2dd7e2be499c9eb8b3e907cb3d31b1ed5be':
  Remove HAVE_STDINT_H namespace pollution.
 2015-07-02 18:58:41 +00:00
Elliott Hughes
cd26a2dd7e Merge "Remove HAVE_STDINT_H namespace pollution." 2015-07-02 18:50:26 +00:00
Stephen Hines
fc4930034f am b2275868: Merge "Add LOCAL_NO_LIBGCC." 
* commit 'b2275868e15caef2a04f0530749cc06415ef10f6':
  Add LOCAL_NO_LIBGCC.
 2015-07-02 18:45:45 +00:00
Stephen Hines
b2275868e1 Merge "Add LOCAL_NO_LIBGCC." 2015-07-02 18:38:32 +00:00
Ying Wang
75011b2003 Add LOCAL_NO_LIBGCC. 
This can be used to compile independent libraries without the need for
libgcc.a.

Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
 2015-07-02 11:05:27 -07:00
Elliott Hughes
d47e01a3a1 Remove HAVE_STDINT_H namespace pollution. 
Change-Id: I1e42d1616da0f3a90f8da189d2e919f781c4eb5a
 2015-07-02 10:26:53 -07:00
Ying Wang
91a38d07d0 am 68787b3d: am bbaeaa58: Merge "Configure synci generation explicitly" 
* commit '68787b3d1e0b230f3fd812759be03736f73daaf4':
  Configure synci generation explicitly
 2015-07-02 06:39:10 +00:00
Tao Bao
26c9a7a7f9 am 414b80e1: am 41bcf3e4: (-s ours) Fix build. 
* commit '414b80e17e6e5c5f90ddd00131987f4a860b8d69':
  Fix build.
 2015-07-02 03:52:34 +00: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
4d19bf0fd1 am 94a52c36: am 608d9d24: (-s ours) am 1aa1af0e: sparse_img.py: Don\'t write empty map groups. 
* commit '94a52c3609c04fa94027597ec29f6382a433594e':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 02:25:03 +00:00
Simon Wilson
83c0b2425a am 3ea36f4f: am e416a41f: (-s ours) am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups." 
* commit '3ea36f4fd2861b4e0cc4424db69ab5714a876a9f':
  Revert "sparse_img.py: Don't write empty map groups."
 2015-07-02 02:25:02 +00:00
Tao Bao
43bf14d27f am 8bd72025: resolved conflicts for merge of 8787cd6d to mnc-dev 
* commit '8bd720257eeaf9bf28b2dc8a36b856ccc30b1e8c':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 02:18:36 +00: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
Ying Wang
68787b3d1e am bbaeaa58: Merge "Configure synci generation explicitly" 
* commit 'bbaeaa5879c5ab380c024bd20f35e927f4d19c87':
  Configure synci generation explicitly
 2015-07-02 00:38:53 +00:00
Ying Wang
bbaeaa5879 Merge "Configure synci generation explicitly" 2015-07-01 18:58:52 +00: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
Evgenii Stepanov
ff57fb45c7 am be8dd615: am 473dfdf7: Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)." 
* commit 'be8dd6154b021b78422df44c4a7841899cc24866':
  Move sanitized vendor libraries to /data/vendor/lib(|64).
 2015-06-30 22:02:47 +00:00
Evgenii Stepanov
be8dd6154b am 473dfdf7: Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)." 
* commit '473dfdf71b984fb04ae8f60b8941d89ef5c76710':
  Move sanitized vendor libraries to /data/vendor/lib(|64).
 2015-06-30 21:48:40 +00:00
Evgenii Stepanov
473dfdf71b Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)." 2015-06-30 21:30:29 +00:00
Tao Bao
ce3bf9894b resolved conflicts for merge of 54120079 to mnc-dev-plus-aosp 
Change-Id: I48787655f304079970b2a6e8f61d0c48431994a0
 2015-06-30 14:05:12 -07:00