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

23869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
e7a4b429d2 am 03125de6: am c8812493: Merge "Pack file_contexts into target_files zip." 
* commit '03125de6b57fc358e14cbcd1798cdf9d3289b72f':
  Pack file_contexts into target_files zip.
 2015-07-10 21:56:02 +00:00
Tao Bao
03125de6b5 am c8812493: Merge "Pack file_contexts into target_files zip." 
* commit 'c881249354d9a847b09d314fd1a64bbab122f0fa':
  Pack file_contexts into target_files zip.
 2015-07-10 21:41:12 +00:00
Tao Bao
c881249354 Merge "Pack file_contexts into target_files zip." 2015-07-10 21:21:54 +00:00
Tao Bao
2c15d9eefe Pack file_contexts into target_files zip. 
file_contexts (specified by SELINUX_FC) is needed both when building
and (re)packaging. We used to use the copy in out/ when building, and
looked for the copy in BOOT/RAMDISK/ when packaging from target_files
zip. With system_root_image enabled, the file_contexts needed for
building and packaging might be different from the one on device. So
we explicitly pack the file as META/file_contexts in target_files zip.

Also refactor out the overriding of selinux_fc property into
common.LoadInfoDict().

Change-Id: I94f9ea6671b3792c12c1c21573840743d63da39a
(cherry picked from commit aa7318c384)
 2015-07-10 14:21:16 -07:00
Tao Bao
0d14a397db am 46b1b205: am da724f7a: Merge "Zero out blocks that may be touched by dm-verity." 
* commit '46b1b2057d5700a03b3fa6e332a737a0ef2425ba':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 21:15:34 +00:00
Tao Bao
46b1b2057d am da724f7a: Merge "Zero out blocks that may be touched by dm-verity." 
* commit 'da724f7a630abc122f8eae042264ee81cf1450c4':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 21:01:54 +00:00
Tao Bao
89832b36af am 7f8ecb7f: Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev 
* commit '7f8ecb7f5c21630a75c69d170ba2b401d7a311a5':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 20:55:39 +00:00
Tao Bao
da724f7a63 Merge "Zero out blocks that may be touched by dm-verity." 2015-07-10 20:51:34 +00:00
Tao Bao
e9b619108d Zero out blocks that may be touched by dm-verity. 
dm-verity may touch some blocks that are not in the care_map due to
block device read-ahead. It will fail if such blocks contain
non-zeroes. As a workaround, we mark them as extended blocks and
zero out explicitly to avoid dm-verity failures.

Bug: 20881595
Change-Id: Id097138bfd065c84eac088b3ad49758010b2927b
(cherry picked from commit 2fd2c9bfd6)
 2015-07-10 13:50:24 -07:00
Tao Bao
7f8ecb7f5c Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev 2015-07-10 20:44:25 +00:00
Tao Bao
2fd2c9bfd6 Zero out blocks that may be touched by dm-verity. 
dm-verity may touch some blocks that are not in the care_map due to
block device read-ahead. It will fail if such blocks contain
non-zeroes. As a workaround, we mark them as extended blocks and
zero out explicitly to avoid dm-verity failures.

Bug: 20881595
Change-Id: I54e24e70ad822c0d6d7af43301f74d24505f4461
 2015-07-10 12:16:56 -07:00
Thierry Strudel
f4e503774e am 74a81e66: fix device specific fs_config on build server 
* commit '74a81e6633276d92337749a5ee9d921207814dd4':
  fix device specific fs_config on build server
 2015-07-10 18:44:53 +00:00
Thierry Strudel
74a81e6633 fix device specific fs_config on build server 
fs_config function from libcutils, in order to properly set the xattr FS
used to define device specific uid, gid, permissions and capabilities,
now needs TARGET_OUT make variable to be passed explicitly to all tools
using it:
  fs_config
  fs_get_stats used by mktarball.sh
  make_ext4fs used by mkuserimg.sh
  mksquashfs used by mksquashfsimage.sh

Bug: 21989305
Bug: 22048934
Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
Signed-off-by: Thierry Strudel <tstrudel@google.com>
 2015-07-10 10:55:54 -07:00
Elliott Hughes
32fd6c9a03 am b211c8cf: am 76eaa968: Merge "Remove HAVE_WIN32_IPC." 
* commit 'b211c8cf0994992f521f3406c3a173f64bf4fe0a':
  Remove HAVE_WIN32_IPC.
 2015-07-09 18:39:25 +00:00
Elliott Hughes
b211c8cf09 am 76eaa968: Merge "Remove HAVE_WIN32_IPC." 
* commit '76eaa96875d5aac8d5141095e9e345a9ff84d814':
  Remove HAVE_WIN32_IPC.
 2015-07-09 17:50:52 +00:00
