Commit Graph

21612 Commits

Author SHA1 Message Date
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
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
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
android-build-team Robot
abe5c770e9 Version bump to QP1A.191005.004 [core/build_id.mk]
Change-Id: I08ff03f2ac4458c8d220714d6922b2e5e62b1e31
2019-08-28 02:04:34 +00: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
Dan Shi
a736d4770f Merge "Instrumentation test doesn't support extra config"
am: a5c6c13623

Change-Id: I1744e945b7e2e106c4e11198c38f0dc2190c3055
2019-08-27 16:47:13 -07:00
Dan Willemsen
07c9ac0e2a Merge "More base_rules.mk optimizations" 2019-08-27 23:42:24 +00:00
Dan Shi
a5c6c13623 Merge "Instrumentation test doesn't support extra config" 2019-08-27 23:12:23 +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
Dan Willemsen
30fb5cdce9 Merge "Skip much of aux_config.mk"
am: d052fd3bdc

Change-Id: I75affb9b394859fae85e10bf2210e5246834aebe
2019-08-27 01:20:25 -07: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
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
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
Elliott Hughes
21e1dba28b Merge "macOS calls itself Darwin."
am: 33dfa52cdd

Change-Id: Ia00d0001106daaecf6b3a4b9b377c1663fd31bd9
2019-08-23 10:10:12 -07:00
Treehugger Robot
33dfa52cdd Merge "macOS calls itself Darwin." 2019-08-23 16:45:07 +00:00
Isaac Chen
5c40e0b628 Merge "Include misc_info.txt for super.img in dist"
am: da8bf47e68

Change-Id: I2982e396ffbf01c5cbed949773a68afa2b65c090
2019-08-23 00:58:36 -07:00
Isaac Chen
da8bf47e68 Merge "Include misc_info.txt for super.img in dist" 2019-08-23 07:35:52 +00:00
Xin Li
8bd576e201 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: If694d0bc707fe5b9d21f9de1b5846ab9f2096042
2019-08-23 06:48:52 +00:00
android-build-team Robot
e928b387b0 Version bump to QP1A.191005.003 [core/build_id.mk]
Change-Id: I7512a131272741cb3ff9d068fd61d90348e3165c
2019-08-23 03:40:50 +00:00
Elliott Hughes
a8368efe51 macOS calls itself Darwin.
Test: uname
Change-Id: Id3ce8614869e68c15666051af14321f597d6ae0f
2019-08-22 13:38:28 -07:00
Tom Cherry
6215e436f3 Fix host-init-verifier regression
After the split up of prebuilt_internal.mk, the logic for running
host-init-verifier on init.rc files was misplaced.  This change moves
it back to the right location.

Test: see that a mistake in rootdir/init.rc causes the build to fail
Change-Id: I60e503cc48639f4f11c47e6636f140672fde61b4
2019-08-22 10:47:16 -07:00
Dan Willemsen
86be07669f Merge "Remove package-stats.txt"
am: 1211130c92

Change-Id: I6be259692a3a25934f30595b7f23177c4f6b62bb
2019-08-21 23:51:21 -07:00
Treehugger Robot
1211130c92 Merge "Remove package-stats.txt" 2019-08-22 06:40:11 +00:00
Isaac Chen
52cc60ca15 Include misc_info.txt for super.img in dist
Include the misc_info.txt in "dist_files" so we can recreate a new
mixed super image (system and vendor images from different builds)
later in the test pipeline.

The misc_info.txt for products with BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE
set to true is removed from their update packages (essentially, reverts
aosp/976069) since the super_misc_info.txt created here can be used.

Bug: 139404128
Test: $ lunch aosp_x86-userdebug
      $ m dist
      $ diff $OUT_DIR/dist/super_misc_info.txt $OUT/misc_info.txt

Change-Id: Iad1ff981124a19933b0b575bc99941e0fc3813a7
2019-08-22 13:22:06 +08:00
Jeongik Cha
5f1eca2482 Merge "SYSTEM_EXT supports executables"
am: 6d52157f9d

Change-Id: I895dec8ff661e914fe35bc20e6a1ab1762037f9b
2019-08-21 18:31:10 -07:00
Treehugger Robot
6d52157f9d Merge "SYSTEM_EXT supports executables" 2019-08-22 01:07:20 +00:00
Dan Albert
68e9a68014 Merge "Link libc++demangle with libc++ for the device."
am: 400c218219

Change-Id: I3f736121bf894a57a6d066672fb8a61d08adbce5
2019-08-21 17:25:35 -07:00
Peter Collingbourne
074651ba13 Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip."
am: 0f9ac40dd6

Change-Id: Iccd2f3cbcad562a0fa7a089cb48f10db1ace7177
2019-08-21 17:24:25 -07:00
Treehugger Robot
400c218219 Merge "Link libc++demangle with libc++ for the device." 2019-08-21 23:54:48 +00:00
Treehugger Robot
0f9ac40dd6 Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip." 2019-08-21 23:45:47 +00:00
Roland Levillain
0a416ce07e Merge "Rename Soong variable FlattenApex as Flatten_apex."
am: 57b8a7cf66

Change-Id: I0ace2508ef1e9676073b808e10310a0d45694d4c
2019-08-21 13:13:46 -07:00
Roland Levillain
57b8a7cf66 Merge "Rename Soong variable FlattenApex as Flatten_apex." 2019-08-21 19:55:47 +00:00
Dan Willemsen
d7994816c1 Remove package-stats.txt
I can't find any remaining users of this functionality.

Test: codesearch; treehugger
Change-Id: I63b079b381211b743baa293267c992d9b2eadcf9
2019-08-21 12:36:14 -07:00
Peter Collingbourne
bbddfcf7ba Only include the "tools" and "testcases" subdirectories in android-cts.zip.
Without this, we can end up packaging log files from previous CTS runs in
the zip file. If the names of those log files contain whitespace characters,
it can result in a build failure.

Change-Id: Id96d1915a03b6a715acfdc212c9b2d6f28045baa
2019-08-21 12:31:41 -07:00
Jeongik Cha
6a5e9a21ef SYSTEM_EXT supports executables
Because TARGET_OUT_SYSTEM_EXT_EXECUTABLES have been omitted, we cannot
install any executables in system_ext.
So fix it.

Test: set system_ext_specific true in some executable, and then check if
it is installed in /system_ext/bin
Bug: 139719550

Change-Id: I1bc7a2e6a7c25ec4b5b1ea6358ba8d3e1ae6331b
2019-08-20 19:24:43 +09:00
Paul Trautrim
bb78e6bfb8 Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation"
am: 23b46e54ac

Change-Id: Idc47cbfa3c54faa3656d2df156fef55ba5546ebd
2019-08-19 17:43:39 -07:00
Paul Trautrim
23b46e54ac Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" 2019-08-20 00:07:35 +00:00