Commit Graph

58057 Commits

Author SHA1 Message Date
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
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 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
Yifan Hong 136764d714 Merge "Build DEVICE manifests and fragments for each SKU" 2020-03-10 19:20:06 +00: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
Treehugger Robot 83315ab6c7 Merge "Mark the current BUILD_* warnings as errors by default" 2020-03-07 20:32:41 +00: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
Treehugger Robot 055d7286ee Merge "Remove unused mips workarounds." 2020-03-07 19:22:42 +00:00
Treehugger Robot 889a8bbca0 Merge "Remove vnd*.libraries.txt from /system/etc" 2020-03-07 14:39:11 +00:00
Treehugger Robot 1c533ec092 Merge "Add an RBE setup script that developers can source to run RBE builds" 2020-03-07 06:04:38 +00: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
Jooyung Han 93cb9b5b31 Remove vnd*.libraries.txt from /system/etc
These files are moved to VNDK APEX.

Bug: 145184886
Test: bulid && boot
Change-Id: I85ab025e1ad490ee7704e4219c5ee611c83ca429
2020-03-07 04:54:23 +09:00
Kousik Kumar 4faa2a5352 Add an RBE setup script that developers can source to run RBE builds
Test: Ran "source build/envsetup.sh && source build/rbesetup.sh", then
ran "use_rbe m" and that worked.

Change-Id: I2413a3648e9b2ff680cab6fededc07bbdd43378f
2020-03-05 17:37:26 -08:00
Colin Cross 074d8e132b Merge "Disable goma for javac actions in Make" 2020-03-05 23:19:09 +00:00
Treehugger Robot 701cb0c069 Merge "Include .proto in sgrep()" 2020-03-05 23:12:14 +00: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
Christopher Tate e2fe95903b Include .proto in sgrep()
Test: use in frameworks/base
Change-Id: I8104822cf69b09b3d11edb9261b8ab43029549d7
2020-03-05 11:34:16 -08:00
Treehugger Robot 90d4027542 Merge "Trim down dont_bother_goals" 2020-03-05 19:07:15 +00:00
Tom Cherry 7cff1fa1fc Include private/fs_config.h directly when needed
This is no longer a transitive include of android_filesystem_config.h

Bug: 149785767
Test: build
Change-Id: Ib546dbc3b6f546ba48009cc9d6d0f4564acf0872
2020-03-05 10:55:45 -08:00
Bill Peckham 573f458718 Merge "Don't touch .installable_files for non-FULL_BUILD" 2020-03-05 18:49:48 +00:00
Bill Yi ffb41e8168 Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:31 +00:00
Bill Yi a78308d97d Merge stage-aosp-master to aosp-master - DO NOT MERGE
Change-Id: I9e6ed6b978e2bc207d46bdec613f909360d62bdd
2020-03-05 09:50:55 -08:00
Automerger Merge Worker 9d5134760c Merge "initial GKI boot.img support" am: 28a7820be2
Change-Id: I620304b97f0ab8f9f440aab1c5dc8e4fe18c4819
2020-03-05 00:43:36 +00:00