Commit Graph

64034 Commits

Author SHA1 Message Date
Daniel Norman b0c75911b8 Make merge_target_files more lenient, needed for cross-release merging.
These changes were necessary to begin merging a new cross-release target
whose vendor half is frozen.

- MergeDynamicPartitionInfoDicts
  - Filters combined fields to remove duplicates
  - Merges `super_block_devices` as well as other keys that were not
    previously used by other targets consuming this tool.
- Introduces --allow-duplicate-apkapex-keys. This gives a warning rather
  than fatal error on duplicate apk/apex keys. This flag is needed for
  targets that cannot update a frozen half.
- (Formats merge_target_files.py)

Bug: 170683837
Test: Use merge_target_files to merge an S+R build, and boot.
Change-Id: Id5f787e730de8f8ef697e1f2f29ac6514221e58d
2020-10-15 10:16:31 -07:00
Yifan Hong 843240c81a Check system manifest against frozen data.
Test: m check-vintf-all
Bug: 37226359
Change-Id: I5ca5decedc101adf02792d0358b8e4ca102f1354
2020-10-14 21:07:05 -07:00
Patrice Arruda 9b15ad35cf Merge "Source vendorsetup.sh scripts anywhere within the repo." am: e98d29b4ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1455806

Change-Id: Ie8f5d46344dfb2e43123ead18e439d9068d77f92
2020-10-14 19:27:08 +00:00
Patrice Arruda e98d29b4ad Merge "Source vendorsetup.sh scripts anywhere within the repo." 2020-10-14 19:02:11 +00:00
Martin Stjernholm 8125de9276 Merge "Rename com.android.art module." am: a530fa9825
Original change: https://android-review.googlesource.com/c/platform/build/+/1455023

Change-Id: Ic4d79c377b161fdca63db4eebb8ff114eddd20ae
2020-10-14 18:11:07 +00:00
Martin Stjernholm a530fa9825 Merge "Rename com.android.art module." 2020-10-14 17:56:42 +00:00
Patrice Arruda aa4b824d25 Source vendorsetup.sh scripts anywhere within the repo.
When sourcing the envsetup.sh script from a deep directory
inside of the repo, the vendorsetup.sh scripts are not being
sourced. This was causing the ANDROID_ENABLE_METRICS_UPLOAD
not to be set and developer's metrics were not being uploaded.
Provided the top directory to each directory path. Also cleaned
up the function to handle whitespacing correctly.

Bug: b/169699936
Test: *Ran source ../../build/envsetup.sh from external/libchrome dir
      *Renamed repo dir to "aosp master" and source build/envsetup.sh
      *Ran the script in zsh command line interpretor
      *Ran the script in MacOS
Change-Id: I96eb73d50a1923cdda782792778b0d185a341cf9
2020-10-14 15:33:44 +00:00
Rupert Shuttleworth fec7aa8f81 Merge "Add abazel() function to envsetup." am: 870ff764a6
Original change: https://android-review.googlesource.com/c/platform/build/+/1457076

Change-Id: I3721bff26d0564272b03b9071f23223d60ad67ea
2020-10-13 22:43:51 +00:00
Rupert Shuttleworth 870ff764a6 Merge "Add abazel() function to envsetup." 2020-10-13 22:33:29 +00:00
Treehugger Robot 6e5d8c8616 Merge "Builds boot-debug.img if INSTALLED_BOOTIMAGE_TARGET." am: f3d4f2f26b
Original change: https://android-review.googlesource.com/c/platform/build/+/1457146

Change-Id: Ie6a0418554a8e2e15a9e58afa2094ea0d7421b07
2020-10-13 21:11:12 +00:00
Treehugger Robot f3d4f2f26b Merge "Builds boot-debug.img if INSTALLED_BOOTIMAGE_TARGET." 2020-10-13 20:59:42 +00:00
Steven Moreland 6bb786a3a3 Merge "Reflect MALLOC_ZERO_CONTENTS default true." am: 1162536936
Original change: https://android-review.googlesource.com/c/platform/build/+/1380902

Change-Id: I0668377ad4e51e17e68beb01163de137f4e7381a
2020-10-13 17:11:06 +00:00
Steven Moreland 1162536936 Merge "Reflect MALLOC_ZERO_CONTENTS default true." 2020-10-13 16:49:16 +00:00
Devin Moore 2b37bd991e Merge "Update vndk list for android.hardware.common.fmq" am: 761f5fe164
Original change: https://android-review.googlesource.com/c/platform/build/+/1456139

Change-Id: I00fbca77d84e11ebddcc5b251ee4d3327fad6a45
2020-10-13 15:08:08 +00:00
Devin Moore 761f5fe164 Merge "Update vndk list for android.hardware.common.fmq" 2020-10-13 14:58:08 +00:00
Martin Stjernholm 1cced44791 Rename com.android.art module.
Paving the way for renaming the ART release APEX to com.android.art.

