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

23663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dimitry Ivanov
9c836723b7 am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev 
* commit '72bced8a758a3a8427768d97e6d763f6a706d2b1':
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
 2015-06-04 20:19:49 +00:00
Dimitry Ivanov
72bced8a75 Merge changes from topic 'prebuilt-open-from-apk' into mnc-dev 
* changes:
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
 2015-06-04 18:33:00 +00:00
Claes Elgemark
d0ec665727 Add missing shared libraries to dist tools 
Add missing libraries used by e2fsck and build_verity_tree.

Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
 2015-06-04 14:31:56 +02:00
Narayan Kamath
fd0cd12ac9 am cf7fbcd0: Remove duplicate CTS tests from libcore cts packages. 
* commit 'cf7fbcd03d9f13d1c2fe6e65f02247feadec136d':
  Remove duplicate CTS tests from libcore cts packages.
 2015-06-04 11:14:40 +00:00
Narayan Kamath
cf7fbcd03d Remove duplicate CTS tests from libcore cts packages. 
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.

Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.

bug: 20862863
Change-Id: I44348052d20312d478bdbf6df0e561db63e18cd8
 2015-06-04 10:50:52 +00:00
Tao Bao
b7998ec0d5 am 726b7f33: Fix the broken signing script 
* commit '726b7f338f32ca6d18e9961b0a2da3ef385f7e34':
  Fix the broken signing script
 2015-06-04 01:34:06 +00:00
Tao Bao
726b7f338f Fix the broken signing script 
check_target_files_signatures.py was accidentally broken due to the
renaming of a variable in last commit. It escaped the checking from
pylint because it was a keyword ('all').

Bug: 21611858
Change-Id: I58c983e59c4a3e0018481d3c9ba328ed76f5c08a
 2015-06-03 17:36:12 -07:00
Yorke Lee
24deb5d08f am 05f9da8e: Merge "Add \'adb shell telecom\' command to packages list" into mnc-dev 
* commit '05f9da8e6f778c44031b957ccd2f91bde83baa6e':
  Add 'adb shell telecom' command to packages list
 2015-06-03 21:59:47 +00:00
Yorke Lee
05f9da8e6f Merge "Add 'adb shell telecom' command to packages list" into mnc-dev 2015-06-03 21:39:39 +00:00
Yorke Lee
a1e1d9cea5 Add 'adb shell telecom' command to packages list 
Change-Id: I193b54dd9f4511eb7959c5dbbf38f90267b8fcc9
 2015-06-03 13:57:33 -07:00
Mark Salyzyn
c0ba46d92e am 9f8e1e1c: goldfish: rename goldfish_logcat.te to logd.te 
* commit '9f8e1e1c7dc022600477d151e1d0341c16528012':
  goldfish: rename goldfish_logcat.te to logd.te
 2015-06-03 19:17:50 +00:00
Nick Kralevich
3125b3e973 resolved conflicts for merge of 94871b94 to mnc-dev-plus-aosp 
Bug: 19608716
Change-Id: Ic3b44e97fb8731794e5bdaf57db072640cae0737
 2015-06-03 11:55:39 -07:00
Ying Wang
25d9cff48a am 56ea339a: am 3a35aa1a: Merge "Add selinux and verity support to custom image generation." 
* commit '56ea339a6008b81f885274a6446c68dc240dafe7':
  Add selinux and verity support to custom image generation.
 2015-06-03 18:36:24 +00:00
Ying Wang
12686ae232 am abffa466: (-s ours) am b7e6e8bb: Merge "Support to configure and build multiple custom images." 
* commit 'abffa466cc4469d389da3c22ee929cd6f216887d':
  Support to configure and build multiple custom images.
 2015-06-03 18:36:23 +00:00
Mark Salyzyn
31f116de07 am 70749857: am 9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te" 
* commit '70749857595a100bf9e8f009767030812101d365':
  goldfish: rename goldfish_logcat.te to logd.te
 2015-06-03 18:36:22 +00:00
Ying Wang
9e8899c75e am 3bb1bea9: am 9fed6369: Merge "Add VeritySigner.jar to ota tools" 
* commit '3bb1bea968f4cc3754cacad1ec41ac01cc6cf259':
  Add VeritySigner.jar to ota tools
 2015-06-03 18:36:20 +00:00
