Commit Graph

22727 Commits

Author SHA1 Message Date
Treehugger Robot 90d4027542 Merge "Trim down dont_bother_goals" 2020-03-05 19:07:15 +00:00
Bill Peckham 573f458718 Merge "Don't touch .installable_files for non-FULL_BUILD" 2020-03-05 18:49:48 +00:00
Automerger Merge Worker 9d5134760c Merge "initial GKI boot.img support" am: 28a7820be2
Change-Id: I620304b97f0ab8f9f440aab1c5dc8e4fe18c4819
2020-03-05 00:43:36 +00:00
Treehugger Robot 28a7820be2 Merge "initial GKI boot.img support" 2020-03-05 00:31:27 +00:00
Dan Willemsen 395358edae Trim down dont_bother_goals
This had caused the nodeps targets to break when I added the
auto-cleanup feature, as we wrote out smaller lists of what was
installed. The functionality of dont_bother_goals is also being fixed in
https://android-review.googlesource.com/c/platform/build/+/1250929/

But there's also no reason to have all of these targets in
dont_bother_goals, as they can just re-use the cached kati build graph.

Bug: 149460609
Test: m systemimage && m snod    <did not delete everything>
Test: m snod    <still see warning>
Test: codesearch for uses of MAKECMDGOALS and these targets
Change-Id: Ib8e7ba67e5ad980be4bdcf521c5156eea7941f97
2020-03-05 00:21:25 +00:00
Automerger Merge Worker a78856cee6 Merge "Skip VNDK variant check on coverage builds." am: 791a8b5128
Change-Id: I506aac7d8dfe868ac123d7b68628e5e67864998e
2020-03-05 00:04:48 +00:00
Oliver Nguyen 791a8b5128 Merge "Skip VNDK variant check on coverage builds." 2020-03-04 23:55:32 +00:00
Bill Peckham 7c3aa02ca3 Don't touch .installable_files for non-FULL_BUILD
If we're not doing a full build, leave
$(PRODUCT_OUT)/.installable_files* alone rather
than truncating it. This prevents the clean logic
in Soong from removing everthing that we're trying
to use to build an image using the snod, vnod, etc.
goals.

Bug: 149460609
Test: make droid, make vnod, verify vendor.img
Change-Id: I612e32621b8045d085829507f22f6385b859f0c2
2020-03-04 15:12:52 -08:00
Steve Muckle 3363a0b8d6 initial GKI boot.img support
The GKI boot.img should be generated alongside the GSI. To make this
possible, define a flag (TARGET_NO_VENDOR_BOOT) that can be used to
disable the generation of the vendor_boot image.

Bug: 138323550
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc
2020-03-04 10:54:56 -08:00
TreeHugger Robot 098949fe60 Merge "DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master" into stage-aosp-master 2020-02-29 04:06:10 +00:00
Xin Li 51e18647ba DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master
Bug: 150410372
Change-Id: I09b3a138aa19a34400a7dfc8ef60dc52bae4c492
Merged-In: I89aaa622a1aa3a58cb6c35206be9244166f6ca84
2020-02-28 21:34:35 +00:00
Automerger Merge Worker 87f76601de Merge "Move build number file to out/soong" am: 47b08fbab5
Change-Id: I8561be9fcabc54526fbf5efa48ef32b08f025b96
2020-02-28 20:32:26 +00:00
Treehugger Robot 47b08fbab5 Merge "Move build number file to out/soong" 2020-02-28 20:15:52 +00:00
Automerger Merge Worker 8ec17a7bcc Merge "Include LICENSE files, when available, in notices." am: 5167fb0a37
Change-Id: Iccf223694b8de22fa0e2d1be2a3dd93e8567fa21
2020-02-27 23:37:56 +00:00
Bob Badour 5167fb0a37 Merge "Include LICENSE files, when available, in notices." 2020-02-27 23:29:26 +00:00
Automerger Merge Worker 6ebc180650 Merge "Package vts-tradefed.jar in general-tests" am: 04c90d44f7
Change-Id: I674f8f399cc67c30c0dfd4fd129775045c5bed93
2020-02-27 22:26:13 +00:00
Treehugger Robot 04c90d44f7 Merge "Package vts-tradefed.jar in general-tests" 2020-02-27 22:17:19 +00:00
Bob Badour 9da828c1b4 Include LICENSE files, when available, in notices.
As a first step to removing the go/android3p instructions to copy or
to link NOTICE to LICENSE, include LICENSE files in the notices, which
will allow deleting all of the copied/linked NOTICE files.