Test: m
Bug: 169639321
Change-Id: I55af4b3dcba48757e7fb65d5d4bc7517c91ae80f
2020-10-13 14:37:19 +01:00
Anton Hansson 0e2c301088 Merge "Remove apidiff task and droiddoc jdiff support" am: 20f517e1c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1455018

Change-Id: I4fa897c288ef00ed473a88698e0b485db0ebcbd1
2020-10-13 07:24:10 +00:00
Anton Hansson 20f517e1c3 Merge "Remove apidiff task and droiddoc jdiff support" 2020-10-13 07:08:13 +00:00
TreeHugger Robot 101598c808 Merge "Skip ab/6749736 in stage." into stage-aosp-master 2020-10-13 04:49:55 +00:00
Rupert Shuttleworth 131fa7d866 Add abazel() function to envsetup.
Test: Tested manually on Linux and macOS.

Change-Id: I17f061c2d9135a7a309fc0750cc44cb30d455bc7
2020-10-13 04:26:09 +00:00
Treehugger Robot dbd0122916 Merge "Package proguard_usage.zip files in jacoco-report-classes-all.jar" am: cfa39194ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1456639

Change-Id: Ida9bbce966fa08e835856cad47948324acd5edec
2020-10-12 20:17:52 +00:00
Treehugger Robot cfa39194ad Merge "Package proguard_usage.zip files in jacoco-report-classes-all.jar" 2020-10-12 20:03:30 +00:00
Yifan Hong 3854ebcc77 Merge "Add <ramdisk>/system/etc/ramdisk/build.prop." am: c75a3c5434
Original change: https://android-review.googlesource.com/c/platform/build/+/1455496

Change-Id: Icffb13a42d02eb19f707e7df1825e91e37f71c1e
2020-10-12 18:50:58 +00:00
Daniel Norman af67081218 Builds boot-debug.img if INSTALLED_BOOTIMAGE_TARGET.
This causes boot-debug.img to build if its main dependency
INSTALLED_BOOTIMAGE_TARGET (boot.img) is defined.

This fixes an issue where boot-debug.img was missing when
BUILDING_BOOT_IMAGE=false, but boot.img exists because the board uses
recovery as boot.

Bug: 170644849
Test: Build target that sets PRODUCT_BUILD_BOOT_IMAGE and
      PRODUCT_BUILD_RECOVERY_IMAGE false,
      observe no boot-debug.img.
Test: Build target that sets BOARD_USES_RECOVERY_AS_BOOT,
      observe boot-debug.img.
Change-Id: Ic887ea93d4c5181eca0f82c3cdf3ce3b72f4c185
2020-10-12 11:45:48 -07:00
Steven Moreland 38c8824187 Reflect MALLOC_ZERO_CONTENTS default true.
See corresponding build/soong change. This change sets the android
platform to zero all heap allocations by default. To give some
intuition for why this is no so underperformant, zeroing memory is one
way of priming caches.

The main goal of this is to prevent accidental reliance on allocations
being zero, which is UB in C++. In some situations, allocations are
almost always guaranteed to be 0, and so resulting flakes can be
extremely rare.

Bug: 131355925
Test: allocated memory successfully getting zerod
Change-Id: I8c27fbc8c06420a15d022eb810595599d1e56aa0
2020-10-12 18:44:05 +00:00
Yifan Hong c75a3c5434 Merge "Add <ramdisk>/system/etc/ramdisk/build.prop." 2020-10-12 18:37:43 +00:00
Martin Stjernholm 5c3f09cb39 Merge "Make the build fail when the executable prebuilt target check fails." am: dee171a859
Original change: https://android-review.googlesource.com/c/platform/build/+/1442940

Change-Id: I72ee25277f0bf1315990e212acbc38ce0d957f4c
2020-10-12 09:39:03 +00:00
Martin Stjernholm dee171a859 Merge "Make the build fail when the executable prebuilt target check fails." 2020-10-12 09:24:38 +00:00
Treehugger Robot 62b08d287a Merge changes from topic "board-system-ext-sepolicy" am: 6d34f734ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1273731

Change-Id: I33b355bb22456ea821d69cf774200b38848330de
2020-10-12 04:20:36 +00:00
Felix Elsner e85e3ff721 soong_config: Plat->SystemExt*SepolicyDirs am: 501ca68fd5
Original change: https://android-review.googlesource.com/c/platform/build/+/1273730

Change-Id: I1f376a67e2df7b14a8f84212f6b1ef55bf75278b
2020-10-12 04:20:10 +00:00
Treehugger Robot 6d34f734ae Merge changes from topic "board-system-ext-sepolicy"
* changes:
  soong_config: Support SYSTEM_EXT* sepolicy vars
  soong_config: Plat->SystemExt*SepolicyDirs
2020-10-12 03:49:24 +00:00
Steve Muckle 4231172840 Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1455798

Change-Id: Ib40d6954000df09d7fba80f7ab387bb87bd82374
2020-10-12 01:10:08 +00:00
Steve Muckle a5e1dc4b1c Merge "Revert^2 "use new GKI kernel location"" 2020-10-12 00:42:56 +00:00
Colin Cross e8ac9951d8 Package proguard_usage.zip files in jacoco-report-classes-all.jar
The coverage infrastructure will use the proguard_usage.zip files
to filter out classes that were stripped by R8.

