Commit Graph

58057 Commits

Author SHA1 Message Date
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
Bowgo Tsai 2fe786a528 Support removing AVB public keys
AVB public keys might be installed into the first-stage ramdisk.
This CL supports removing some AVB keys during the signing process,
which can be useful when a key needs to be revoked.

Also correcting the path of force_debuggable detection.

Bug: 150109393
Test: make dist
Test: ./build/tools/releasetools/sign_target_files_apks \
      --remove_avb_public_keys key1.avbpubkey,key2.avbpubkey \
      out/dist/*-target_files-*.zip signed-target_files.zip
Change-Id: I1af95adbbec655f40121f3392965dd1950aca4e5
2020-02-24 17:53:10 +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
Treehugger Robot 5832bf1f5a Merge "Touch same_vndk_variant.timestamp" 2020-02-22 15:16:05 +00:00
Automerger Merge Worker 4969b45d50 Merge "Exclude holes from the block map." am: 9581181338
Change-Id: If5d3ab4f9b344c45ff3a73248001ece532564698
2020-02-21 17:28:28 +00:00
David Anderson 9581181338 Merge "Exclude holes from the block map." 2020-02-21 17:04:11 +00:00
David Anderson ab9c7e6d04 Exclude holes from the block map.
e2fsdroid can export holes as a "0" block, in order to make sure logical
and physical block assignments are maintained properly. Exclude these
hole blocks from range sets in LoadFileBlockMap.

Bug: 139201772
Test: m dist on non-A/B
Change-Id: Ic04e869572229678fdeaaa6fbf6f464d6c672051
2020-02-21 17:04:00 +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
Automerger Merge Worker e4d9c62b0d Merge "Load ike in system server classpath instead of bootclasspath" am: 77001add05
Change-Id: I8449124d6ec7a9d90386c25abb247db975277c3a
2020-02-20 19:00:03 +00:00
Yan Yan 77001add05 Merge "Load ike in system server classpath instead of bootclasspath" 2020-02-20 18:38:55 +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 84a1838b46 Merge "Adding new GSI public keys" am: 1f82728d94
Change-Id: I877229f94a92dc8c794b9df9c2a5b21676c66d72
2020-02-20 06:28:03 +00:00
Treehugger Robot 1f82728d94 Merge "Adding new GSI public keys" 2020-02-20 06:18:41 +00:00
evitayan 781145ee4c Load ike in system server classpath instead of bootclasspath
Module IPsec(IKE) will be built as a java_sdk_library and will not
be in bootclasspath anymore. It will be loaded in system sevrer
classpath so that it can be used by VPN.

Bug: 145995723
Test: build, flash, boot
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Test: manually tested that it is loaded in system server
Change-Id: I3126605613202b1e981b4e7f594acb6edbb7d635
Merged-In: I3126605613202b1e981b4e7f594acb6edbb7d635
2020-02-20 05:51:12 +00: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
Automerger Merge Worker 7785e7a030 Merge "Add a module for VNDK library lists" am: 63c28a8bd9
Change-Id: I7888acfb4282a6f20fb5c83215bda546aace734d
2020-02-20 02:22:25 +00:00
Hsin-Yi Chen 63c28a8bd9 Merge "Add a module for VNDK library lists" 2020-02-20 02:09:44 +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 ba58fe13b6 Merge "Port IdentityCredential HAL to AIDL." am: 0bb795c9d7
Change-Id: Ieb49fe2a2e49fccec9672c88f81e6ba307e639cb
2020-02-19 22:23:13 +00: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
David Zeuthen 0bb795c9d7 Merge "Port IdentityCredential HAL to AIDL." 2020-02-19 21:14:40 +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
Hsin-Yi Chen 0aed272b24 Add a module for VNDK library lists
This commit adds a file group which consists of all VNDK library lists.
VTS depends on the file group.

Bug: 147454897
Test: make vts_vndk_dependency_test
Change-Id: Id9e98e070879cd9126f2bfb940b6b0c0f5fb97ba
2020-02-19 16:59:21 +08:00
Bowgo Tsai 3c739746b3 Adding new GSI public keys
Adding two new public keys for R-Developer-GSI and S-Developer-GSI,
respectively.

Bug: 149805495
Test: build then checks $OUT/recovery/root/first_stage_ramdisk/avb/.
Change-Id: I69dd00dbb0046c681758068b8bbea0c08b9e2c91
2020-02-19 08:50:38 +00:00
Automerger Merge Worker 79c12922e4 Merge "Shipping >= API Level 30: no vndservicemanager." am: e05c4c8729
Change-Id: I38a067c4edac03282bfd7d7eeb5058158074b70d
2020-02-18 23:39:49 +00:00
Steven Moreland e05c4c8729 Merge "Shipping >= API Level 30: no vndservicemanager." 2020-02-18 23:18:20 +00: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
Tom Cherry c9d21efbbf Merge "Make oemaids_headers available to vendor." am: 8e28db7acc
Change-Id: I9658f35fe0e12c54b7cc8519d8b391a28207ca6f
2020-02-18 20:54:58 +00:00
Tom Cherry 8e28db7acc Merge "Make oemaids_headers available to vendor." 2020-02-18 19:19:22 +00:00
P.Adarsh Reddy 8b2e7c9c51 Make oemaids_headers available to vendor.
This change makes the oemaids_headers header library
available to vendor side.

Bug: 149665231
Test: Tested compilation, oemaids_headers is available to
a sample vendor binary.

Change-Id: I87369f1db883e40e83d6076defdd4c0d84aac46f
2020-02-18 09:44:23 +00: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
Steven Moreland 2bf4726f18 Shipping >= API Level 30: no vndservicemanager.
Make this device configuration instead. Vendor implementations can
choose to use this, but it's not required.

Bug: 148807371
Test: TH will test CF boots
Change-Id: Ic144b1aa36e35295fccd9fa7f7f911587bf39bee
2020-02-14 16:57:08 -08:00
Treehugger Robot 1d18ae8e7d Merge "Move packages from *_product.mk to *_system_ext.mk" am: ae541174cc
Change-Id: I462fe07fb4d90fa58f1042adcc8fb2a94caf41fe
2020-02-14 22:11:52 +00:00
Treehugger Robot ae541174cc Merge "Move packages from *_product.mk to *_system_ext.mk" 2020-02-14 21:56:40 +00: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