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

24096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
aa7318c384 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: I0781a147319148c76d989d8f29d5ef766a502dbd
 2015-07-10 10:22:47 -07:00
Tao Bao
85a26d5a61 am dc48635b: am 1747e35a: am a0021026: Merge "fix up ota_from_target_files symlink detection." 
* commit 'dc48635b1678f74db509dc1c0142d5a5cc8df24d':
  fix up ota_from_target_files symlink detection.
 2015-07-07 17:31:17 +00:00
Tao Bao
dc48635b16 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:17:57 +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
553a9e9292 am 9b1a9ec5: am 11d4406e: am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property." 
* commit '9b1a9ec53f35836f5cc68d2a6eba90ce5ccdc3e3':
  Fix OTA scripts to generate incremental BBOTA with OEM property.
 2015-07-06 16:55:07 +00:00
dcashman
0ffa763c41 am 2a50b9b0: am 2a3a2dc3: Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev 
* commit '2a50b9b006b7d0a80ad75635e2709859c72070c6':
  Allow init to create /mnt/sdcard symlink.
 2015-07-06 16:55:06 +00:00
Tao Bao
9b1a9ec53f 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:06 +00:00
dcashman
2a50b9b006 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:41:43 +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
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
ff2c91611f am 1f59fcb2: am 8f908ade: am 2e26f896: Merge "Simplify LOCAL_NO_CRT." 
* commit '1f59fcb23d5f126ce366ca540c9f3611ef77b37b':
  Simplify LOCAL_NO_CRT.
 2015-07-05 18:08:38 +00:00
Elliott Hughes
536a125a06 am a02bca2e: am b661c37f: am cd26a2dd: Merge "Remove HAVE_STDINT_H namespace pollution." 
* commit 'a02bca2e7aa73981d4fa05cd02cf2cff53651620':
  Remove HAVE_STDINT_H namespace pollution.
 2015-07-05 18:08:37 +00:00
Stephen Hines
7a021815b4 am 8e75fb2a: am fc493003: am b2275868: Merge "Add LOCAL_NO_LIBGCC." 
* commit '8e75fb2acb64c706fa5703e69778bc0ce78c9b3f':
  Add LOCAL_NO_LIBGCC.
 2015-07-05 18:08:35 +00:00
Chris Elliott
64496278af am 80a863d0: (-s ours) 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 '80a863d02bff3430fab2d359f1524d9e3b4010d4':
  DO NOT MERGE Fix the syntax error in the edify script generator
 2015-07-05 18:08:34 +00:00
Yohann Roussel
e6e9df299d Merge "Revert "Clean call-jack and its callers"" 2015-07-04 12:15:19 +00:00
Yohann Roussel
5863a7cf63 Revert "Clean call-jack and its callers" 
This reverts commit 5e50b34221.

Change-Id: Ibf76cc454994c7ad84128ac923d39794d46a04ec
 2015-07-04 12:11:09 +00:00
Ying Wang
5928326df9 am 91a38d07: am 68787b3d: am bbaeaa58: Merge "Configure synci generation explicitly" 
* commit '91a38d07d0bc04c484e4e29f8a9891ef425222ea':
  Configure synci generation explicitly
 2015-07-04 08:06:34 +00:00
Tao Bao
b62b294574 am 26c9a7a7: am 414b80e1: am 41bcf3e4: (-s ours) Fix build. 
* commit '26c9a7a7f9a81b1a85a2bc5149b7a6f137b29948':
  Fix build.
 2015-07-04 08:06:21 +00:00
Tao Bao
2b9f4aa57c am 4d19bf0f: am 94a52c36: am 608d9d24: (-s ours) am 1aa1af0e: sparse_img.py: Don\'t write empty map groups. 
* commit '4d19bf0fd10455ae2b7751e3d0c24c9cd3d0c2a0':
  sparse_img.py: Don't write empty map groups.
 2015-07-04 08:05:39 +00:00
Simon Wilson
5fef54b31f am 83c0b242: am 3ea36f4f: am e416a41f: (-s ours) am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups." 
* commit '83c0b2425a4270265252d33e8ca23a1727ace3c0':
  Revert "sparse_img.py: Don't write empty map groups."
 2015-07-04 08:05:38 +00:00
Tao Bao
463caf7255 am 43bf14d2: am 8bd72025: resolved conflicts for merge of 8787cd6d to mnc-dev 
* commit '43bf14d27f6ec06dc4f280d53a295df9409f4ff6':
  sparse_img.py: Don't write empty map groups.
 2015-07-04 08:05:37 +00: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
Yohann Roussel
5e50b34221 Clean call-jack and its callers 
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.

Change-Id: I28b5f7176747853ef707b8d4055017bf60296641
 2015-07-03 11:58:38 +02: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