Commit graph

54929 commits

Author SHA1 Message Date
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
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
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
bd49363d31 Merge "More base_rules.mk optimizations"
am: 07c9ac0e2a

Change-Id: I334b1a30f101c136c4d9deea0799379250b584c5
2019-08-27 17:13:48 -07:00
Ramy Medhat
e8de0931a1 Add PWD to environment variable whitelist for RBE builds.
Test: Build aosp with USE_RBE=1.

Change-Id: I4b51fbde330c6129654aa74f8a58dccf62cfa11d
2019-08-27 23:50:31 +00:00
Xianyuan Jia
7e36d3d0b6 Merge "Add iperf3 to debug packages"
am: d1f4c15fd2

Change-Id: Ibdd41402fcbe9d96c9e38464eb25f06ce7490f2f
2019-08-27 16:48:10 -07:00
Dan Shi
a736d4770f Merge "Instrumentation test doesn't support extra config"
am: a5c6c13623

Change-Id: I1744e945b7e2e106c4e11198c38f0dc2190c3055
2019-08-27 16:47:13 -07:00
Tao Bao
3a85b1a466 Merge "releasetools: Clean up img_from_target_files.py."
am: 1f8e8738c1

Change-Id: Ic5718fd194395f86f99da41791ed9c909f7638cd
2019-08-27 16:45:09 -07:00
Dan Willemsen
07c9ac0e2a Merge "More base_rules.mk optimizations" 2019-08-27 23:42:24 +00:00
Treehugger Robot
d1f4c15fd2 Merge "Add iperf3 to debug packages" 2019-08-27 23:17:20 +00:00
Dan Shi
a5c6c13623 Merge "Instrumentation test doesn't support extra config" 2019-08-27 23:12:23 +00:00
Tao Bao
1f8e8738c1 Merge "releasetools: Clean up img_from_target_files.py." 2019-08-27 22:33:05 +00:00
Ivan Lozano
d62e7123d8 Make support for rust modules from Soong.
Support for rust modules built in Soong.

Bug: 136189233
Test: Test module builds.
Test: crosvm builds.
Change-Id: Idf2e4a4f760cbcee1d35fe6567ef8e12d4855094
2019-08-27 11:23:35 -07:00
Dan Willemsen
6b86383c9a Merge "Improve performance (don't filter ALL_MODULES)"
am: 6cd7a09718

Change-Id: I8a6d284de11b92b557aae3b090fd012770bf7987
2019-08-27 10:24:02 -07:00
Treehugger Robot
6cd7a09718 Merge "Improve performance (don't filter ALL_MODULES)" 2019-08-27 17:02:15 +00:00
Tom Cherry
080e34e5ec Merge "Remove setting _USING_LIBCXX"
am: 04eacb384b

Change-Id: Ief1732b45ab57c839bc90f11419336dd608e509f
2019-08-27 08:18:32 -07:00
Tom Cherry
04eacb384b Merge "Remove setting _USING_LIBCXX" 2019-08-27 15:10:27 +00:00
Tom Cherry
3c7212fdfb Merge "Fix host-init-verifier regression"
am: 8c116d8616

Change-Id: I5c8c4126071d2470f98ded240a8d09fcd3244e21
2019-08-27 07:53:20 -07:00
Tom Cherry
8c116d8616 Merge "Fix host-init-verifier regression" 2019-08-27 14:39:07 +00:00
Jeongik Cha
45ae6b065f Merge "Turn on BOARD_USES_METADATA_PARTITION in mainline"
am: b2401b58a1

Change-Id: I751894eb7e75c89d8364611d96273e49e64a1861
2019-08-27 04:16:35 -07:00
Treehugger Robot
b2401b58a1 Merge "Turn on BOARD_USES_METADATA_PARTITION in mainline" 2019-08-27 11:02:31 +00:00
Dan Willemsen
30fb5cdce9 Merge "Skip much of aux_config.mk"
am: d052fd3bdc

Change-Id: I75affb9b394859fae85e10bf2210e5246834aebe
2019-08-27 01:20:25 -07:00
Treehugger Robot
d052fd3bdc Merge "Skip much of aux_config.mk" 2019-08-27 08:08:28 +00:00
Dan Willemsen
46a88893b1 More base_rules.mk optimizations
This saves another 5-15% of makefile eval time (depending on
target/branch).

I'm not sure if deps-license is still used at all, but we'll only save
the information for it if it's actually going to run now.

Since the default module tag is "optional", we really don't need to save
a list of most modules in another variable. I don't see anything that
really needs to see the list of optional modules.