Tao Bao
7cebca42e3 am 1ef34d34: am 54310d1a: Merge "Fix the wrong error message" 
* commit '1ef34d3440db524d6ea2e0a6d4e72b668765d293':
  Fix the wrong error message
 2015-06-03 18:36:17 +00:00
Luan Nguyen
30b16ac6a4 am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs 
* commit '95a1818f50c685f903635ae84076199015cc9c78':
  docs: Add styles for embedded videos to match DevSite
 2015-06-03 18:25:23 +00:00
Luan Nguyen
95a1818f50 Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs 2015-06-03 18:13:17 +00:00
Mark Salyzyn
9f8e1e1c7d goldfish: rename goldfish_logcat.te to logd.te 
(cherrypicked from commit fd8c30177c)

Bug: 19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
 2015-06-03 10:48:35 -07:00
Mark Salyzyn
94871b94ef goldfish: logcat -Q in logd domain 
Deal with a build failure in conflict with cl/152105

(cherrypicked from commit 1cc7735ffa)

Bug: 19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
 2015-06-03 10:47:34 -07:00
Mark Salyzyn
86997b8809 am defa1737: am b37ac46b: Merge "goldfish: logcat -Q in logd domain" 
* commit 'defa1737973575e3be2dce415c68c6b13fb4fbd0':
  goldfish: logcat -Q in logd domain
 2015-06-03 17:43:28 +00:00
Ying Wang
56ea339a60 am 3a35aa1a: Merge "Add selinux and verity support to custom image generation." 
* commit '3a35aa1a2c1f3af3216875dd59a5bb21629b7c7f':
  Add selinux and verity support to custom image generation.
 2015-06-03 17:11:11 +00:00
Ying Wang
abffa466cc am b7e6e8bb: Merge "Support to configure and build multiple custom images." 
* commit 'b7e6e8bb6d00dc2677b297e548aff92f97066ab5':
  Support to configure and build multiple custom images.
 2015-06-03 17:11:10 +00:00
Ying Wang
3a35aa1a2c Merge "Add selinux and verity support to custom image generation." 2015-06-03 16:59:03 +00:00
Ying Wang
b7e6e8bb6d Merge "Support to configure and build multiple custom images." 2015-06-03 16:58:47 +00:00
Luan Nguyen
94c1826a72 docs: Add styles for embedded videos to match DevSite 
Change-Id: I68cc9a7340db43fd23d7072bf867d53a2e180c4c
 2015-06-03 09:56:54 -07:00
Ying Wang
934d9b158e Add selinux and verity support to custom image generation. 
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE

Also changed the staging directory name to the mount point, like we do
for other images built by the build system.

Bug: 19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit 7d51a40295)
 2015-06-03 09:56:31 -07:00
Ying Wang
4540a85dd4 Support to configure and build multiple custom images. 
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
   PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
   Each makefile configures an image.
   For image configuration makefile foo/bar/xyz.mk, the built image
   file name
   will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
  - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
    etc.
  - CUSTOM_IMAGE_PARTITION_SIZE
  - CUSTOM_IMAGE_FILE_SYSTEM_TYPE
  - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
    accepted by BuildImage() in tools/releasetools/build_image.py.
  - CUSTOM_IMAGE_MODULES, a list of module names you want to include
    in the image; Not only the module itself will be installed to proper
    path in the image, you can also piggyback additional files/directories
    with the module's LOCAL_PICKUP_FILES.
  - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
    the image. <dest> is relativ to the root of the image.

To build all those images, run "make custom_images".

Bug: 19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit 5fcf1094f9)
 2015-06-03 09:56:29 -07:00
Mark Salyzyn
7074985759 am 9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te" 
* commit '9ec84792b8f3faad150c68909055046b3bc272c1':
  goldfish: rename goldfish_logcat.te to logd.te
 2015-06-03 16:52:50 +00:00
Ying Wang
3bb1bea968 am 9fed6369: Merge "Add VeritySigner.jar to ota tools" 
* commit '9fed6369b6ee4ad07a0313fa5321047be1d79b85':
  Add VeritySigner.jar to ota tools
 2015-06-03 16:52:49 +00:00
