Commit Graph

62373 Commits

Author SHA1 Message Date
Treehugger Robot ab222e8a7f Merge "Add test_mainline_modules option support in mk" am: 897cfaee46
Original change: https://android-review.googlesource.com/c/platform/build/+/1413947

Change-Id: I1688ae7c3bb013eed0a3b5fa148811e0d7c50e04
2020-09-09 08:06:35 +00:00
Treehugger Robot 897cfaee46 Merge "Add test_mainline_modules option support in mk" 2020-09-09 07:36:11 +00:00
Treehugger Robot ab45f8b97c Merge "llkd: moved from optional to required component" am: e1239cd1ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I9c651d8a902c5fe7fc77a7ae0d2ef73593eebc1a
2020-09-08 18:58:12 +00:00
Treehugger Robot e1239cd1ad Merge "llkd: moved from optional to required component" 2020-09-08 18:26:07 +00:00
Mark Salyzyn fbb45227c0 llkd: moved from optional to required component
The Live Lock Killer Daemon (llkd) has provided enough hero moments to
improve system stability, by providing actionable collection of data
to resolve kernel, and some user space, misbehaviors.  It is time to
move llkd to a required component.

NB: For llkd to be effective at finding real kernel live lock
conditions, system requirements are that there are no more un-waited
for Zombie processes, and that no kernel drivers use indeterminate
periods of uninterruptible sleep.  Any kernel and user space tasks
that are killed because of suspicious behavior, must themselves have
a benefactor to restart them if necessary.  If a true live lock is
discovered, data will be collected and the kernel will be panic'd to
recover from the situation.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 164946924
Test: llkd is ever present on a release build.
Change-Id: I986a8545252bc5b68d09a6a0f4f506a58998c8a0
2020-09-08 07:58:16 -07:00
Treehugger Robot dc7ff33e38 Merge "Set PRODUCT_PRODUCT_VNDK_VERSION from product_config.mk" am: 6a052b1118
Original change: https://android-review.googlesource.com/c/platform/build/+/1420908

Change-Id: I22f04a976e81f73523a42829b862c02692d55b00
2020-09-08 04:47:54 +00:00
Treehugger Robot 633cebaa33 Merge "fix a typo for single PRODUCT_PRODUCT_VNDK_VERSION" am: cd2430855d
Original change: https://android-review.googlesource.com/c/platform/build/+/1420010

Change-Id: I5e4ca4773a89f5f3ef35abab53fda7e09ae886ed
2020-09-08 04:47:40 +00:00
Treehugger Robot 6a052b1118 Merge "Set PRODUCT_PRODUCT_VNDK_VERSION from product_config.mk" 2020-09-08 04:30:04 +00:00
Treehugger Robot cd2430855d Merge "fix a typo for single PRODUCT_PRODUCT_VNDK_VERSION" 2020-09-08 04:30:04 +00:00
Justin Yun 70f7dbaf21 Set PRODUCT_PRODUCT_VNDK_VERSION from product_config.mk
As a product variable, PRODUCT_PRODUCT_VNDK_VERSION cannot be defined
in config.mk. Instead it can be defined from product_config.mk.

Bug: 144534640
Test: check if the following command returns empty value
      $ PRODUCT_USE_PRODUCT_VNDK_OVERRIDE=false \
        get_build_var PRODUCT_PRODUCT_VNDK_VERSION
Change-Id: I304fb980610aec1dd5da05864b4c137997fc9aff
2020-09-07 19:29:45 +09:00
Kelvin Zhang 7a1364a36a Merge "Generate partition timestamps in ota_from_target_files" am: 49fe034137
Original change: https://android-review.googlesource.com/c/platform/build/+/1402687

Change-Id: I23b48a511fded51330d7620ec748d36225175e2f
2020-09-04 12:37:45 +00:00
Kelvin Zhang 49fe034137 Merge "Generate partition timestamps in ota_from_target_files" 2020-09-04 12:22:22 +00:00
GeQi 6e44e3d1e4 fix a typo for single PRODUCT_PRODUCT_VNDK_VERSION
Bug: 144534640
Test: build

Signed-off-by: GeQi <geqi@xiaomi.com>
Change-Id: I5bf47abd70e84e89930846c25b2592dac1100082
2020-09-04 14:08:57 +08:00
Kelvin Zhang 39aea44a96 Generate partition timestamps in ota_from_target_files
Test: make an OTA package
Bug: 162553432
Change-Id: I17b9f1b24307255b1e5115de12fa516126b32365
2020-09-03 14:04:21 -04:00
Colin Cross b7c32f9021 Merge changes I3aa24904,I1f942dc0,If51d0f53,Ie27bdbd2 am: b9d0a2d4d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1414178

Change-Id: I2b847ec608567e0125586ccf02cc1b16d9ebe645
2020-09-03 17:11:02 +00:00
Colin Cross b9d0a2d4d5 Merge changes I3aa24904,I1f942dc0,If51d0f53,Ie27bdbd2
* changes:
  Remove target-files-package from PARSE_TIME_MAKE_GOALS
  Make dist zip files depend on files instead of images
  Make dependencies of target-files.zip conditional
  Remove INSTALLED_VBMETAIMAGE_TARGET dependency from target-files.zip
2020-09-03 16:56:39 +00:00
Treehugger Robot 9202357764 Merge "AutoGen: Support NativeTest with vendor namespace." am: 89d7b8aef7
Original change: https://android-review.googlesource.com/c/platform/build/+/1398277

Change-Id: I4da6ea04364c251fcb849a9b7d8b5c113ce38e15
2020-09-03 03:07:05 +00:00
kellyhung 0ba6ec6f49 Add test_mainline_modules option support in mk
Bug: 165425972
Test: Apply aosp/1418212
      atest -b hello_world_test
      Check module-info.json for hello_world_test HelloWorldTests and