Test: treehugger
Change-Id: Iaf54e9932fbe8e61f10bd0c9336fc4fdefea27ab
2019-08-27 00:49:31 -07:00
Dan Willemsen
2abf159f9b Improve performance (don't filter ALL_MODULES)
It turns out that this single line was responsible for 28-44% of the
time we spent parsing makefiles. So instead of filtering across
$(ALL_MODULES), check to see if a variable that we always would set is
set.

Test: treehugger
Test: check kati-build eval time before/after
Change-Id: I946c2efd060181a4ae9edd3409c53d9b49a58285
2019-08-26 23:25:17 -07:00
Dan Willemsen
9de012ebde Skip much of aux_config.mk
This was showing up in the top-ten longest makefiles during the product
config and cleanspec kati runs sometimes, even though it's really never
used. So instead of running the sometimes-expensive find command, skip it
unless an AUX OS was specified.

At some point we should remove this entirely, but that's a larger change
that doesn't need to happen yet.

Test: build-aosp_arm.ninja is the same before/after
Change-Id: I0ea10193d2f07e1717224e9020a7defaf6191c05
2019-08-26 22:03:32 -07:00
Tao Bao
ac63a9d728 releasetools: Clean up img_from_target_files.py.
Bug: N/A
Test: Run img_from_target_files to generate an image archive.
Change-Id: I802640b88fe0c7a6d1aab63411b8194d61bceaba
2019-08-26 20:33:11 -07:00
Dan Shi
00d4b4bcc4 Instrumentation test doesn't support extra config
Bug: none
Test: m -j FrameworksCorePackageManagerTests
confirm FrameworksCorePackageManagerTests.config doesn't have the
placeholder.

Change-Id: Ie16720fcf74490fddd1e282f8526e7161d6d10ce
2019-08-26 15:50:15 -07:00
TreeHugger Robot
db1737d46a Merge "DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master" into stage-aosp-master 2019-08-26 19:53:18 +00:00
Daniel Mentz
1e8961033e Merge "Consider search_path to locate avb_*_key_path files"
am: 11dc247ba9

Change-Id: Ie0479fe88e37b330bc80fb6cb68d906546c70b0a
2019-08-26 12:21:24 -07:00
Xin Li
11f4327038 DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master
Bug: 139893257
Change-Id: I2a5aab8575c187db85ed6197160779886ddd4340
2019-08-26 18:31:31 +00:00
Daniel Mentz
11dc247ba9 Merge "Consider search_path to locate avb_*_key_path files" 2019-08-26 18:17:29 +00:00
Daniel Mentz
25478181b9 Consider search_path to locate avb_*_key_path files
avb_*_key_path are usually relative file paths. If these files cannot be
located from the current directory, try prepending OPTIONS.search_path.

Bug: 139836256
Test: python -m unittest test_common
Test: python -m unittest test_add_img_to_target_files
Change-Id: I020b257f458a1f5762691d0499feaf4027e37126
2019-08-26 18:17:14 +00:00
Mathieu Chartier
066f23b78a Merge "Revamp nopreload configuration"
am: bca3111cfa

Change-Id: I7f37c8fe0d97d2b8af44a0b11340480c156d2ac2
2019-08-26 09:27:02 -07:00
Mathieu Chartier
bca3111cfa Merge "Revamp nopreload configuration" 2019-08-26 16:13:10 +00:00
Baligh Uddin
6fac8bab91 Merge "Add a guard against deleting AVB_PUBKey."
am: 667c1aa83d

Change-Id: I255c746b3f6c8b98787f157800d143523c82161f
2019-08-25 22:16:58 -07:00
Baligh Uddin
667c1aa83d Merge "Add a guard against deleting AVB_PUBKey." 2019-08-26 05:04:46 +00:00
Baligh Uddin
15881282d7 Add a guard against deleting AVB_PUBKey.
The avb_pubkey may not be present, if the apex was initially
unsigned or generated from a bundle.  In this case, running
sign_apex to generate a signed apex binary would result in an error.
This fix checks for presense of avbpubkey before attempting the
deletion

BUG: 139994107
Change-Id: I3cb2e88a11ad8797e38ba5fb98c96a4ec4135fc8
2019-08-25 22:01:45 -07:00
TreeHugger Robot
3db69e3a80 Merge "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master" into stage-aosp-master 2019-08-24 06:48:48 +00:00
Amy Zhang
2491b3ca91 Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729"
am: e7f5833792

Change-Id: I0ffa402138e9097f5b984d3358a318a8c7ee9e84
2019-08-23 21:17:27 -07:00