Mark Salyzyn
9ec84792b8 Merge "goldfish: rename goldfish_logcat.te to logd.te" 2015-06-03 16:45:26 +00:00
Ying Wang
9fed6369b6 Merge "Add VeritySigner.jar to ota tools" 2015-06-03 16:42:18 +00:00
Claes Elgemark
d53cd9b0b1 Add VeritySigner.jar to ota tools 
Used by verity_signer

Change-Id: I6e2b654144b40573c3f3c0dc0d1c943889ffcd7d
 2015-06-03 16:41:51 +00:00
Tao Bao
1ef34d3440 am 54310d1a: Merge "Fix the wrong error message" 
* commit '54310d1a0dc7a3ceaaee9f4cee7b1f8b7bfbf7de':
  Fix the wrong error message
 2015-06-03 16:40:08 +00:00
Tao Bao
54310d1a0d Merge "Fix the wrong error message" 2015-06-03 16:30:20 +00:00
Tao Bao
e7b103751c Fix the wrong error message 
apply_patch_space() checks the free space on /cache, not /system.

Change-Id: I70996d5cd5a81fe4871ee738bddb1437e8df6fb9
 2015-06-03 09:25:10 -07:00
Mark Salyzyn
defa173797 am b37ac46b: Merge "goldfish: logcat -Q in logd domain" 
* commit 'b37ac46bb40e24b1014010735abc5e63802ca3bb':
  goldfish: logcat -Q in logd domain
 2015-06-03 16:00:46 +00:00
Mark Salyzyn
fd8c30177c goldfish: rename goldfish_logcat.te to logd.te 
Bug: 19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
 2015-06-03 09:00:14 -07:00
Mark Salyzyn
b37ac46bb4 Merge "goldfish: logcat -Q in logd domain" 2015-06-03 15:47:18 +00:00
Mark Salyzyn
1cc7735ffa goldfish: logcat -Q in logd domain 
Deal with a build failure in conflict with cl/152105

Bug: 19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
 2015-06-03 07:52:21 -07:00
Claes Elgemark
ec99604b07 Strip path from verity_signer_cmd in the target-files meta data. 
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.

Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
 2015-06-03 15:09:54 +02:00
Tao Bao
26038fbb2c am 60dd04ec: Merge "Add post-install verification for BBOTAs" into mnc-dev 
* commit '60dd04ecfc94bd732c72287349f2fb910a0bbbef':
  Add post-install verification for BBOTAs
 2015-06-02 21:09:12 +00:00
Tao Bao
87742421b2 am 2e30a5e8: am 708c4623: Merge "Add post-install verification for BBOTAs" 
* commit '2e30a5e853a584b11db65c0703aff93c7f7870f8':
  Add post-install verification for BBOTAs
 2015-06-02 18:28:30 +00:00
Tao Bao
60dd04ecfc Merge "Add post-install verification for BBOTAs" into mnc-dev 2015-06-02 18:28:25 +00:00
Tao Bao
5fcaaeffc3 Add post-install verification for BBOTAs 
Similar to the assertations in file-based OTA, we perform verification
for block-based OTAs (BBOTAs) after updating a partition, for both of
the incremental and full OTAs. It increases the update time (~20s on
Nexus 6), but will capture unnoticed errors right away.

Bug: 21500869
Change-Id: I0f8b27734caaa0f41f9c1b904d55af2112784a68
(cherry picked from commit 68658c0f4f)
 2015-06-02 11:15:33 -07:00
Tao Bao
2e30a5e853 am 708c4623: Merge "Add post-install verification for BBOTAs" 
* commit '708c462311afd63592a3adcc0e47c0c850b73444':
  Add post-install verification for BBOTAs
 2015-06-02 18:14:40 +00:00
Tao Bao
708c462311 Merge "Add post-install verification for BBOTAs" 2015-06-02 18:02:28 +00:00
Yohann Roussel
16ee5345a8 am a9dd74c3: Merge "Add support for RMTYPEDEF with Jack" into mnc-dev 
* commit 'a9dd74c39515759599a3b01f7772de9f19325800':
  Add support for RMTYPEDEF with Jack
 2015-06-02 14:24:53 +00:00
Andrew Hsieh
4c0cd7534b am d760d467: Revert "Revert "Enable linker -fix-cortex-a53-843419"" 
* commit 'd760d4676bb50ce74e4cc9a2813c592c189d31c9':
  Revert "Revert "Enable linker -fix-cortex-a53-843419""
 2015-06-02 14:24:12 +00:00