Commit Graph

67771 Commits

Author SHA1 Message Date
Tianjie Xu
d3c78b8cde Merge "Amend the apex info for ota package" 2021-06-09 20:16:08 +00:00
Treehugger Robot
9d4b9bb50c Merge "Missing required packages for f2fs when building ota package" 2021-06-09 16:34:41 +00:00
Jaegeuk Kim
1f50a36c62 Missing required packages for f2fs when building ota package
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
2021-06-08 19:12:15 -07:00
Tianjie
a5fca03e0a Amend the apex info for ota package
We have already logged the compressed apexes in the target-files.
Because we want to support the apex metrics during OTA update, also
include the uncompressed apexes in the META/apex_info.pb.

For incremental OTA packages, include the source apex version for
each apex package as well.

Bug: 190244686
Test: unit test
Change-Id: I5cf2647c56c4feb5517f9a81aa1e9abc52515bf1
2021-06-07 20:33:46 -07:00
Kelvin Zhang
f2f564c9e4 Merge "Handle caremap for partial OTAs" 2021-06-06 22:56:49 +00:00
Kelvin Zhang
766eea72ef Handle caremap for partial OTAs
When generating a partial OTA, filter care_map.pb to include only the
partial partitions, then generate OTA.

Test: Generate a partial OTA, make sure care map is included.

Change-Id: I0eaa12772eb1d06a57451e64f70689d3183f0115
2021-06-04 16:17:32 -04:00
Chih-hung Hsieh
041770b553 Merge "Add new Asm/C++/Java/Make warning patterns" 2021-06-02 21:37:04 +00:00
Chih-Hung Hsieh
5d9ee04f56 Add new Asm/C++/Java/Make warning patterns
* Change some incorrectly-classified logtags warnings to C++.
* Fix gpylint warnings of long lines in html_writer.py.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I98c01dadfd72b202d81ef7c94e93c42182f6065c
2021-06-02 21:34:49 +00:00
Mohammad Islam
dfa58118a6 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" 2021-06-02 10:01:19 +00:00
Treehugger Robot
a7f8c55374 Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" 2021-06-02 02:55:07 +00:00
Yuntao Xu
f6cff22181 Merge "add LOCAL_DISABLE_TEST_CONFIG logic" 2021-06-01 22:11:59 +00:00
Colin Cross
54b437286b Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" 2021-06-01 17:25:02 +00:00
Jeongik Cha
f93c13d51b RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED
In the case of unbundled build, the module in vendor should use
system(_ext) module by prebuilt one. But RRO depends on system module
directly depending on some conditions(packages exporting resources)

In this change,
 1. Temporarily make LOCAL_RES_LIBRARIES empty(For now, auto generated
 RRO doesn't use overlaid package's resources), enable it when prebuilts
 are ready.
 2. According to (1), its SDK_VERSION can be current)

Bug: 187404676
Test: TARGET_BUILD_UNBUNDLED_IMAGE m vendorimage, and check if there is
no build error regarding RRO.

Change-Id: I94e3122372dd20c942b2c858070a6ca797312792
2021-06-02 00:01:01 +09:00
Tianjie Xu
5260f435a3 Merge "Enable a prop to determine the new figerprint is enabled" 2021-06-01 04:31:07 +00:00
Colin Cross
45efdc4e0e Support all active codenames for BOARD_SYSTEMSDK_VERSIONS
Use PLATFORM_VERSION_ALL_CODENAMES to construct PLATFORM_SYSTEMSDK_VERSIONS
so that both S and T are accepted while T is active but S is not finalized.

Bug: 186121492
Test: treehugger
Change-Id: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
2021-05-27 13:27:23 -07:00
Jaegeuk Kim
d56fb727ba Merge changes from topic "f2fs-system"
* changes:
  Enable f2fs compression for other partitions
  Enable --readonly for system compression
2021-05-27 18:42:28 +00:00
Michael Butler
63d66d3fe1 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" 2021-05-27 18:05:25 +00:00
Yuntao Xu
32a085c041 add LOCAL_DISABLE_TEST_CONFIG logic
Disable the generation of .config file when the variable
LOCAL_DISABLE_TEST_CONFIG is true.

