Commit Graph

61758 Commits

Author SHA1 Message Date
Xin Li 37a9f38115 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:03:45 +00:00
Tianjie Xu 8bbb67dff2 Merge "Add per-partition build info into ota metadata" am: f55227e25f
Original change: https://android-review.googlesource.com/c/platform/build/+/1415310

Change-Id: Idfb0daf31f379d1470ef8593c2b4e83a865d7fdd
2020-09-01 19:00:52 +00:00
Tianjie Xu f55227e25f Merge "Add per-partition build info into ota metadata" 2020-09-01 18:43:30 +00:00
Martin Stjernholm 35bf7d7eba Merge "Preserve symlinks in the Soong prebuilt install steps for host binaries and shared libs." am: a24c0fe655
Original change: https://android-review.googlesource.com/c/platform/build/+/1406918

Change-Id: I75fd8ce6cea8e3a05e66ce87c5cddd35f61c62ba
2020-09-01 10:49:23 +00:00
Martin Stjernholm a24c0fe655 Merge "Preserve symlinks in the Soong prebuilt install steps for host binaries and shared libs." 2020-09-01 10:32:49 +00:00
Treehugger Robot 3774e60aac Merge "Unset USE_GOMA when using RBE." am: 2a476f6908
Original change: https://android-review.googlesource.com/c/platform/build/+/1411867

Change-Id: I961f80aef0d7f0eccab0187c90bd207be4aa5ec6
2020-09-01 06:56:08 +00:00
Treehugger Robot 2a476f6908 Merge "Unset USE_GOMA when using RBE." 2020-09-01 06:23:02 +00:00
Treehugger Robot 4123d88e14 Merge changes I9663220b,I15ced0ac am: fbecdcf958
Original change: https://android-review.googlesource.com/c/platform/build/+/1414169

Change-Id: I81a5a179b912b402effa945adc8ffcee032b0093
2020-09-01 05:55:52 +00:00
Treehugger Robot fbecdcf958 Merge changes I9663220b,I15ced0ac
* changes:
  Fix BOARD_PREBUILT_(VENDOR|ODM)_DLKMIMAGE support in target-files.zip
  Fix incorrect conditional comment in target-files.zip rule
2020-09-01 05:13:31 +00:00
Tianjie Xu ed9789d4b8 Merge "Add more enums to the ota type" am: 6f2a44a0d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1416508

Change-Id: I6e358519c6660462a54d3c8036a49a0c779500a1
2020-09-01 04:00:50 +00:00
Tianjie Xu 6f2a44a0d9 Merge "Add more enums to the ota type" 2020-09-01 03:16:59 +00:00
Colin Cross 6af7cbe855 Fix BOARD_PREBUILT_(VENDOR|ODM)_DLKMIMAGE support in target-files.zip
BOARD_PREBUILT_ODM_DLKMIMAGE support seems to have been forgotten
in target-files.zip, and BOARD_PREBUILT_ODM_DLKMIMAGE support had
a typeo.

Test: treehugger
Change-Id: I9663220b43f0df4f39a7ef432ad4cfec39803a20
2020-09-01 01:26:50 +00:00
Colin Cross a6de2ada15 Fix incorrect conditional comment in target-files.zip rule
Test: none
Change-Id: I15ced0acc9cf6f56c5094bb8e5aaa3957a9648cb
2020-09-01 01:26:33 +00:00
Treehugger Robot 6cea038dfe Merge "Add bootloader to droidcore if built" am: c73b31bf2a
Original change: https://android-review.googlesource.com/c/platform/build/+/1416388

Change-Id: I70d080749b3eb6de180e77a25a45feea6de699ed
2020-09-01 01:05:35 +00:00
Treehugger Robot c73b31bf2a Merge "Add bootloader to droidcore if built" 2020-09-01 00:33:40 +00:00
Martin Stjernholm 49a4e9b52e Preserve symlinks in the Soong prebuilt install steps for host binaries
and shared libs.

If a prebuilt module file is a symlink in the .intermediates tree it is
preserved when copied to the final install location. This preserves
symlinks to prebuilt binaries, so that they are run from their prebuilt
source location and can find libraries in relative paths from there.

Symlinks are converted to absolute, to not fail if they are relative in
the source tree.

Test: m clean && m droid dist checkbuild
  with and without the change, then compare the lists of symlinks in
  the out/ trees
Test: build/soong/soong_ui.bash --make-mode \
    TARGET_PRODUCT=crosshatch_hwasan TARGET_BUILD_VARIANT=userdebug \
    droid SANITIZE_TARGET=hwaddress \
    continuous_instrumentation_tests_api_coverage \
    continuous_native_tests device-tests platform_tests
  check that libclang_rt.hwasan_static-aarch64-android.a isn't a
  symlink in out/target/product/crosshatch/obj
Bug: 145934348
Change-Id: I7600e5b0754f8ea6cd0ffc8e1ba6d39153f182aa
2020-09-01 00:24:54 +01:00
Tianjie 2bb14864e0 Add per-partition build info into ota metadata
As part of the ota metadata work to support partial update, we should
add the per-partition device name, fingerprint, and version to the ota
metadata.