Elliott Hughes
76eaa96875 Merge "Remove HAVE_WIN32_IPC." 2015-07-09 17:30:16 +00:00
Elliott Hughes
ba2f676410 Remove HAVE_WIN32_IPC. 
Change-Id: I6c01ed5b059c230d7382dc6158103f31d4bf9dbb
 2015-07-09 10:20:13 -07:00
Elliott Hughes
ab944482b8 am 9ba0796e: am 60dda9c4: Merge "Remove mkbootimg from the pathmap." 
* commit '9ba0796e37f38b40eb2182c2d277a2b272169342':
  Remove mkbootimg from the pathmap.
 2015-07-08 23:41:35 +00:00
Elliott Hughes
b9bdda3aff am 7a4a9296: am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h." 
* commit '7a4a9296217932e78e9c7260167ac968ef86baf8':
  Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
 2015-07-08 23:41:34 +00:00
Elliott Hughes
9ba0796e37 am 60dda9c4: Merge "Remove mkbootimg from the pathmap." 
* commit '60dda9c44dfef577d8f95784c1554696882d83f7':
  Remove mkbootimg from the pathmap.
 2015-07-08 23:22:45 +00:00
Elliott Hughes
7a4a929621 am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h." 
* commit 'fd5692b32c88306cfc800bdffb10a277d9cb080a':
  Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
 2015-07-08 23:22:44 +00:00
Elliott Hughes
60dda9c44d Merge "Remove mkbootimg from the pathmap." 2015-07-08 23:13:32 +00:00
Elliott Hughes
fd5692b32c Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h." 2015-07-08 23:11:18 +00:00
Elliott Hughes
3d949bbabc Remove mkbootimg from the pathmap. 
It's only ever referred to directly. (Should probably move to
system/core/include, but that's orthogonal to this change.)

Change-Id: I353afff031a29206aaa5a0991fe0ccb39e4731e2
 2015-07-08 16:05:17 -07:00
Elliott Hughes
b6e9ed6f2b am a78f5557: am 8f548f35: Merge "Remove pathmap.mk entries for libc." 
* commit 'a78f5557709ec7a2b9b1bf598b0b401a5b50e6ef':
  Remove pathmap.mk entries for libc.
 2015-07-08 21:49:40 +00:00
Elliott Hughes
a78f555770 am 8f548f35: Merge "Remove pathmap.mk entries for libc." 
* commit '8f548f35d6c01c9dea76da885165e40aa10151f9':
  Remove pathmap.mk entries for libc.
 2015-07-08 21:34:53 +00:00
Elliott Hughes
8f548f35d6 Merge "Remove pathmap.mk entries for libc." 2015-07-08 21:19:59 +00:00
Elliott Hughes
b248bf85ae Remove pathmap.mk entries for libc. 
Change-Id: I9f4ce70696dd7df5922b3c80501fac9c7d4b7149
 2015-07-08 14:10:23 -07:00
Elliott Hughes
5dbf4eab72 Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h. 
Change-Id: If1cd88ee14bf9cbb4a0a1f608b0d015c9181c2c2
 2015-07-08 13:12:38 -07:00
Tao Bao
d94525ca52 am 74008203: am e246964b: Merge "Scan all init.*.rc files for flash_recovery service." 
* commit '7400820330b39bc5d044c6f9c46d06a7650c83f1':
  Scan all init.*.rc files for flash_recovery service.
 2015-07-08 17:51:34 +00:00
Tao Bao
7400820330 am e246964b: Merge "Scan all init.*.rc files for flash_recovery service." 
* commit 'e246964b8f73056015379ff37ff746f549c0f20d':
  Scan all init.*.rc files for flash_recovery service.
 2015-07-08 17:39:02 +00:00
Tao Bao
e246964b8f Merge "Scan all init.*.rc files for flash_recovery service." 2015-07-08 17:22:36 +00:00
Tao Bao
9f0c8dfaf1 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: Icad3497d1663e074b938919b40fc239c84fbeb2b
(cherry picked from commit 610754e5ad)
 2015-07-08 10:20:39 -07:00
Dirk Dougherty
5d3e2da94f am 26b3ec5a: am 0da02191: am aee6585c: Update js/css versions and add pt-br. 
* commit '26b3ec5a689f187b3174d1f774d40d879730b729':
  Update js/css versions and add pt-br.
 2015-07-08 11:58:47 +00: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
49801ef8c2 am bb18cb1a: am 4187cee6: am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string). 
* commit 'bb18cb1a0ca335d9bb52bb7b589945a1027cc6cf':
  Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
 2015-07-08 11:38:23 +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
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