openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
37,513 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

37513 Commits

Author SHA1 Message Date
Tianjie Xu 9989175c0e Merge "Generate care_map.txt when AVB is enabled" am: 65b98cd3b1 am: 1e0b14eb33 
am: 72274464c4

Change-Id: I7549c4f1b66ee1bf8dfaab26e90a2022f9f19dea
 2017-06-02 18:24:35 +00:00
Tianjie Xu 72274464c4 Merge "Generate care_map.txt when AVB is enabled" am: 65b98cd3b1 
am: 1e0b14eb33

Change-Id: I08cbb2e92028131511a9740aa50c4ddaf3f9fd95
 2017-06-02 18:21:10 +00:00
Tianjie Xu 1e0b14eb33 Merge "Generate care_map.txt when AVB is enabled" 
am: 65b98cd3b1

Change-Id: I9fd14966a7264d560c940bacebe8ef5b8a4722da
 2017-06-02 18:18:09 +00:00
Tianjie Xu 65b98cd3b1 Merge "Generate care_map.txt when AVB is enabled" 2017-06-02 18:09:58 +00:00
Tianjie Xu 6b2e155ee6 Generate care_map.txt when AVB is enabled 
When AVB is enabled, generate care_map.txt and add it to the target
files. Also copy it into the OTA package where it will later be used
by the update_verifier.

Bug: 62208947
Test: \
1. Run add_img_to_target_files on the TF of a new pixel device,
and care_map.txt generates successfully.

2. Make dist in oc-dr1-release and find care_map.txt in the OTA package.

3. update_verifier succeeds in reading all the blocks on the care_map,
and fails to read out-of-bound blocks.

Change-Id: I2881711e6f87789cb7de150dbeca18b756fed68a
 2017-06-01 21:36:43 -07:00
Julius D'souza caa6d7aa1b Merge "DO NOT MERGE: Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." into cw-f-dev am: 1590301a9b am: 92aa9636ad -s ours 
am: 5f0c0da2b2  -s ours

Change-Id: I8d4afbf4f39829c7034cf4b8b11f2b48698dd8db
 2017-06-02 04:28:54 +00:00
Julius D'souza 5f0c0da2b2 Merge "DO NOT MERGE: Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." into cw-f-dev am: 1590301a9b 
am: 92aa9636ad  -s ours

Change-Id: I1dbb5a705f4aca21864c1072bd39f7924d43a4f8
 2017-06-02 04:25:01 +00:00
Julius D'souza 3ec59fa015 Merge "DO NOT MERGE: Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." into cw-f-dev am: 1590301a9b am: 92aa9636ad -s ours 
am: 5a30a841ed

Change-Id: Id8da8a652fdec6ca35db052256bc87b1a25509be
 2017-06-02 03:20:24 +00:00
Julius D'souza 5a30a841ed Merge "DO NOT MERGE: Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." into cw-f-dev am: 1590301a9b 
am: 92aa9636ad  -s ours

Change-Id: I6e01024aebefcbd46ba993dfb4290a2925080305
 2017-06-02 03:17:54 +00:00
Julius D'souza 92aa9636ad Merge "DO NOT MERGE: Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." into cw-f-dev 
am: 1590301a9b

Change-Id: I85bbf6b85c42ff3e9e69565812f8a2b8a0f41833
 2017-06-02 03:14:54 +00:00
TreeHugger Robot 1590301a9b Merge "DO NOT MERGE: Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." into cw-f-dev 2017-06-02 03:06:59 +00:00
Steven Moreland 8fb19697da Merge "Move math function definitions." am: b5e90583ef am: d1eab0ea46 
am: a2f3561259

Change-Id: I86436840a6c5877901a13384faea6e699f0edfa9
 2017-06-02 00:25:16 +00:00
Steven Moreland a2f3561259 Merge "Move math function definitions." am: b5e90583ef 
am: d1eab0ea46

Change-Id: Ibef05e7c0ffee8d02e49c2d4893b4fa28f153a2f
 2017-06-02 00:21:43 +00:00
Steven Moreland d1eab0ea46 Merge "Move math function definitions." 
am: b5e90583ef

Change-Id: I5da450082180b92cbb1028887ce6d492bdba39a0
 2017-06-02 00:18:43 +00:00
Treehugger Robot b5e90583ef Merge "Move math function definitions." 2017-06-02 00:11:04 +00:00
Dan Willemsen 9afb656369 Merge "Fix make warning/error colors on Mac" am: a46695c337 am: 6ee5e52f77 
am: c9b89ad0fe