The change causes a couple minor additions to the system image notice
files.

Test: manually built and compared before and after notices

Change-Id: Id23cae4a8f2d103e1379f4341340fc56c5943dc2
2020-02-27 19:19:23 +00:00
Automerger Merge Worker 2150099d65 Merge "Partition the targets for notice files." am: 684350d24f
Change-Id: If17662be626c33c9b7f9ca3c742f58fb76d0492e
2020-02-27 15:31:10 +00:00
Bob Badour 4b25c90e52 Partition the targets for notice files.
Partition the targets into those appearing in system images, those
appearing somewhere unreadable by the Settings UI, whose notices
must appear in a readable system image, and those not appearing
on the device thus not needing notices. Assert no other targets
appear under $(PRODUCT_OUT).

Test: manually built and tested phone image

Change-Id: If82cb36f98f8e6066d1c67bb4d15976be433d403
2020-02-26 16:49:28 -08:00
Colin Cross d68a88402f Move build number file to out/soong
Move the build number file to out/soong so Soong can treat it
as an output path, and pass the name of the file to Soong instead
of the command to read it.

Test: m checkbuild
Change-Id: I9e1aecf33d11fe4fde34cd57cc9b1f1ad49b0424
2020-02-25 00:06:46 +00:00
Oliver Nguyen 4a4c834b09 Skip VNDK variant check on coverage builds.
Coverage builds result in different core and vendor variants due to
different coverage metadata from static libraries. Skip this check only
on coverage builds.

Bug: 143977934
Test: m CLANG_COVERAGE=true COVERAGE_PATHS='*'
Change-Id: I906745e951b36a87cedf998a93bdc390196a606e
2020-02-24 15:18:45 -08:00
Automerger Merge Worker 353523d684 Merge "Touch same_vndk_variant.timestamp" am: 5832bf1f5a
Change-Id: I521974518d645cefb27c821053954563cdf2171c
2020-02-22 15:25:43 +00:00
Colin Cross c989ff3d75 Touch same_vndk_variant.timestamp
Fix uneccessary rebuilds on incremental builds by touching the
same_vndk_variant.timestamp output file.

Test: m && m
Change-Id: Ieb1b47f8a6cc406139c326a527041239fdb627d0
2020-02-21 07:31:32 -08:00
Automerger Merge Worker d8d9a50090 Merge "do not clear output kernel module directory" am: 733ad20963
Change-Id: I9de52a01cf0c04f909dcd711d8bd152fa3bf9b50
2020-02-21 01:17:24 +00:00
Treehugger Robot 733ad20963 Merge "do not clear output kernel module directory" 2020-02-21 01:02:09 +00:00
Steve Muckle 5e0ff33d0f do not clear output kernel module directory
When using an archive to provide kernel modules, the archive is directly
expanded into the output directory. The output directory is currently
removed prior to that to ensure no stale modules are present if they
were removed as part of a change in an incremental build.

Unfortunately if kernel modules are also provided via the regular
BOARD_*_KERNEL_MODULES macros, the removal of the output kernel module
directory will race with the copying of kernel modules in
BOARD_*_KERNEL_MODULES, resulting in some of those kernel modules not
being present in the output.

Kernel modules removed from BOARD_*_KERNEL_MODULES do not currently get
removed from the output directory in an incremental build anyway. So in
order to support using BOARD_*_KERNEL_MODULES and
BOARD_*_KERNEL_MODULES_ARCHIVE conurrently, take out the removal of the
output directory prior to archive expansion.

