Commit Graph

58026 Commits

Author SHA1 Message Date
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
Peter Collingbourne
d78f96ee20 Merge "Remove crash_dump from PRODUCT_PACKAGES." 2020-03-30 19:03:42 +00:00
Orion Hodson
8459ede56d Merge "Update dex2oat filter" 2020-03-30 13:05: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
7ee9edff67 Merge "Continue to pass in --signing_helper for avbtool." 2020-03-30 06:56:46 +00:00
Baligh Uddin
639b3b7a65 Continue to pass in --signing_helper for avbtool.
BUG: 152424931
Test: Tested Locally
Change-Id: I4e93a899b9055c937980a496f20b35c01ccbb4c1
2020-03-29 22:05:27 -07: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
Treehugger Robot
8b3c9a1b40 Merge "releasetools: Add missing log format specifier" 2020-03-27 22:26:42 +00:00
Anton Hansson
a75f379c9f Merge "releasetools: Add signapk as required modules" 2020-03-27 20:14:34 +00:00
Treehugger Robot
4777f97dc8 Merge "Remove empty newline in build.prop" 2020-03-27 16:03:43 +00:00
Luca Stefani
88e1a14523 releasetools: Add missing log format specifier
Test: m otapackage
Change-Id: I273cf315400dd2b624d2853ece0c30c6fb3d529d
2020-03-27 13:07:56 +00:00
Luca Stefani
3e4b44868b releasetools: Add signapk as required modules
* common.py requires the signapk jar

Test: m otapackage ( before it was broken )
Change-Id: Ic0cff0a21258cb1e7d1ced5553a940dcf5cd6d04
2020-03-27 13:05:21 +00: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
8eded6960a Merge "Install JNI coverage outputs from Soong-built apps" 2020-03-27 04:45:18 +00: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
Yifan Hong
0f113c208a Merge "Add system_ext_manifest.xml" 2020-03-24 17:01:17 +00:00
Ulyana Trafimovich
f488574666 Merge "Get rid of obsolete Make variable TARGET_CORE_JARS." 2020-03-24 14:37:27 +00: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
Baligh Uddin
b1ad7c6dc7 Merge "Build the payload image only during apk-in-apex signing" 2020-03-24 04:54:29 +00:00
Tianjie
c180a5d222 Build the payload image only during apk-in-apex signing
When doing apk-in-apex signing, the package name is not reserved
during the apex repacking. As a result, the name accidentally
reverts to 'com.android.wifi' from 'com.google.android.wifi'.

This cl changes the behavior to call 'apexer' by passing the
'--payload_only' argument. So we don't build the apex file from
scratch and the old AndroidManifest.xml will be reused.

Test: 152084536
Bug: unit tests pass
Change-Id: I8332b2ee84832fb196f2e1c4309abac5ab92e153
2020-03-23 18:15:34 -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
Ulyana Trafimovich
07c20355ac Merge "Put com.android.location.provider before services on the system server classpath." 2020-03-23 12:28:45 +00:00
Ulya Trafimovich
d2744bca56 Put com.android.location.provider before services on the system server classpath.
Test: aosp_walleye-userdebug boots and there are no messages in the
  logcat regarding class loader context mismatch:

    $ adb logcat | grep 'mismatch'
    # empty

Bug: 147017252
Change-Id: I338685b9cf71681b5ca0c541752948934b656b46
Merged-In: I338685b9cf71681b5ca0c541752948934b656b46
(cherry picked from commit db088602f5)
2020-03-23 10:21:48 +00:00
Yifan Hong
382bbdf2cc Add system_ext_manifest.xml
Bug: 147915920
Test: m check-vintf-all -j
Change-Id: I38d4861f433b307574a1b3fae0d912833dfa35e3
2020-03-20 13:01:31 -07:00
Jaewoong Jung
c0d90ac9ac Merge "Fix test suite data files issue." 2020-03-20 18:10:13 +00:00
Peter Collingbourne
40d6508b5c Remove crash_dump from PRODUCT_PACKAGES.
Was causing build failures now that crash_dump has been moved to
an apex.

Bug: 151857642
Change-Id: I86ae8a57c68c8928ac954d594f3bef0fea84c56e
Merged-In: I86ae8a57c68c8928ac954d594f3bef0fea84c56e
2020-03-19 09:46:02 -07: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
Yifan Hong
d6077aa7ca Merge changes from topic "vendor_sku"
* changes:
  Also check empty SKU if SKUS are not defined
  Vendor SKU manifests: define env variables properly
2020-03-19 00:59:18 +00: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
610cbc900e Vendor SKU manifests: define env variables properly
In particular, BOARD_SEPOLICY_VERS may be defined in
system/sepolicy/Android.mk, so defer its evaluation.

Test: build with vendor SKU
Bug: 148601741
Change-Id: Iab3f5dcba4edb65deaab38cc2712d22b89e1a83c
2020-03-17 15:58:07 -07:00
Yifan Hong
352e6a4d18 Merge changes from topic "vendor_sku"
* changes:
  Proper checks for vendor and ODM SKUs
  Rename DEVICE_MANIFEST_<sku>_FILE to FILES
2020-03-16 22:04:56 +00:00
Treehugger Robot
474c9c6eba Merge "Add ANGLE.apk to the base system." 2020-03-16 18:39:26 +00:00
Geoff Lang
6ee4bed4ad Add ANGLE.apk to the base system.
ANGLE has been packaged as a prebuilt library in internal master.  This
CL transitions the library to being built from source in AOSP so it can
be tested and included as a mainline module.

Test: ANGLE is in the developer options/EGL platform can load ANGLE
Bug: 142239747

Change-Id: Ie06dcfccce022ed608c18362e246f6f2a3c6fb1a
2020-03-16 16:57:42 +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
Yifan Hong
07ea2c0360 Rename DEVICE_MANIFEST_<sku>_FILE to FILES
Use plural since multiple files can be defined and assembled together.

Test: pass
Bug: 148601741
Change-Id: I82a7aeb68ea26702e63757a41f32840b6186ab88
2020-03-13 18:32:07 -07:00
Tianjie Xu
059d22231c Merge "ota_tool: fix incremental ota error" 2020-03-13 19:43:17 +00:00
Xindong Xu
2a7aaa69ae ota_tool: fix incremental ota error
Problem:
Logical partitions do not update right since commit
f67dd8059d

    Generate block based OTA for product partitions

due to the wrong order of parameters. This is logged in
/tmp/recovery.log:

    skipping 0 blocks already patched to 202

Bug: 149794632
Change-Id: I92f7a8a226a8a96b892254362d362c515bfb6dc6
2020-03-13 14:25:35 +01:00
Treehugger Robot
1ee63b0b05 Merge "Remove unnecessary dependency." 2020-03-13 02:13:59 +00: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