Test: forrest
Bug: 170337718
Change-Id: Ia7c07770ff520aaf0a8de213edbe22d6fca5b98a
2020-10-09 18:41:58 -07:00
Devin Moore 68a3cef45e Update vndk list for android.hardware.common.fmq
Change created with update-vndk-list.sh for the new package.

Test: m
Bug: 142326204
Change-Id: Iecd2ad2fc2f00c0214dc3ad4bf60661b492c5e4f
2020-10-09 13:48:01 -07:00
Yifan Hong e5491533ae Merge "Build otatools files before building OTA packages." am: 49ccbb3729
Original change: https://android-review.googlesource.com/c/platform/build/+/1455215

Change-Id: I51c0c0b8753ebcae7555fb6a72c1d7eaa2255338
2020-10-09 18:34:24 +00:00
Yifan Hong 49ccbb3729 Merge "Build otatools files before building OTA packages." 2020-10-09 18:06:43 +00:00
Treehugger Robot 2f7b994a6f Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." am: 9b7cce9417
Original change: https://android-review.googlesource.com/c/platform/build/+/1453726

Change-Id: Id39b7eab3c5ed08b98aa1766991b08ab7898018e
2020-10-09 17:56:30 +00:00
Treehugger Robot 9b7cce9417 Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." 2020-10-09 17:37:39 +00:00
Steve Muckle 0f0fa1a07d Revert^2 "use new GKI kernel location"
a0281768fe

This revert includes a fix to use the lz4 variant of the kernel,
as was the case before, rather than the uncompressed one.

Bug: 170451791
Change-Id: Iaab082d8bba04df82d742d682251447f3e21fe9b
2020-10-09 10:32:57 -07:00
Pete Bentley c8acaa6f82 Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" am: f00bfe0105
Original change: https://android-review.googlesource.com/c/platform/build/+/1455015

Change-Id: I98a383e302f881b149fb8aba245f4463e386f362
2020-10-09 10:44:26 +00:00
Pete Bentley f00bfe0105 Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" 2020-10-09 10:22:30 +00:00
Pete Bentley 4c9c891fc4 Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so
An ABI incompatible change along with inability to
express the JNI dependency can result in build failures, see
b/170311371#comment8 for how to reproduce.  Tested by using that
repro and verifying this clean step fixes it.  Hopefully the
path being removed is correct for all host platforms.

Fixes: 170311371
Bug: 170389375
Test: As described above
Change-Id: I95ea952bf31d8e9caa8c42d21f2db1968cbe9097
2020-10-09 08:42:13 +00:00
Xiao Ma 677a13713c Merge "Revert "use new GKI kernel location"" am: f07902e84f
Original change: https://android-review.googlesource.com/c/platform/build/+/1455939

Change-Id: I7a60291d250bfd1b797036c9eb20c2e04dba9b21
2020-10-09 07:49:45 +00:00
Xiao Ma f07902e84f Merge "Revert "use new GKI kernel location"" 2020-10-09 07:35:33 +00:00
Xiao Ma a0281768fe Revert "use new GKI kernel location"
Revert "Update kernel to builds 6888926"

Revert submission 1454075-2020-10-07-gki-update

Reason for revert: Looks like this topic changes caused daily build broken, the error log as:

error: +out/target/product/emulator_arm64/boot.img too large (34934784 > 33484800)

I tried to revert this topic first and then feel free to revert revert it.

Reverted Changes:
Ie74ca26e8:use new GKI kernel location
Ibff0d9638:Update kernel to builds 6889747
I693476e82:Update kernel to builds 6888926
I35d7f320c:Update kernel to builds 6888926
Id221a7a30:Update kernel to builds 6888926
I4421dbf67:remove kernel, kernel modules from cuttlefish_kern...
I991f9a6af:Allow downstream devices to customize vendor modul...
I598630e09:load kernel, kernel modules from updated locations...

Bug: 170451791
Change-Id: I4d8f18a7c80eb92cb475c48e1dcf04ceabd08984
2020-10-09 07:22:45 +00:00
Steve Muckle b3f99cd4cd Merge "use new GKI kernel location" am: 1d83969db8
Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: I9c5af9cf064f3672e51736f2194b834162f3d993
2020-10-09 06:05:16 +00:00
Xin Li 5d15b8dd5e Skip ab/6749736 in stage.
Bug: 167233921
Merged-In: I19ebbf405d4565c35a9201369facf6bb4c249335
Change-Id: Ia5d57c864a2550b59d189e461213cf8f3ecc014c
2020-10-08 22:59:59 -07:00
Steve Muckle 1d83969db8 Merge "use new GKI kernel location" 2020-10-09 05:34:46 +00:00
Joe Onorato 871d07c67d Merge "Refactor OWNERS files in platform/build/make." am: f09dce28d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1455497

Change-Id: I40d89146d7b8b06f215c007e2f160266a3259f70
2020-10-09 04:45:30 +00:00