Bug: 151088567
Bug: 166154730
Test: unit tests pass, generate a package
Change-Id: I7a71a4860aad651daf9e62df39c60d72727c14ff
2020-08-31 14:17:10 -07:00
Tianjie d5563371d4 Add more enums to the ota type
We'd better have a default type for enums. It's safe to change the
proto definition now since no one is parsing the new meta.

Also add the brick type for manually generated brick pkgs.

Bug: 166154730
Test: unit tests pass
Change-Id: Ie6d4e695c298313276b559601509c9a7a7ee91b1
2020-08-31 14:06:31 -07:00
Ram Muthiah 9fe40ca37b Add bootloader to droidcore if built
Non-dist builds don't copy out the bootloader.
This change fixes that.

Bug: 167160541
Bug: 164917252
Test: local build
Change-Id: I9bab9ba3455e8abee9e7a38bff431a142e7d5a57
2020-08-31 19:31:50 +00:00
Colin Cross 3a6e1ec965 Merge "Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true" am: 8b21e4e7d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1414693

Change-Id: I29547f61db2e2f00c436cec5e0da236d7f1a3953
2020-08-31 04:51:05 +00:00
Colin Cross 8b21e4e7d4 Merge "Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true" 2020-08-31 04:20:18 +00:00
Xin Li c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Treehugger Robot 7db84e82b5 Merge "Switch to aapt2" am: 002863d698
Original change: https://android-review.googlesource.com/c/platform/build/+/1414609

Change-Id: I4037e1927df08e34ebaca476a4951b85c323156b
2020-08-29 00:43:55 +00:00
Treehugger Robot 002863d698 Merge "Switch to aapt2" 2020-08-29 00:30:28 +00:00
Kelvin Zhang f5f3eaf01c Switch to aapt2
We already moved to aapt2 in Android.bp, no aapt binary in otatools.zip.
So tests should be updated accordingly.

Test: unittest
Change-Id: I29776d75e108e16bcceda49b8be47a338ee8bc1c
2020-08-28 17:40:29 -04:00
Colin Cross b0f3a4d04c Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true
The platform availability check was erroring incorrectly for the
libstatssocket module in master-art-host builds.  Nothing being
built depended on libstatssocket, but the check would still
error because libstatspull_test was defined in the branch but
unused in the build.

When ALLOW_MISSING_DEPENDENCIES=true is set and a module fails
the check add an additional dependency on a rule that prints
the error message.  This will show the error and fail the build
if an unavailable module is requested to be installed, while
allowing the build to proceed if there are no unavailable
modules in the dependency graph.

Fixes: 154888298
Test: m build-art-host TARGET_BUILD_UNBUNDLED=true ALLOW_MISSING_DEPENDENCIES=true libstatspull_test -k
Test: m build-art-host TARGET_BUILD_UNBUNDLED=true ALLOW_MISSING_DEPENDENCIES=true
Change-Id: I1d57afe60a75d65128e59f794243a0414cbc82f6
2020-08-28 13:32:20 -07:00
Treehugger Robot 589439eadf Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" am: 947cb0fd87
Original change: https://android-review.googlesource.com/c/platform/build/+/1404655

Change-Id: I168a038826b5f62b74753f9c01d97d294f30eed7
2020-08-28 04:42:47 +00:00
Ram Muthiah fe24aafffe Merge "Revert "Revert "Add prebuilt bootloader var and add bootloader t..."" am: 2ad69ab090
Original change: https://android-review.googlesource.com/c/platform/build/+/1412074

Change-Id: I5187d7afec3b7b08f6b62b6822a48a9d1713e654
2020-08-28 04:42:37 +00:00
Treehugger Robot 947cb0fd87 Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" 2020-08-28 04:26:49 +00:00
Ram Muthiah 2ad69ab090 Merge "Revert "Revert "Add prebuilt bootloader var and add bootloader t..."" 2020-08-28 04:04:24 +00:00
Treehugger Robot 696a64b2ab Merge "Fix HOST_CROSS_OUT" am: bcb644ee3f
Original change: https://android-review.googlesource.com/c/platform/build/+/1409827

Change-Id: If07afa3a16bbf74b856b4d7e1a0528553b5f0db6
2020-08-28 00:06:09 +00:00
Treehugger Robot bcb644ee3f Merge "Fix HOST_CROSS_OUT" 2020-08-27 23:50:55 +00:00
Jaewoong Jung 1d5f659946 Merge "Deduplicate my_compat_dist entries globally." am: 3a4307d237
Original change: https://android-review.googlesource.com/c/platform/build/+/1413709

Change-Id: Ib6ac3229e889945c026fd061a0f05220feafb011
2020-08-27 23:34:12 +00:00
Jaewoong Jung 3a4307d237 Merge "Deduplicate my_compat_dist entries globally." 2020-08-27 22:44:40 +00:00
Ram Muthiah 0c4a352409 Revert "Revert "Add prebuilt bootloader var and add bootloader t..."
Revert submission 1411608-revert-1402265-cf-x86-bootloader-XGKLNEQAPF

