Commit graph

55602 commits

Author SHA1 Message Date
Yifan Hong
948b259b52 Partially Revert "Check VINTF compatibility at OTA generation time."
This partially reverts commit 9276cf0226.

Reason for revert: broke mixed build

Put META/{system,vendor}_{manifest,matrix}.xml back because mixed builds
needs this.

Bug: 140217956
Test: mainline builds

Change-Id: I80898a17d6b86b17114b729d905dd9ab10bc927a
2019-08-30 12:54:09 -07:00
Tao Bao
85dd2d7d6e Merge "releasetools: img_from_target_files uses zip2zip." am: f833a75283 am: bce0264348
am: 4c29efc4e7

Change-Id: Ia9954ef003c0767985d03ce935ceee31ae9042b3
2019-08-30 12:45:47 -07:00
Tao Bao
4c29efc4e7 Merge "releasetools: img_from_target_files uses zip2zip." am: f833a75283
am: bce0264348

Change-Id: Ie3c365c43aa314fa5fcc1c1aef2b28c66c823a7f
2019-08-30 12:37:43 -07:00
Tao Bao
bce0264348 Merge "releasetools: img_from_target_files uses zip2zip."
am: f833a75283

Change-Id: I1731934e5585185167db9638c7b6652871fbf913
2019-08-30 12:29:42 -07:00
Tao Bao
f833a75283 Merge "releasetools: img_from_target_files uses zip2zip." 2019-08-30 19:13:59 +00:00
Martin Stjernholm
1ebd568850 Add new ART APEX.
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: Iaf2ba03b4136482f7fc60d464d012014d58216bd
Merged-In: Iaf2ba03b4136482f7fc60d464d012014d58216bd
2019-08-30 17:47:30 +01:00
Martin Stjernholm
b324175118 Update dexpreopt for the ART APEX name change.
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: I130eaa6126d347bd1010c02b4f353b9e9b15ef84
Merged-In: I130eaa6126d347bd1010c02b4f353b9e9b15ef84
2019-08-30 17:47:30 +01:00
Juju Sung
2e585b01d4 Merge "Remove extra brackets in vndk_packages collecting phase" am: 8f4f97da3f am: dd173ae513
am: 682c22ef3a

Change-Id: I29d237b73309eff9ddcca145a561c66946da498c
2019-08-29 23:23:49 -07:00
Juju Sung
682c22ef3a Merge "Remove extra brackets in vndk_packages collecting phase" am: 8f4f97da3f
am: dd173ae513

Change-Id: Ibdf8473deba3b5dda69dbae62cdad0e8e3946e7c
2019-08-29 23:16:47 -07:00
Juju Sung
dd173ae513 Merge "Remove extra brackets in vndk_packages collecting phase"
am: 8f4f97da3f