Bug: 188927912
Test: rum 'm module-name' (`android_test_helper_app` type module)
Test: TreeHugger
Change-Id: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
2021-05-27 10:19:48 -07:00
Tianjie Xu
f4ca0567dd Merge "Check super size for factory OTA at build time" 2021-05-26 21:33:14 +00:00
Kelvin Zhang
ea7c944d62 Merge "Validate AVB props in vbmeta image" 2021-05-26 20:41:17 +00:00
Martin Stjernholm
e2077b5e3b Merge "Move logic to disable flattening in unbundled app mode from Soong to make." 2021-05-26 18:21:44 +00:00
Tianjie
c3b841a422 Enable a prop to determine the new figerprint is enabled
VTS and some other tests would replace the system images with GSI. To
put the correct fingerprint in the test report, we need to know if the
new fingerprint format is in use. So, add a vendor build prop.

OEMs are reponsible for setting this build prop, or using other ways
to put the correct fingerprint in the test report.

Bug: 188824341
Test: boot the device, check build prop
Change-Id: I6bc7f01903865fc2c256d209debdab68cd9d1bb3
2021-05-26 11:19:45 -07:00
Kelvin Zhang
4093d60f35 Validate AVB props in vbmeta image
Bug: 183055693
Test: th
Test: validate_target_files signed-redfin-target_files-7119741.zip

Change-Id: I027d474ba3eb6af5e05866551ff9ea506825a326
2021-05-26 17:59:24 +00:00
Martin Stjernholm
421990d4a4 Move logic to disable flattening in unbundled app mode from Soong to
make.

Avoids TARGET_FLATTEN_APEX lying about it, so we can trust it in
scripts, e.g. in art/build/apex/runtests.sh.

Test: banchan com.android.art; art/build/apex/runtests.sh
Bug: 179900989
Change-Id: I5d3226047e51a51ee76de2cbfad050e200568655
2021-05-26 11:55:33 +01:00
Jaegeuk Kim
1369654d8d Enable f2fs compression for other partitions
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I231f7a2b808cc792fd582cd444825e4a47722984
2021-05-25 14:54:45 -07:00
Jaegeuk Kim
46e0ea2ce1 Enable --readonly for system compression
This option is to reduce system partition size.

Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Idc849cfce33ac0badb2b9b7953bb821c46a24472
2021-05-25 14:50:04 -07:00
Bowgo Tsai
d33ceee8e9 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" 2021-05-25 15:24:26 +00:00
Treehugger Robot
38d4a2a19e Merge "[memtag] Disable memtag for AndroidMk host modules." 2021-05-25 04:05:59 +00:00
Mitch Phillips
b71a875bba [memtag] Disable memtag for AndroidMk host modules.
BUILD_HOST_EXECUTABLE modules are substantially deprecated, but some
partners are still using them for their bits with the workaround
provided in the product definition. This fixes a build error where
the host module doesn't have a linkable ELF note archive.

MTE is not intended for host modules, and it's fine for us to say
"host module using AndroidMk - no MTE for you" if this changes.

Test: Manually tested using a BUILD_HOST_EXECUTABLE module.
Change-Id: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
2021-05-24 18:41:15 +00:00
Calin Juravle
e9423b0b09 Merge "Add pm.dexopt.cmdline mapping in product config" 2021-05-24 15:06:35 +00:00
Michael Butler
f791bfa15c Revert "Add new llndk library, libneuralnetworks_shim.so"
This reverts commit 8685248a99.

Reason for revert: Removing libneuralnetworks_shim.so from Android S

Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
Merged-In: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
2021-05-21 19:58:01 +00:00
Bowgo Tsai
cf9ead8972 Support AVB signing for BOARD_PREBUILT_BOOTIMAGE
Devices using GKI architecture will use a prebuilt boot.img.
However, we should still sign this prebuilt boot.img with
device-specific AVB keys.

Steps to test the CL.
1. In a device BoardConfig.mk:

   # Uses a prebuilt boot.img
   TARGET_NO_KERNEL := true
   BOARD_PREBUILT_BOOTIMAGE := device/google/redbull/boot.img

   # Enable chained vbmeta for the boot image.
   # The following can be absent, where the hash descriptor of the
   # 'boot' partition will be stored then signed in vbmeta.img instead.
   BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
   BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA4096
   BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
   BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2

2. `make bootimage`, then `avbtool info_image --image $OUT/boot.img`,
    checks the image is re-signed with a device-specific key

3. `make dist` to generate out/dist/TF.zip

4. `unzip out/dist/TF.zip IMAGES/boot.img`

5. `avbtool info_image --image out/dist/IMAGES/boot.img`,
    checks the image is re-signed with a device-specific key

6. `sign_target_files_apks \
      --avb_boot_key=external/avb/test/data/testkey_rsa8192.pem \
      --avb_boot_algorithm=SHA256_RSA8192 \
      --avb_boot_extra_args="--prop test:sign" \
      ./out/dist/*-target_files-eng.*.zip signed.zip`, resign the TF.zip