Change-Id: I2349136dcf43dd0336bbb8638bd03eab84082f2f
 2017-06-01 08:34:58 +00:00
Dan Willemsen c9b89ad0fe Merge "Fix make warning/error colors on Mac" am: a46695c337 
am: 6ee5e52f77

Change-Id: I84a562377b14c310cd0c3259f110e82dd0fcfcca
 2017-06-01 08:32:34 +00:00
Dan Willemsen 6ee5e52f77 Merge "Fix make warning/error colors on Mac" 
am: a46695c337

Change-Id: Ia9b08f47cbe9098c262f9202465475dac4912b63
 2017-06-01 08:30:03 +00:00
Treehugger Robot a46695c337 Merge "Fix make warning/error colors on Mac" 2017-06-01 08:24:49 +00:00
Tao Bao ffa864c5ed Merge "Pack avbtool into otatools.zip." am: db5fa05429 am: 308b234593 
am: 0c2bc7a7b1

Change-Id: I1f15f62536e3030bee7fec0fdacb1ef8ee57a69e
 2017-06-01 07:30:30 +00:00
Tao Bao 0c2bc7a7b1 Merge "Pack avbtool into otatools.zip." am: db5fa05429 
am: 308b234593

Change-Id: I3c76f14de97fae8e35d713a0ea728c2d8c0ae587
 2017-06-01 07:28:33 +00:00
Tao Bao 308b234593 Merge "Pack avbtool into otatools.zip." 
am: db5fa05429

Change-Id: Iddc58c0c56b1437287e6d00d03cdbdef01f97c74
 2017-06-01 07:26:30 +00:00
Treehugger Robot db5fa05429 Merge "Pack avbtool into otatools.zip." 2017-06-01 07:19:17 +00:00
Dan Willemsen 25f2d0ded7 Fix make warning/error colors on Mac 
Apparently the default bash echo doesn't support \e even though the man
page says it does. So use \033 instead.

Test: m -j nothing on mac, get colors
Test: m -j nothing on linux, still get colors
Change-Id: I608fa87e3c28bf8f99264d39f9b250008a81235a
 2017-05-31 19:20:09 -07:00
Tao Bao 30295a396f Merge "Remove the obsolete logic in img_from_target_files.py." am: ba029141dc am: f37c956b6d 
am: 464fed4f53

Change-Id: If990a48a06ba4b48e865e4098d58fed4a074d896
 2017-05-31 23:30:59 +00:00
Tao Bao 464fed4f53 Merge "Remove the obsolete logic in img_from_target_files.py." am: ba029141dc 
am: f37c956b6d

Change-Id: Iad1c47544f82bf21297b4fdb36e983ff7a4dab38
 2017-05-31 23:24:57 +00:00
Tao Bao f37c956b6d Merge "Remove the obsolete logic in img_from_target_files.py." 
am: ba029141dc

Change-Id: Ic604d1afa537906033f2a4b59e9c0931bcaad29e
 2017-05-31 23:22:26 +00:00
Tao Bao ba029141dc Merge "Remove the obsolete logic in img_from_target_files.py." 2017-05-31 23:18:15 +00:00
Steven Moreland a64f33668e Move math function definitions. 
Created math.mk and moved all math function definitions there.
Then, included this file in config.mk. This allows the functions to be
used by whatever includes config.mk (envsetup and build).

Test: manually setting combinations of PRODUCT_SHIPPING_API_LEVEL
  and PRODUCT_FULL_TREBLE_OVERRIDE and looking at values of
  PRODUCT_FULL_TREBLE.
Bug: 62229856
Change-Id: Icdab4214a1e65ae202411613dbcb9c9ea5f43b09
 2017-05-31 20:41:49 +00:00
Tao Bao 2bb109709a Remove the obsolete logic in img_from_target_files.py. 
img_from_target_files.py used to handle the case that a given TF.zip not
containing the image entries under IMAGES/. That is only the case for
pre-Lollipop releases.

Also unzip the needed files only since we know that for sure now.

Test: img_from_target_files.py with an existing bullhead-TF.zip gives
      the same bullhead-img.zip.
Change-Id: I892379ba388df80ae63be9d3ce647fbb77fd4753
 2017-05-31 11:17:56 -07:00
Tao Bao 3cba374da2 Pack avbtool into otatools.zip. 
Also pack the test keys for easier testing.

Bug: 38315721
Test: m otatools-package and avbtool is present in otatools.zip.
Change-Id: Ieb63bf3f4bc211ef1f48ab278cb01b70845d06da
 2017-05-31 10:20:25 -07:00
