Commit graph

64207 commits

Author SHA1 Message Date
Kousik Kumar
c2c28f9941 Merge "Remove env-var-allowlist" am: 3a7a960a86
Original change: https://android-review.googlesource.com/c/platform/build/+/1461902

Change-Id: If81d9da73547a768c10f86a26c045cce2abb0a90
2020-10-16 06:08:28 +00:00
Jaegeuk Kim
bea507259c Merge "Add build property to enable fscompression" 2020-10-16 06:06:14 +00:00
Kousik Kumar
3a7a960a86 Merge "Remove env-var-allowlist" 2020-10-16 05:52:51 +00:00
Tianjie
e88ac677c5 Make the ro.build.version.release consistent between device build prop & partition build prop
The ro.build.version.release has updated to use the last stable platform
version in go/ab/10260813. But the logic for per-partition build prop
has never been updated. This mismatch eventually reflects in the
device's build fingerprints and cause confusion. This cl updates the
partition build props to match the behavior of the top level build props.

Also the device's fingerprints is heavily used in static analysis, e.g.
ota targeting, the change to its computation may cause unexpected effects.

Bug: 170968068
Bug: 158483506
Test: build system image for coral, check the build prop
Change-Id: Icf741c915f2eba970258979efc274e424187ac69
2020-10-15 18:31:00 -07:00
Jaegeuk Kim
ed754fb339 Add build property to enable fscompression
Bug: 162253911
Bug: 110272315
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I3cb7d0a055a7f83c9d0321d2b16f11f40a74f7aa
Merged-In: I3cb7d0a055a7f83c9d0321d2b16f11f40a74f7aa
2020-10-15 17:10:25 -07:00
Yifan Hong
38ab4d81ed Add ota script support to generate partial updates
Allow the ota generation script to take a list of partitions;
and thus generating a partial ota update package. This allow the
testing of partial update functionality, e.g. system-only updates.

Bug: 170921953
Test: unit tests, generate and apply a partial update on coral with system, system_ext, vbmeta_system
Change-Id: I0d8f93806dfbf7b781ea911117b02fc5c0971434
2020-10-15 16:30:13 -07:00
Yifan Hong
82b113d9c7 Add BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT
BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT controls whether GSI AVB keys are built
to vendor_boot. On devices without a dedicated recovery partition, GSI AVB
keys used to be built in boot. They are device-specific, so they should be
moved to vendor_boot.

Test: pass
Bug: 156098440
Change-Id: I0a5eaa1b39e88fcca9837c7aa3f475be47d5b0f2
2020-10-15 14:58:34 -07:00
Yifan Hong
aad34e5b7e Exclude board cmdline/dtb/pagesize/base in generic boot image
When building with BOARD_USES_GENERIC_KERNEL_IMAGE, even if BUILDING_VENDOR_BOOT_IMAGE
is not set, do not include board-specific cmdline, dtb, page size, and base in the
generic boot image.

This change drops buildvariant=* in the cmdline of the generic boot
image

Bug: 156098440
Test: manual. Deliberately set BOARD_KERNEL_CMDLINE for aosp_arm64 and
      ensure it doesn't go into the boot image.
Change-Id: I846f600058a4a9b349d55c9773d6dd81bbe49312
2020-10-15 14:58:34 -07:00
Yifan Hong
881df39d23 Add BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT.
This variable indicates whether recovery resources are moved to
vendor_boot. If true:

- $OUT/recovery.img will not be built
- $OUT/recovery/root will be included in vendor_boot ramdisk

Bug: 156098440
Test: set to true and check output
Test: `m target-files-package` and manually inspect output
Change-Id: I56dda56bab7def1540f4fb506323e3e605620cd4
2020-10-15 14:58:34 -07:00
Yifan Hong
63c5ca19ab Add BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE.
BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE removes kernel from the
recovery image.

Test: build recovery image and unpack_bootimg
Test: build target files and unpack_bootimg IMAGES/recovery.img
      on device with GKI and dedicated recovery partition.

Bug: 156098440

Change-Id: I5f37d74ed954b26fe3dd778708b6ab9cfdc51f1e
2020-10-15 14:58:34 -07:00
Yifan Hong
d381f7336a Add GKI global variable.
Add BOARD_USES_GENERIC_KERNEL_IMAGE to be the global variable to
indicate the device uses GKI image.

Test: pass

Bug: 156098440

Change-Id: Ica553bbdb791e25dfa9bafb524ab2de5e3f8720d
2020-10-15 14:58:34 -07:00
Julien Desprez
79af9880ec Update location of some files while moving them
Test: make cts
Bug: 170967708
Change-Id: Icd7fa608eb7488574456e9409e0efefa909c92ea
2020-10-15 14:09:39 -07:00
Makoto Onuki
90ac5ae188 Remove unneed jar files from the system partition
Fix: 170967644
Test: boot
Test: Make sure the following jar files are removed
$OUT/system/framework/service-blobstore.jar
$OUT/system/framework/service-jobscheduler.jar

Change-Id: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
Merged-in: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
2020-10-15 13:06:58 -07:00
Kousik Kumar
405847ac19 Remove env-var-allowlist
We no longer need to set PWD variable with the introduction of
`-fdebug-compilation-dir`, so removing env var allowlist of PWD variable
to RBE.

Change-Id: Ifa0592af519b6cc4364ee653f1a2174fd680bac1
2020-10-15 15:53:13 -04:00
Yifan Hong
7ff7168d99 Merge "Add function to extract timestamp from boot image" am: f2ef765168
Original change: https://android-review.googlesource.com/c/platform/build/+/1438292

Change-Id: I55e43817ff4cf0ee02ca29f53b8dfd7bed01ebf8
2020-10-15 19:51:20 +00:00
Yifan Hong
f2ef765168 Merge "Add function to extract timestamp from boot image" 2020-10-15 19:32:45 +00:00
Yifan Hong
125d0b63b9 Add function to extract timestamp from boot image
Also add toybox to otatools list.

Bug: 169169031
Test: build OTA
Change-Id: Ib14dbf46a8385ccf2a9c5a9c6f4e7fa9399cf0ba
2020-10-15 19:32:39 +00:00
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