7. `unzip signed.zip IMAGES/boot.img`, then use `avbtool info_image` to
   check the boot.img is re-signed with the --avb_boot_key in step 6.

Bug: 188485657
Test: above steps
Change-Id: I7ee8b3ffe6a86aaca34bbb7a8898a97b3f8bd801
2021-05-21 08:44:37 +00:00
Ulyana Trafimovich
3ff3f1088d Merge "Disable <uses-library> checks for more tests (to fix MTS builds)." 2021-05-20 09:08:31 +00:00
Jingwen Chen
ec11d42e3b Merge "Introduce b into envsetup.sh." 2021-05-19 22:41:30 +00:00
Ulya Trafimovich
d5e6a7c620 Disable <uses-library> checks for more tests (to fix MTS builds).
Bug: 132357300
Bug: 188648210
Test: lunch aosp_cf_x86_64_phone-userdebug && m mts
Change-Id: Iae0ecac076b351b2da929bb455f00f03ece130bd
2021-05-19 18:10:28 +01:00
Tim Van Patten
ea48214581 Merge "Remove building the ANGLE APK from AOSP" 2021-05-19 15:40:27 +00:00
Calin Juravle
ccb4cdc7f6 Add pm.dexopt.cmdline mapping in product config
Test: boot
Bug: 188655918
Change-Id: I527a71d0acec0ba6593b2da1fd13818cba3b4832
2021-05-19 15:27:02 +00:00
Kelvin Zhang
51c8f9f34c Merge "Expose ota_metadata_proto for consumption" 2021-05-19 12:59:43 +00:00
Jingwen Chen
d728ee1a06 Introduce b into envsetup.sh.
`b` is a function that combines:

1. Integrated generation of a synthetic bazel workspace, containing
symlinks to BUILD and bzl files alongside symlinks to the source tree.
This is the --package_path of the bazel build.
2. Running the Bazel build itself with b's entire argv.

A user accustomed to typing `bazel build <targets>` would
now type `b build <targets>`.

Test: source build/envsetup.sh; b build //bionic/...; b cquery --output=label_kind //bionic/...
Fixes: 188490434
Change-Id: I36e366108b024c09945d764a1115786658e03681
2021-05-18 23:37:39 +00:00
Tim Van Patten
e6d2d6c3dd Remove building the ANGLE APK from AOSP
Mark ANGLE as product-specific and remove building the APK. CuttleFish
will continue to build the ANGLE libraries directly.

Bug: b/187342779
Test: launch_cvd --restart_subprocesses=false --start_webrtc=true --gpu_mode=guest_swiftshader
Change-Id: I6cd379a11e0c198ad72636253f1a33f2d1fc798f
2021-05-18 11:58:23 -06:00
Mohammad Islam
2b85e3ace5 Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""
This reverts commit b695e761f1.

Reason for revert: b/185708645 has been fixed

Bug: 169780183
Bug: 185708645
Change-Id: If0ea1168c710eeb4c90d7a9768a278a07adc48fa
Test: Manually updated APEX with same version via OTA/adb-remount and observed it was decompressed.
2021-05-18 17:45:07 +00:00
Hsin-Yi Chen
abd0ea8743 Merge "Add GKI to generic x86_64 board" 2021-05-18 05:16:42 +00:00
Hsin-Yi Chen
b212b0a92a Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
2021-05-18 02:30:50 +00:00
Tianjie Xu
77e0d86f26 Merge "When checking if mke2fs is used, compare using basename" 2021-05-18 02:10:02 +00:00
SzuWei Lin
5b77e84a6d Merge "Move GKI common settings to BoardConfigGkiCommon.mk" 2021-05-18 00:26:12 +00:00
Christian Wailes
6f21097ca5 Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" 2021-05-17 16:15:40 +00:00
Treehugger Robot
ab85371d18 Merge "BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root" 2021-05-17 04:20:22 +00:00
SzuWei Lin
a74ea7e569 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-17 01:53:17 +00:00
Treehugger Robot
20fed4ad29 Merge "check_target_files_signatures actually needs aapt2, not aapt." 2021-05-15 00:36:09 +00:00
Elliott Hughes
16a5cac394 check_target_files_signatures actually needs aapt2, not aapt.
Test: treehugger
Change-Id: Ia0ff6d16a64f96fd9e2b9d33711cc9b94734c4ff
2021-05-14 15:27:23 -07:00