Reason for revert: Breakage originally caused by change was fixed. Refer to tracking bug for details.
Reverted Changes:
I89e95d4a6:Revert "Add prebuilt bootloader var and add bootlo...
I8fe199351:Revert "Added bootloader binary to cf x86 based ta...

Bug: 166380489
Bug: 164917252
Test: local build and Treehugger build
Change-Id: Ia895aedd77f2ec825aefecaf74c6dfc1ce631c93
2020-08-27 13:18:24 -07:00
Jaewoong Jung 046702a6ef Deduplicate my_compat_dist entries globally.
Fixes: 164319611
Test: m TARGET_PRODUCT=aosp_x86_64 mts dist
Change-Id: Ie47e355ded0ce0221988a405fc77546a4a752c38
2020-08-27 13:10:40 -07:00
Tianjie Xu 9e302c8c78 Merge "Define the protobuf for OTA metadata" am: 0068973f73
Original change: https://android-review.googlesource.com/c/platform/build/+/1401993

Change-Id: I67ff8fcaafd0961f75cbf8205007cb97e1a1d135
2020-08-27 18:39:24 +00:00
Tianjie Xu 0068973f73 Merge "Define the protobuf for OTA metadata" 2020-08-27 18:21:29 +00:00
Tianjie a2076137a1 Define the protobuf for OTA metadata
Background in http://go/android-partial-updates. For partial update
(e.g. system-only) or devices with mixed build, the current
fingerprint & device name no longer suffice as the precondition to
install the package.

Therefore, we need to additionally include the per-partition build
props into the ota metadata. We also define a protobuf for the metadata
so it can be extended later. The metadata of the legacy format is also
kept for backward compatibility.

Bug: 151088567
Test: unittest pass, generate an OTA and check the result
Change-Id: I716f7da54a393cd340280dbddc3c92b3460f8ef8
2020-08-26 16:17:35 -07:00
Kelvin Zhang 01668e0131 Merge "Fix lint errors on ota_utils.py" am: ff2c7454fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1405249

Change-Id: Iffbf9af9e34a5840f440b84bd7ed5bd6ca81384c
2020-08-26 13:58:10 +00:00
Kelvin Zhang ff2c7454fe Merge "Fix lint errors on ota_utils.py" 2020-08-26 13:34:19 +00:00
Ramy Medhat fe66d3992b Unset USE_GOMA when using RBE.
Test: Ran rbesetup.sh after setting USE_GOMA
Change-Id: Idf6c1b4f7591aed96d5365e461260060004d4494
2020-08-26 05:47:33 -04:00
Ankit Goyal 5b26b37ab1 Merge "Revert "Add prebuilt bootloader var and add bootloader to img zip"" am: 3c94b2710a
Original change: https://android-review.googlesource.com/c/platform/build/+/1411607

Change-Id: Id56f23e8b80f98e3932b6203b14373e7722175a3
2020-08-26 07:09:38 +00:00
Ankit Goyal 3c94b2710a Merge "Revert "Add prebuilt bootloader var and add bootloader to img zip"" 2020-08-26 06:54:34 +00:00
Ankit Goyal 6805873751 Revert "Add prebuilt bootloader var and add bootloader to img zip"
Revert submission 1402265-cf-x86-bootloader

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=adt3-userdebug&lkgb=6791187&lkbb=6791249&fkbb=6791216, bug 166380489
Reverted Changes:
Id67b7bddd:Add prebuilt bootloader var and add bootloader to ...
Id713eaf20:Added bootloader binary to cf x86 based targets

Change-Id: I89e95d4a6a0534c8217785be9b90632fa110bc41
2020-08-26 06:40:59 +00:00
Treehugger Robot f1a95d357b Merge "build_image relies on mkuserimg_mke2fs." am: ff6d873873
Original change: https://android-review.googlesource.com/c/platform/build/+/1410752

Change-Id: I148f1257ab3a72a61579050f71188610d56c54f2
2020-08-26 05:21:12 +00:00
Treehugger Robot ff6d873873 Merge "build_image relies on mkuserimg_mke2fs." 2020-08-26 04:46:56 +00:00
Ram Muthiah fd32381b72 Merge "Add prebuilt bootloader var and add bootloader to img zip" am: 861f05fb83
Original change: https://android-review.googlesource.com/c/platform/build/+/1406247

Change-Id: I159a8e5c68fe70301c81ce88f21c70e8486447e4
2020-08-26 03:46:09 +00:00
Ram Muthiah 861f05fb83 Merge "Add prebuilt bootloader var and add bootloader to img zip" 2020-08-26 02:59:22 +00:00
Yifan Hong 770234520d build_image relies on mkuserimg_mke2fs.
Add missing dependency.

Test: TH
Bug: 162921175
Change-Id: Ide1fe0b823e5e7a06c6c0252a5bef7bfaf6f7c28
2020-08-25 16:15:30 -07:00