Change-Id: Ic9d43bf388799d22395a5cc3c3f9a78cfaf700d5
2019-08-29 23:09:44 -07:00
Treehugger Robot
8f4f97da3f Merge "Remove extra brackets in vndk_packages collecting phase" 2019-08-30 03:53:35 +00:00
Juju Sung
3021218d2a Remove extra brackets in vndk_packages collecting phase
Built target with syntax error near unexpected token `llndk.libraries.txt'
Unpaired brackets makes syntax error in collecting vndk_packages.

Test: build&flashed
Bug: 140097958
Change-Id: I65683a1fc3e7d2f1c8e4eeb471b23620d48c7c41
2019-08-30 09:59:51 +09:00
Tianjie Xu
77cde316da Merge "Add a new flag "--disable_fec_computation" for OTA generation" am: 9c9993c706 am: 8b106fd2bc
am: d4495d3077

Change-Id: I7c0167cfdac248012903857b5ef806d76ed44350
2019-08-29 13:49:54 -07:00
Tianjie Xu
d4495d3077 Merge "Add a new flag "--disable_fec_computation" for OTA generation" am: 9c9993c706
am: 8b106fd2bc

Change-Id: Id5d0d95ab8b85de4d9649357372ce8a89e946880
2019-08-29 13:33:45 -07:00
Tianjie Xu
8b106fd2bc Merge "Add a new flag "--disable_fec_computation" for OTA generation"
am: 9c9993c706

Change-Id: Ic077215542e20c2bc9fbaaaa2fa602f15d3f4a87
2019-08-29 13:27:20 -07:00
Tianjie Xu
9c9993c706 Merge "Add a new flag "--disable_fec_computation" for OTA generation" 2019-08-29 20:05:41 +00:00
Tianjie Xu
1b07983c6d Add a new flag "--disable_fec_computation" for OTA generation
We have added the flag to disable on device fec computation in
brillo_update_payload. Exposed it in ota_from_target_files as well.

Bug: 139723500
Test: generate an incremental package with the new flag
Change-Id: I683e3ec7791963a3c7e141ecb4e5a3fb53fe2108
2019-08-28 21:38:05 -07:00
Yifan Hong
6c29d055e0 Merge changes from topic "vintf_ota_delete" am: bcba1cfdaf am: ee276acce8
am: ba0aefb056

Change-Id: I26a3444a9f1d5a65dd84b10a0611ecdc9fa0ad7e
2019-08-28 18:28:27 -07:00
Yifan Hong
4ad3c3a84a Check VINTF compatibility at OTA generation time. am: 9276cf0226 am: a592de9c61
am: 3056fb5243

Change-Id: I0e0dcb1c7eeb20620c3e3be06610b040275f3bfe
2019-08-28 18:28:22 -07:00
Yifan Hong
b49aeb87ab releasetools: add tests for check_target_files_vintf am: ccb86fe7d4 am: 96961bf94f
am: f1bcdf5390

Change-Id: I4eecc24ec942d1da5dc75448db8eb54b3726ebf4
2019-08-28 18:28:16 -07:00
Yifan Hong
e08f6afcf9 Add a script to check VINTF compat of target files package. am: e3ba82cff2 am: d14a6110c5
am: 646b2b6cbc

Change-Id: Ida489ff65382846ce4c465a844dc2aa6a552415c
2019-08-28 18:28:10 -07:00
Ivan Lozano
8b373f1aeb Merge "Make support for rust modules from Soong." am: e9cb5fa350 am: a9fef4a0c7
am: 549416c2df

Change-Id: I3e9e56e46eebf2f5d162881e397c4aa666c16df1
2019-08-28 18:15:14 -07:00
Yifan Hong
ba0aefb056 Merge changes from topic "vintf_ota_delete" am: bcba1cfdaf
am: ee276acce8

Change-Id: I485f4e9fd4e2372da0d5ccef09c29fb44e48a5bd
2019-08-28 18:02:44 -07:00
Yifan Hong
3056fb5243 Check VINTF compatibility at OTA generation time. am: 9276cf0226
am: a592de9c61

Change-Id: Icb05c6b94103fb0eb07a5085435e0f01ca5a3419
2019-08-28 18:02:36 -07:00
Yifan Hong
f1bcdf5390 releasetools: add tests for check_target_files_vintf am: ccb86fe7d4
am: 96961bf94f

Change-Id: I71461cb81b58bb3c415dcf7b870b6d7cc66fb745
2019-08-28 18:02:30 -07:00
Yifan Hong
646b2b6cbc Add a script to check VINTF compat of target files package. am: e3ba82cff2
am: d14a6110c5

Change-Id: I78b0542099e1e291b39368e89b951b3480b846c4
2019-08-28 18:02:25 -07:00
Ivan Lozano
549416c2df Merge "Make support for rust modules from Soong." am: e9cb5fa350
am: a9fef4a0c7

Change-Id: I40353b5a4f0512fff6a3f943f1a1eff9298cbc9e
2019-08-28 17:56:43 -07:00
Yifan Hong
ee276acce8 Merge changes from topic "vintf_ota_delete"
am: bcba1cfdaf

Change-Id: If11df7c409b9d1087defc119bf3a132f5b7016c5
2019-08-28 17:21:36 -07:00
Yifan Hong
a592de9c61 Check VINTF compatibility at OTA generation time.
am: 9276cf0226

Change-Id: Iee0efa785ccbf2aaadb1be7b3dc106f805242adb
2019-08-28 17:21:27 -07:00
Yifan Hong
96961bf94f releasetools: add tests for check_target_files_vintf
am: ccb86fe7d4

Change-Id: I3ecddd78ccce7f97bd02abea133ad84187b312ac
2019-08-28 17:21:07 -07:00
Yifan Hong
d14a6110c5 Add a script to check VINTF compat of target files package.
am: e3ba82cff2

Change-Id: Iccf4b7afa93749f441f48a3270f3d4beac8a0f06
2019-08-28 17:20:52 -07:00
Ivan Lozano
a9fef4a0c7 Merge "Make support for rust modules from Soong."
am: e9cb5fa350

Change-Id: I9e109fe46ed9532cc445522a381a9016a86d37f3
2019-08-28 17:07:48 -07:00
Tao Bao
57f8ed6b5e releasetools: img_from_target_files uses zip2zip.
Test: Build the following targets and check the built image archive.
      bonito-userdebug (contains flashable images);
      cf_x86_phone-userdebug (contains super.img);
      aosp_arm64-eng (contains VerifiedBootParams.textproto)
Test: m -j otatools-package; Check that zip2zip is included; Use
      bin/img_from_target_files to generate image archive.
Change-Id: I9f28765bd702849f0df309faebd6aa3072920536
2019-08-28 16:36:25 -07:00
Yifan Hong
bcba1cfdaf Merge changes from topic "vintf_ota_delete"
* changes:
  merge_target_files: Checks VINTF metadata of resulting target files
  Check VINTF compatibility at OTA generation time.
  releasetools: add tests for check_target_files_vintf
  Add a script to check VINTF compat of target files package.
2019-08-28 23:19:21 +00:00
Ivan Lozano
e9cb5fa350 Merge "Make support for rust modules from Soong." 2019-08-28 22:04:56 +00:00
Yifan Hong
9276cf0226 Check VINTF compatibility at OTA generation time.
Instead of relying on META/{system,vendor}_{manifest,matrix}.xml
and blindly copy compatibility.zip from target files package to
OTA package, do a static check on the input target files package
before generating the OTA package.

META/{system,vendor}_{manifest,matrix} does not contain ODM manifest
fragments, which is incorrect.

Also, the on-device check of compatibility.zip uses a old libvintf
binary on the device, which may not understand the incoming VINTF
metadata. This change removes the on-device check. Hence, it removes
the requirement of forwards compatibility of libvintf.

This behavior can be skipped with --skip-compatibility-check.

Test: build OTA package
Bug: 139300422
Bug: 131425279
Change-Id: I7fb93be9eb73f578fc05a182c6c9d1f073db2800
2019-08-28 11:02:26 -07:00
Yifan Hong
ccb86fe7d4 releasetools: add tests for check_target_files_vintf
Test: run it
Bug: 139300422
Change-Id: I265d1e6313177dc661bb5cdf1415b11684dec0a0
2019-08-28 11:02:26 -07:00
Yifan Hong
e3ba82cff2 Add a script to check VINTF compat of target files package.
Instead of checking META/{system,vendor}_{manifest,matrix}.xml (which
is error-prone because ODM SKU-specific manifests are not checked),
this script read the target files package, remaps its directory
structure so that checkvintf understands it, and check VINTF
compatibility.

Also, put it in otatools.zip.

Test: run it on an extracted target files package
Bug: 131425279
Change-Id: I06036f9a8d7242d4bc11524028be40e780c508e8
2019-08-28 11:02:26 -07:00
Yifan Hong
ade0d3f4a2 merge_target_files: Checks VINTF metadata of resulting target files
Bug: 139300422
Bug: 131425279
Test: test_merge_target_files
Change-Id: I972db2fc40555ab0fc38316f0a6e6f5e8f163371
2019-08-28 11:02:26 -07:00
Justin Yun
1f70b3140a Merge "Add platform hidl interfaces to mainline_system" am: 6ae3aacab5 am: ebe02d5fef
am: 2d2de1660b

Change-Id: I7de09ff2777e2f6913c364bc70d6dd373ef2dda6
2019-08-27 21:13:15 -07:00
Justin Yun
2d2de1660b Merge "Add platform hidl interfaces to mainline_system" am: 6ae3aacab5
am: ebe02d5fef

Change-Id: I00eb9f276462da48c284377b7192519f4007c852
2019-08-27 21:07:14 -07:00
Justin Yun
ebe02d5fef Merge "Add platform hidl interfaces to mainline_system"
am: 6ae3aacab5

Change-Id: I9f03d3bd011127fd80ca126533d5664ebfd68edf
2019-08-27 20:52:14 -07:00
Treehugger Robot
6ae3aacab5 Merge "Add platform hidl interfaces to mainline_system" 2019-08-28 03:32:08 +00:00
Justin Yun
bfe4a1c096 Add platform hidl interfaces to mainline_system
Core variant of some hidl interfaces must be included in
mainline_system explicitly because they have dependency with external
modules.

Bug: 138284120
Test: build mainline_system_arm64
Change-Id: I1893bb807429dbcacac3db3dcab2a830456775ea
2019-08-28 03:31:48 +00:00
Ramy Medhat
793153f2ee Merge "Add PWD to environment variable whitelist for RBE builds." am: 61fae1ac20 am: bc2aa08ca5
am: 0cefcefbcc

Change-Id: I785d4580a8711670e1cba15157b64db937eb441d
2019-08-27 19:24:51 -07:00
Ramy Medhat
0cefcefbcc Merge "Add PWD to environment variable whitelist for RBE builds." am: 61fae1ac20
am: bc2aa08ca5

Change-Id: I1cf51caf2a6a54e9ffb1a522bc4e1fc03ba16a63
2019-08-27 19:18:48 -07:00
Ramy Medhat
bc2aa08ca5 Merge "Add PWD to environment variable whitelist for RBE builds."
am: 61fae1ac20

Change-Id: I31125dd51cb0e1d3ad43a7fcb76c7108538ed71d
2019-08-27 19:11:53 -07:00
Ramy Medhat
61fae1ac20 Merge "Add PWD to environment variable whitelist for RBE builds." 2019-08-28 01:58:08 +00:00
Dan Willemsen
853699c6d6 Merge "More base_rules.mk optimizations" am: 07c9ac0e2a am: bd49363d31
am: 7996f0610a

Change-Id: I1c99eb92c8a4f9ed8cce9b00e043c402b28dae29
2019-08-27 17:48:09 -07:00
Xianyuan Jia
217e06aaa5 Merge "Add iperf3 to debug packages" am: d1f4c15fd2 am: 7e36d3d0b6
am: 7db82e5ae1

Change-Id: Ie5a5dcb79c682275560cebd39e804bf0e3109011
2019-08-27 17:44:33 -07:00