Bug: 149866863
Change-Id: Ib373650ddcb0fb5782a13d68a8869a9117e42ccc
2020-02-20 10:19:06 -08:00
Automerger Merge Worker e1570cb99d Merge "Adding vendor_boot-debug.img" am: 31d4a5aed7
Change-Id: I48f3ded6c5c63aa9a828a529880f0cdb2918f8e2
2020-02-20 04:12:10 +00:00
Treehugger Robot 31d4a5aed7 Merge "Adding vendor_boot-debug.img" 2020-02-20 03:56:58 +00:00
Dan Shi 7edfb7f659 Package vts-tradefed.jar in general-tests
vts-core.xml imports some vts only preparer to run un-converted vts
python tests.

Bug: 149249068
Test: unittest
Change-Id: Ibdecb250f78c07d7645be4b140b8cfaeda99d79b
2020-02-19 15:22:11 -08:00
Automerger Merge Worker 3e052fc8e1 Merge changes from topic "vts-package" am: ab39096ee7
Change-Id: If8f30e49210ba244c85b12a36a31ddb10f927a0d
2020-02-19 22:22:02 +00:00
Automerger Merge Worker ce62eaaabe Change vts-core package to generic *ts package rule am: 4e143cdc85
Change-Id: If3ef9ae3f0c77c7423382f4ba96b34ce7ed5ca2e
2020-02-19 22:21:58 +00:00
Automerger Merge Worker d9bbafdbf2 Merge "Support empty jacoco-report-classes.jar" am: 62eee30f34
Change-Id: I6f387c538f04d20439250aaa72fe544791abc97f
2020-02-19 22:16:59 +00:00
Dan Shi ab39096ee7 Merge changes from topic "vts-package"
* changes:
  Add vts related artifacts to vts-core package
  Change vts-core package to generic *ts package rule
2020-02-19 21:05:55 +00:00
Treehugger Robot 62eee30f34 Merge "Support empty jacoco-report-classes.jar" 2020-02-19 20:30:46 +00:00
Automerger Merge Worker cfb18c0777 Merge "Add a new make target called `haiku-line-coverage`" am: 54839bb77e
Change-Id: I9b07b2d0b3fdf2cae2b061ce06add9198f7ae456
2020-02-19 19:47:46 +00:00
Kyriakos Ispoglou 54839bb77e Merge "Add a new make target called `haiku-line-coverage`" 2020-02-19 19:07:20 +00:00
Dan Shi 5e06288e7c Add vts related artifacts to vts-core package
Bug: 149249068
Test: m -j vts-core
vts-core-tradefed run singleCommand vts-core -m VtsKernelLtp

Change-Id: I7fc25f83985bdf7bb34b29f7b28510ef0ade8e4b
2020-02-19 10:44:24 -08:00
Automerger Merge Worker a392047a05 Merge "build: Add vendor.prop and odm.prop capability" am: 6ed2deb9d5
Change-Id: Ib2a6c2ed9bbb33cceb1d8fa7f938ecadf42f5bb8
2020-02-18 22:05:28 +00:00
Treehugger Robot 6ed2deb9d5 Merge "build: Add vendor.prop and odm.prop capability" 2020-02-18 21:45:08 +00:00
Dan Shi 4e143cdc85 Change vts-core package to generic *ts package rule
The current package logic is based on general-tests and device-tests,
which have special rules to package test artifacts in a diffrent way.
vts-core suite should follow the generic *ts package rule.

Bug: 149249068
Test: m -j vts-core && vts-core-tradefed
run some vts-core test

Change-Id: Ib6ab7eb0fb4b8c898a0b3617d10be04dc98c2daa
2020-02-18 13:38:38 -08:00
Bowgo Tsai 6a68367e6e Adding vendor_boot-debug.img
Commit I30137c3caef91805d9143d404e5e4d06c0fccc30 adds boot-debug.img
to allow adb root with an user build GSI image.

  https://source.android.com/compatibility/vts/vts-on-gsi