HelloWorldHostTest

Change-Id: Ie30a09a54b0ae927ca4d8d1aaba2ac0cdb15233a
2020-09-03 02:37:44 +00:00
Treehugger Robot 89d7b8aef7 Merge "AutoGen: Support NativeTest with vendor namespace." 2020-09-03 02:26:10 +00:00
Colin Cross 4cca7b1e20 Merge "Use rules to create partition compatibility symlinks" am: 801e69696e
Original change: https://android-review.googlesource.com/c/platform/build/+/1412822

Change-Id: Ic6613b9da1c1174ac63e1b6f1ea440b2c242fa99
2020-09-02 23:35:07 +00:00
Colin Cross e0dbbd4e9e Remove target-files-package from PARSE_TIME_MAKE_GOALS
It isn't doing anything useful that would be necessary to reparse the
Makefiles for.

Test: m target-files-package
Change-Id: I3aa2490480de8dbe0e57fe36221088c3f18017cb
2020-09-02 23:16:28 +00:00
Colin Cross cda30c73c9 Make dist zip files depend on files instead of images
Depend on the files instead of images so that the dist zip files
can run in parallel with the image generation rules.

Test: treehugger
Change-Id: I1f942dc0ce0a2cbc5288c1f0633ea1019e77f91c
2020-09-02 23:16:20 +00:00
Colin Cross 43f2eb286a Make dependencies of target-files.zip conditional
Depend on the files going into the images instead of the images
themselves when the images are not prebuilts.  This will allow
paralellizing image generation with target-files.zip.

Test: treehugger
Test: m installclean && m target-files-package has same files before and after
Change-Id: If51d0f53602c08bd946ec34a2edae6f9d95f7bf8
2020-09-02 23:16:12 +00:00
Colin Cross 8d900929c7 Remove INSTALLED_VBMETAIMAGE_TARGET dependency from target-files.zip
Remove the INSTALLED_VBMETAIMAGE_TARGET, which depends on all the
other images, it is no longer necessary after
If1eff317621882994e7dcbf37cd35f5bfa16b69a.  This will allow the
next change to parallelize target-files.zip with the image generation
rules.

Test: treehugger
Change-Id: Ie27bdbd2d414e9b475823639a1b3944fe0756d2a
2020-09-02 23:16:04 +00:00
Colin Cross 801e69696e Merge "Use rules to create partition compatibility symlinks" 2020-09-02 23:15:50 +00:00
Xin Li 63e74fdff1 Revert BUILD_ID to previous value.
Bug: 167588565
Merged-In: I18496607c8a94b818cb83a63694fd384a18d48a3
Change-Id: Ia302b3004a2d6e1c2bd9d77beac09e8199ffdf78
2020-09-02 11:58:35 -07:00
Xin Li b22595a802 Mark RP1A.200720.001 as merged
Bug: 167588565
Merged-In: I6f4e173192db664d5d1462179b5b44b821596674
Change-Id: I275650e8fde015c6955cb7e4eef2e083e42abc14
2020-09-02 11:44:48 -07:00
Tim Van Patten 288133d95d Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I6f4e173192db664d5d1462179b5b44b821596674
2020-09-02 15:55:50 +00:00
Tim Van Patten 27ca29a3c7 Merge "Indicate ANGLE is present on devices" 2020-09-02 14:47:47 +00:00
Treehugger Robot 5040d41e20 Merge "Add ota_metadata_pb2 to otatools.zip" am: 58c793ab0b
Original change: https://android-review.googlesource.com/c/platform/build/+/1416089

Change-Id: I77eeb78be1bcdfdae0a7f7b942af0a0307e1cc75
2020-09-02 12:56:13 +00:00
Treehugger Robot 58c793ab0b Merge "Add ota_metadata_pb2 to otatools.zip" 2020-09-02 09:35:10 +00:00
Emilian Peev 208bbdd21b Cherry-pick spirit of 23abbfeb4b
(Revert "Add libdepthphoto to mainline_system")

Bug: 167450283
Fixed: 167450283
Merged-In: Id2013f80dbc962f70ccb1b687c0dc18fef372348
Change-Id: Id2013f80dbc962f70ccb1b687c0dc18fef372348
2020-09-01 23:25:07 +00:00
Kelvin Zhang 4d50ea4dd7 Add ota_metadata_pb2 to otatools.zip
Sometimes tests are being run by executing python -m unittest *.py. In
that case, invocation will fail due to missing ota_metadata_pb2, which
is auto generated from ota_metadata.proto(added in recent change).

Bug: 166718341
Test: unzip otatools.zip and python releasetools/test_utils.py
Change-Id: I597c7ef6dbd8e46ccde020b3122cc38a8df28dc9
2020-09-01 16:58:08 -04:00
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
Tim Van Patten d38244210f Indicate ANGLE is present on devices
The system property ro.gfx.angle.supported needs to be enabled when
ANGLE is included in a build to indicate to the platform and CTS tests
that ANGLE is present on the device.

Test: atest CtsAngleIntegrationHostTestCases
Bug: 157670307
Merged-in: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
Change-Id: I72ba8731fed36dbc594dae88aaa00a6299e8f4ae
2020-09-01 13:26:18 -06: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
yangbill 85146e5e82 AutoGen: Support NativeTest with vendor namespace.
Set the TEST_ROOT to /data/local/tmp/tests/vendor if LOCAL_VENDOR_MODULE or
LOCAL_USE_VNDK be set, if not, set to /data/local/tmp.

Bug: 138450837
Test: atest binderVendorDoubleLoadTest
Change-Id: I66437816227458a4f5672146b0c9e465c843aa50
2020-09-01 10:33:47 +08: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