Bowgo Tsai b4c268eb7b Merge "Support signing custom images with AVB HASH or AVB HASHTREE" am: fe7aeb1de7 am: 16b64cbb58 
am: 3989b738b8

Change-Id: I11393e1833db97301ffdd31ec3db0968e87c1a24
 2017-05-31 03:38:24 +00:00
Bowgo Tsai 3989b738b8 Merge "Support signing custom images with AVB HASH or AVB HASHTREE" am: fe7aeb1de7 
am: 16b64cbb58

Change-Id: I67b3fa64f13d08ee3e4232547d08f6d91e2676d7
 2017-05-31 03:33:54 +00:00
Bowgo Tsai 16b64cbb58 Merge "Support signing custom images with AVB HASH or AVB HASHTREE" 
am: fe7aeb1de7

Change-Id: I96bab62c4fa6088ba3d67376b3f7d047e4a16d59
 2017-05-31 03:28:53 +00:00
Treehugger Robot fe7aeb1de7 Merge "Support signing custom images with AVB HASH or AVB HASHTREE" 2017-05-31 03:24:25 +00:00
Tianjie Xu 9307492d4e Merge "Remove the obsolete UnpackPackageDir() in edify generator" am: f7a76f9a30 am: cb2490c645 
am: 932a9c8a61

Change-Id: I616920f452b7fda545d87dd285474f9f0acd5b14
 2017-05-31 01:25:19 +00:00
Tianjie Xu 932a9c8a61 Merge "Remove the obsolete UnpackPackageDir() in edify generator" am: f7a76f9a30 
am: cb2490c645

Change-Id: Ibfb2a433d379cf62540e09cc71d81cfdef67dbf8
 2017-05-31 01:21:15 +00:00
Tianjie Xu cb2490c645 Merge "Remove the obsolete UnpackPackageDir() in edify generator" 
am: f7a76f9a30

Change-Id: Ic7f855642457cd6cb977af73fad1ef808326d414
 2017-05-31 01:17:43 +00:00
Tianjie Xu f7a76f9a30 Merge "Remove the obsolete UnpackPackageDir() in edify generator" 2017-05-31 01:08:15 +00:00
Yueyao Zhu 99dd478b09 Merge "Makefile: support build and avb signing of dtbo img" into oc-dev 
am: 48c8af949b

Change-Id: Ia8cc33e8d7de634f80235ab5607ed10c04f368dd
 2017-05-31 01:05:43 +00:00
TreeHugger Robot 48c8af949b Merge "Makefile: support build and avb signing of dtbo img" into oc-dev 2017-05-31 00:50:37 +00:00
Tao Bao e6e6557135 Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE." am: c6ad99c926 am: f5529878f8 
am: c7b91ee05a

Change-Id: I2db86c959abd5f65b6a51b97da9f7475e9e26838
 2017-05-30 23:31:07 +00:00
Tao Bao c7b91ee05a Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE." am: c6ad99c926 
am: f5529878f8

Change-Id: Idb2cc5081903e70b9869741d8bf4bd355701631e
 2017-05-30 23:27:05 +00:00
Tao Bao f5529878f8 Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE." 
am: c6ad99c926

Change-Id: I5f65ae5cba1423cd26c078a7739b0a028ff9cc2d
 2017-05-30 23:23:36 +00:00
Treehugger Robot c6ad99c926 Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE." 2017-05-30 23:12:50 +00:00
Tianjie Xu 3a97af0ca4 Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files" am: 0996f815db am: d50b6e4cae 
am: 38800822ef

Change-Id: Ib2a237c601142fa168f0f73f6c12fd28c3ac4b79
 2017-05-30 21:02:27 +00:00
Tianjie Xu 38800822ef Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files" am: 0996f815db 
am: d50b6e4cae

Change-Id: I6be9a08f8fce371603cb41016e8ca2ed2a7baad4
 2017-05-30 20:58:55 +00:00
Tianjie Xu d50b6e4cae Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files" 
am: 0996f815db

Change-Id: I8927d4eae11d8f5f65051ae038de336a60b2d462
 2017-05-30 20:54:57 +00:00
Tianjie Xu 0996f815db Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files" 2017-05-30 20:40:19 +00:00
Jeff Gaston a236fa5d12 Merge "Add blueprint_tools as default target" am: 81787c1bbc am: 2cbed51e36 
am: 61510fa696

Change-Id: I0c368aa1a12a8c670e2a459c7c7883f733608772
 2017-05-30 19:45:52 +00:00