Commit Graph

22765 Commits

Author SHA1 Message Date
Anton Hansson
a0ef52302e Merge "Reland: Remove empty newline in build.prop" 2020-04-03 11:58:17 +00:00
Daniel Norman
63a16b56ee Merge "Adds the module from package-modules to ALL_MODULES." 2020-04-01 16:30:51 +00:00
Luca Stefani
033c7eb82f Reland: Remove empty newline in build.prop
Before:
cat build.prop

\# begin common build properties
\# autogenerated by build/make/tools/buildinfo_common.sh

After
cat build.prop
\# begin common build properties
\# autogenerated by build/make/tools/buildinfo_common.sh

Change-Id: I8365bb59ad22a3bd9fc1dc904ff2026ddd7abe06
Test: m
2020-04-01 12:55:27 +02:00
Daniel Norman
1d18d5366e Adds the module from package-modules to ALL_MODULES.
This exposes any modules built with package-modules.mk to
module-info.json.

Test: refreshmod, inspect module-info.json and find new modules
      from platform_testing/build/tasks/*
Bug: 151670189
Change-Id: I8d502382640f4d49ab2c17fcc251e54720844b76
2020-03-31 16:49:39 -07:00
Tianjie Xu
a3541df291 Merge "Add aftl inclusion proof" 2020-03-31 22:12:46 +00:00
Bo Hu
c969dcc0b2 Merge "Revert "Remove empty newline in build.prop"" 2020-03-31 21:27:21 +00:00
Bo Hu
76a005da8d Revert "Remove empty newline in build.prop"
This reverts commit 96a79c6f65.

Reason for revert: b/152899887
original cl leads to build.prop getting longer and longer
from 60+ to 1k+ lines and keep increasing

Exempt-From-Owner-Approval:
BUG: 152899887

Change-Id: I83ed1702009278014c77d7e7a7305756041564de
2020-03-31 21:26:58 +00:00
Dan Shi
916be61b91 Merge "Rename VTS to VTS10" 2020-03-31 17:32:34 +00:00
Bill Peckham
19c3feb2d3 Build merged apexkeys.txt/apkcerts.txt by partition.
Propagate partition tag data to apexkeys.txt and
apkcerts.txt so that merge_target_files.py can build
merged versions of these files by filtering the
framework files for framework partitions and filtering
the vendor files for vendor partitions.

Bug: 138942268
Change-Id: Ic3226728e97dae84d38ec230ccc86d1b124bea94
2020-03-30 22:33:27 +00:00
Oliver Nguyen
337f42e7d1 Merge "Export llvm-profdata for Clang coverage builds." 2020-03-30 20:38:22 +00:00
Orion Hodson
70fcf897c5 Update dex2oat filter
verify-at-runtime is deprecated in favor of extract. Update to
stop deprecation warnings during OTAs.

Exempt-From-Owner-Approval: cherry-pick from rvc-dev

Bug: 149794809
Test: manual OTA
Change-Id: I9b8365a1fba5fd18420661a3e6ada77f3609bcc7
Merged-In: I9b8365a1fba5fd18420661a3e6ada77f3609bcc7
(cherry picked from commit db651d5913)
2020-03-30 13:03:47 +00:00
Treehugger Robot
3f3351514c Merge "Copy shared libraries used by tests in device-tests_host_shared-libs.zip." 2020-03-30 01:28:24 +00:00
Dan Shi
dec1d6e084 Rename VTS to VTS10
Bug: 151896491
Test: m -j vts10
Change-Id: I0a6468e63f381e67f34666975c18058d64048178
2020-03-28 13:28:21 -07:00
Luca Stefani
96a79c6f65 Remove empty newline in build.prop
Before:
cat build.prop

\# begin common build properties
\# autogenerated by build/make/tools/buildinfo_common.sh

After
cat build.prop
\# begin common build properties
\# autogenerated by build/make/tools/buildinfo_common.sh

Change-Id: I55a9cdc9a93e2d72ba4db97fef4c5e8c67421026
Test: m
2020-03-27 12:38:25 +00:00
easoncylee
01e5ec2a21 Copy shared libraries used by tests in device-tests_host_shared-libs.zip.
This change collects the shared libraries files used by tests in
device-tests_host_shared-libs.zip. Then the host test can be run in
TradeFed host based on build artifacts.

Bug: 151172861
Test: m -j device-tests
Change-Id: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
2020-03-27 12:51:16 +08:00
Jaewoong Jung
e66eaf3602 Install JNI coverage outputs from Soong-built apps
Test: Built mainline module coverage data
Bug: 152117890
Change-Id: Ibb809c3e8b599b467c7176e750e0b78a5bfee38e
2020-03-27 01:39:06 +00:00
Yi Kong
318db68993 Merge "Add platform-wide sampling PGO option" 2020-03-27 01:17:26 +00:00
Ulyana Trafimovich
d172b3503b Merge "Add PRODUCT_BOOT_JARS_EXTRA interface" 2020-03-26 12:53:19 +00:00
Po Hu
012118da8f Add PRODUCT_BOOT_JARS_EXTRA interface
This interface allows vendor to append their boot jars after AOSP's
without changing inherit order.

Test: get_build_var PRODUCT_BOOT_JARS
Change-Id: I6beb8cc9d7fcf0d474b24f634e81657aa42e7ed7
Bug: 152267233
2020-03-26 10:31:39 +00:00
Treehugger Robot
1973f86ffd Merge "support multiple kernels, boot.img output" 2020-03-25 18:23:15 +00:00
Steve Muckle
b3dda77f2a support multiple kernels, boot.img output
In order to enable the delivery of multiple kernel variants with
a platform build, add support for generating boot.img files from
multiple kernels.

The BOARD_KERNEL_BINARIES macro may be defined as a list of kernel
binaries to be used (if not, the original behavior and assumption of a
single kernel binary is preserved). Each kernel binary filename
must begin with "kernel". Any extra text in the filename is appended
to the boot.img name, so "kernel-gz" would generate "boot-gz.img".

Bug: 151094943
Change-Id: Icbbf227e9561f4aa11ce10db8d7aa81c7a81eb5b
2020-03-24 11:27:57 -07:00
Yi Kong
bcbcd65a99 Add platform-wide sampling PGO option
Test: build
Bug: 79161490
Change-Id: Ibd30fffa0a97ca76155891f3aec8d7891226b9f1
2020-03-24 07:01:59 -07:00
Ulya Trafimovich
c46e0673d0 Get rid of obsolete Make variable TARGET_CORE_JARS.
Test: aosp_walleye-userdebug boots.
Change-Id: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
2020-03-23 15:35:00 +00:00
Jaewoong Jung
c0d90ac9ac Merge "Fix test suite data files issue." 2020-03-20 18:10:13 +00:00
Jaewoong Jung
b5aa16d44f Fix test suite data files issue.
The current test suite rule implementation has a bug where test data
files are excluded from the final suite zip files when a suite doesn't
have a designated testcases output directory, which is represented by
COMPATIBILITY_TESTCASES_OUT_$(suite_name).

Specifically, the rule that collects test data files for each suite
filters out suite output paths that conflict with module output paths,
which happens when a suite doesn't have its own testcases output
directory. It seems to have been done this way just to avoid make rule
conflict errors, but it ended up causing missing test data files.

This change fixes it by adding an indexing purpose only test suit file
variable.

Fixes: 140761783
Test: m general-tests
Test: Compared before vs after, no meaningful differences.
Test: Changed bc-tests to a device test and built general-tests.
Test: Before - data files missing, after - data files present
Change-Id: I2008992f4144c6ee115f4b4e4ac9caa4312bbe34
2020-03-19 06:47:35 -07:00
Treehugger Robot
d530443e82 Merge "Make RRO packages for system_ext" 2020-03-19 01:47:54 +00:00
Tianjie Xu
eaed60c1a1 Add aftl inclusion proof
The otatools should talk to the aftl server and append the inclusion
proofs when building the vbmeta image. We should only do this during the
signing process when the network is always available.

Also the inclusion proof doesn't impact the final vbmeta image size on
coral, where the final size is 8192 after padding. This is below the
physical image of 65536.

Bug: 147870995
Test: unit tests pass, run sign_target_file_apks
Change-Id: If84c6bf5198c9b05f5e0c16ae6335971915f47e3
2020-03-18 13:11:41 -07:00
Yifan Hong
69430e65fe Also check empty SKU if SKUS are not defined
In the case when both ODM_MANIFEST_SKUS and ODM_MANIFEST_FILE are
both empty, also checks VINTF compatibility for empty SKU case.

Same for device manifest. Although right now, DEVICE_MANIFEST_FILE and
DEVICE_MANIFEST_SKUS cannot be both empty (because libvintf requires
vendor manifest exists barring manifest fragments), let libvintf throws
an error for this case. In the build system, simply handle vendor manifest
the same way as ODM manifest.

Bug: 148601741
Test: manual
Change-Id: Ia0655fd4d37f6286b164a3221ec4b2716f29147d
2020-03-17 20:27:32 -07:00
Jeongik Cha
d99e77d6d6 Make RRO packages for system_ext
Until now, packages from system_ext don't create RRO packages, instead
it uses static overlay, but to make system_ext common, it should use
RRO.

Bug: 150820813
Test: m && check if there are RRO packages that use from system_ext apps
Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-03-18 00:55:48 +00:00
Yifan Hong
28ffd73591 Proper checks for vendor and ODM SKUs
If DEVICE_MANIFEST_FILE / ODM_MANIFEST_FILES is set, also include check
for empty vendor / odm SKU, respectively. Then, do cross product of
vendor SKUs and ODM skus, and check each possible combination.

Test: build with and without vendor skus
Test: m check-vintf-all
Bug: 148601741

Change-Id: I23cc81998e7afc36c43540bf6d615b4d4b288447
2020-03-13 18:32:07 -07:00
Aurimas Liutikas
cd80e3b9eb Remove unnecessary dependency.
This dependency is now defined in ALL_SDK_FILES.

Test: lunch sdk; make sdk
Change-Id: Ia740466e493d745d83039ba9991547a6c2d3bd2c
2020-03-12 16:12:27 -07:00
David Srbecky
37493d8252 Merge "Install boot.art image for host as well (used by ART tests)." 2020-03-12 18:20:42 +00:00
Oliver Nguyen
b02f7dbaa4 Export llvm-profdata for Clang coverage builds.
This tool must match the one used to compile the source code for
compatibility.

Bug: 143977934
Test: m CLANG_COVERAGE=true dist
Change-Id: I71e0e7afb05dedd5f6a09d5e4099387c6262387f
2020-03-10 17:07:58 -07:00
Roopesh Nataraja
11e776fc32 Build DEVICE manifests and fragments for each SKU
Single vendor can support multiple skus with different
capabilities. Add support to define and build sku
based device manifests.

Specify DEVICE manifests in BoardConfig.mk as below.

  # installed to /vendor/etc/vintf/manifest_{sku}.xml
  DEVICE_MANIFEST_SKUS := sku1 sku2 sku3

  DEVICE_MANIFEST_SKU1_FILE := device/foo/bar/manifest_sku1.xml
  DEVICE_MANIFEST_SKU2_FILE := device/foo/bar/manifest_sku2.xml
  DEVICE_MANIFEST_SKU3_FILE := device/foo/bar/manifest_sku3.xml

Bug: 148601741

Change-Id: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
2020-03-09 15:09:08 -07:00
Dan Willemsen
97ec812708 Mark the current BUILD_* warnings as errors by default
This switches:

  BUILD_COPY_HEADERS / LOCAL_COPY_HEADERS
  BUILD_HOST_EXECUTABLE
  BUILD_HOST_SHARED_LIBRARY
  BUILD_HOST_STATIC_LIBRARY

to errors by default. Devices can set
BUILD_BROKEN_USES_BUILD_HOST_EXECUTABLE (etc) to turn these errors back
to warnings. I've done that for all of our internal devices.

Bug: 130719878
Bug: 130696912
Bug: 130722971
Bug: 130723227
Test: remove the BUILD_BROKEN_USES_* lines from a device, see errors
Change-Id: I1aecf97f64e281df3682ff0a0fb3ac4283790acd
Merged-In: I1aecf97f64e281df3682ff0a0fb3ac4283790acd
(cherry picked from commit c4bdff5f7e)
2020-03-07 11:29:29 -08:00
Elliott Hughes
f71c05a8e5 Remove unused mips workarounds.
This was never really finished, and hasn't been supported for years.

Test: treehugger
Change-Id: I7668088d1449f33025aaf36fae0817894c84a877
2020-03-06 16:46:59 -08:00
Colin Cross
28ff3e3f94 Disable goma for javac actions in Make
goma can't handle the --system argument that Android must pass to
javac.

Bug: b/143658984
Test: treehugger
Change-Id: I7091a14f940ae696930c9d4a7869ae3a81a33fbe
2020-03-05 20:46:47 +00:00
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