Another commit I5b005097b73f59857c3a2f92d693b3e67ee8424e adds
vendor_boot.img to pair with a generic kernel image, the GKI boot.img.

To allow adb root for devices using a GKI, vendor_boot-debug.img is
introduced. The image combination used in VTS will be:

    Old devices without GKI:
      GSI system.img + boot-debug.img + vendor.img, etc.

    New devices with GKI:
      GSI system.img + GKI boot.img + vendor_boot-debug.img + vendor.img, etc.

Note that boot-debug.img still can be used on new devices for
non-compliance scenario.

Bug: 147849477
Test: lunch aosp_cf_x86_64_phone-userdebug; make vendorbootimage_debug
Test: `make dist`, checks that both vendor_boot-debug.img and
      vendor-ramdisk-debug.cpio.gz are in $OUT/ and out/dist.
Test: `make dist`, checks that installed-files-vendor-ramdisk-debug.{json,txt} are
       in $OUT/ and out/dist.
Change-Id: I66b662d8b1e5c619ed7bb81e40233fe9df363b27
2020-02-18 13:46:17 +08:00
Kyriakos Ispoglou f00a0dbffc Add a new make target called `haiku-line-coverage`
This CL adds a new make target for line coverage, That is, by running
`make haiku-line-coverage` you can get a set of all profile (*.gcno) files
for all fuzz targets and for all critical components of Android,
packed into a zip called `line_coverage_profiles.zip`. Furthermore the set of
all fuzz targets are instrumented with line coverage and packed into
another zip called `line_coverage_fuzz_targets.zip`

To properly run the make target enable NATIVE_LINE_COVERAGE first:
NATIVE_LINE_COVERAGE=true NATIVE_COVERAGE=true COVERAGE_PATHS=* make haiku-line-coverage

Bug: b/148234755
Test: Make target buils successfully on master/aosp. Binaries tested on taimen
devices.

Change-Id: I6a1e11068119337628c2ae5ee3baf2fc394add05
2020-02-17 11:18:11 -08:00
Colin Cross d81f4b3461 Support empty jacoco-report-classes.jar
If EMMA_INSTRUMENT is turned on but no APKs were built the rule to
collect jacoco-report-classes.jar would error with missing directories
and an empty zip file.  Switch to soong_zip, which doesn't error
on empty zip files, and hide the errors if $(TARGET_COMMON_OUT_ROOT)
or $(HOST_COMMON_OUT_ROOT) don't exist.

Test: m EMMA_INSTRUMENT=true TARGET_BUILD_APPS=Camera2
Change-Id: I09e30e37dc38f32f55b3f91bfc4d12c9e753083f
2020-02-14 10:36:47 -08:00
Ivan Lozano 1a013b86f8 Merge "Remove execute-only support." am: c6a34608d0
Change-Id: I156d986e19075c5c21218f94138774ece0460ece
2020-02-14 14:56:52 +00:00
Ivan Lozano c6a34608d0 Merge "Remove execute-only support." 2020-02-14 14:42:49 +00:00
Ivan Lozano 3cd1ebeaee Remove execute-only support.
With kernel support being removed for execute-only memory layouts,
remove support for XOM until there's kernel support again.

This allows us to gain the code-size improvements from
"-z noseparate-code".

Bug: 147300048
Test: Compiled binaries no longer marked XOM by default.

Change-Id: I08a054e903b202f513d3b3381afd606bb87cf257
2020-02-13 14:20:28 -05:00
Automerger Merge Worker 9c2afcf9c6 Merge "Modify D8 template to not have inputs under the output directory." am: 8e3f73576f
Change-Id: Id3e17717fea5c99624dba7cad5c79ec6dda8f603
2020-02-13 16:20:01 +00:00
Ramy Medhat 8e3f73576f Merge "Modify D8 template to not have inputs under the output directory." 2020-02-13 16:09:49 +00:00
Automerger Merge Worker 0296ecb601 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." am: 0445b496c1
Change-Id: I21b704bfee4d8b9b49cc4b06444001bcf0e97f58
2020-02-13 13:48:33 +00:00