Commit Graph

7420 Commits

Author SHA1 Message Date
Treehugger Robot 306a6d1fcc Merge "Keystore 2.0: Enable keystore2 by default" 2021-03-19 16:06:00 +00:00
TreeHugger Robot 7830c4a383 Merge "Keystore 2.0: Enable keystore2 by default" into rvc-qpr-dev-plus-aosp 2021-03-19 15:05:00 +00:00
Przemysław Szczepaniak 8685248a99 Add new llndk library, libneuralnetworks_shim.so
libneuralnetworks_shim.so allows vendor service to run
a NNAPI Driver sAIDL service backed by a NNAPI SL Driver.
SL Driver is a shared library with a known stable C API,
that contains vendor driver implementation.

libneuralnetworks_shim.so is part of com.android.neuralnetworks
APEX package.

Test: run VTS driver sample backed by shim on CF
Bug: 172925288
Change-Id: Ibbb0af00377a2ade212740b61158274a6942be9d
2021-03-19 13:27:17 +00:00
Treehugger Robot 959b7bbca0 Merge "Update size limit for madvising odex, vdex files" am: 6a1722dddd am: 86d7b401dd am: 57c0f5bc8b
Original change: https://android-review.googlesource.com/c/platform/build/+/1646091

Change-Id: I19cebcf85e8b622335ef2167e7134d5e779e029c
2021-03-19 10:49:53 +00:00
Jagadeesh Pakaravoor 3a10cc5c11 Update size limit for madvising odex, vdex files
Update the size limit for madvising (MADV_WILLNEED)
odex and vdex files to 100MB.

Art file continues to be madvised fully, with a UINT_MAX limit.

Test: presubmit
Bug: 178853586
Change-Id: Ie46a0658bf30a6a9908ab30b28ce097e434e7e2d
2021-03-18 15:29:01 -07:00
Janis Danisevskis 74eedd9d30 Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Merged-In: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-18 15:13:40 +00:00
Janis Danisevskis c141b98eb6 Merge "Keystore 2.0: Enable keystore2 by default" into sc-dev 2021-03-18 05:12:56 +00:00
Colin Cross 8e3365e911 Merge "Do not pack symbolic link instead copying" am: 67f1a24b87 am: 04e4646dc9 am: 2f2d2d8614
Original change: https://android-review.googlesource.com/c/platform/build/+/1626199

Change-Id: I694927f50383edfaba419efeef31259ffb7214f5
2021-03-17 16:57:27 +00:00
Janis Danisevskis 88a0602582 Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Merged-In: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-17 08:47:55 -07:00
Janis Danisevskis bee0f15faa Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-16 15:00:10 -07:00
goodway.wang_cp 50acc66276 Do not pack symbolic link instead copying
Change-Id: I43f56276541addfd6063655e53f21fe483780bc1
Signed-off-by: goodway.wang_cp <sz755cp2369@gmail.com>
2021-03-15 17:13:50 +08:00
Treehugger Robot c7a8f50ac5 Merge "Enable madvising of odex, vdex and art files" am: 4d71d70496 am: abdde757dd am: cfe71b4aca
Original change: https://android-review.googlesource.com/c/platform/build/+/1634679

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2390bdeb902f219719bd6ebcbc769e587afa0e38
2021-03-13 04:29:49 +00:00
Treehugger Robot 4d71d70496 Merge "Enable madvising of odex, vdex and art files" 2021-03-13 02:13:52 +00:00
Jagadeesh Pakaravoor bee9f1d3f7 Enable madvising of odex, vdex and art files
Enable madvsing odex, vdex and art files to MADV_WILLNEED by setting the
size limits to UINT32_MAX.

Test: presubmit
Bug: 178853586
Change-Id: I7647a4be214dcd43341f216aba0a7791f877e379
2021-03-12 13:20:09 -08:00
Treehugger Robot 20ddb0d89a Merge "Workaround for existing packages check failure when the `generic` product is used with ART prebuilts." am: 40ea7379a8 am: 1837e64d2d am: 15d6b176ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1622507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cc28d5315947f744f8a23b0e5619ba77838d4ea
2021-03-10 21:59:07 +00:00
Martin Stjernholm e564ec3502 Workaround for existing packages check failure when the `generic`
product is used with ART prebuilts.

The prebuilt packages in packages/modules/ArtPrebuilt don't get
Android.mk entries in the `generic` product (as opposed to e.g.
`aosp_arm`), so the enforce-product-packages-exist check fails there.

Exclude the ART APEX modules from the check as a workaround. It's also
necessary to remove the check for superfluous allow list entries, since
which modules are actually missing depends on many other variables (see
runtime_libart.mk).

Test: m nothing TARGET_PRODUCT=generic \
      SOONG_CONFIG_art_module_source_build=false
Bug: 172480615
Bug: 182105280
Change-Id: Id67278615f3e7c64c7658bbf1b2aa71ed6b381da
2021-03-09 12:49:06 +00:00
TreeHugger Robot 142f2ba684 Merge "update vndk list" into sc-dev 2021-03-03 10:54:57 +00:00
Brad Ebinger 21bf64a70a Remove deprecated RcsService/PresencePolling apps
There is now an AOSP API for RCS UCE, removed the
deprecated RcsService/PresencePolling app targets.

Bug: 178489990
Test: make + inspect build
Merged-In: I0eaa321dfd75de8217c465a523d439ea702deea4
Change-Id: I0eaa321dfd75de8217c465a523d439ea702deea4
2021-03-03 00:47:38 +00:00
Treehugger Robot b1fc88399a Merge "Allow BOARD_VNDK_VERSION to be changed" am: 0181c7d33c am: 0fa0300013 am: 9831e65e7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1608053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d8ef55f5276cf90e77505d9bb91bf1e0ea8b306
2021-03-02 19:54:13 +00:00
Jeongik Cha b84e1deb5e update vndk list
Bug: 150578172
Bug: 180417006
Test: m
Change-Id: I096b2c9f165a88c9725f4c63c87c7a9deab72f72
2021-03-02 22:46:48 +09:00
Inseob Kim 6e7693f159 Allow BOARD_VNDK_VERSION to be changed
Some devices e.g. cuttlefish include BoardConfigMainlineCommon.mk.
This allows BOARD_VNDK_VERSION to be changed other than current, to
allow mixed build experiment with BOARD_VNDK_VERSION.

Test: try setting BOARD_VNDK_VERSION and get_build_var
Change-Id: I7eb7fe6527f24ee2a3b4af32194a48ca98146a78
2021-02-25 21:22:27 +09:00
Roman Kiryanov d3ce517627 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" am: 52037cf027 am: 3cc2b4c489 am: d5fff8a680
Original change: https://android-review.googlesource.com/c/platform/build/+/1605133

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia487f8adaaf04488e68b0d3c65c24ae238484536
2021-02-24 21:54:53 +00:00
Roman Kiryanov 52037cf027 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" 2021-02-24 18:26:30 +00:00
Inseob Kim 6952cb3583 Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"
This reverts commit 05d595194b.

Reason for revert: fixed all goldfish properties

Change-Id: I7b6bf6c4fa94e0d6ba44dbc37b6451291e8fc9ad
2021-02-24 05:27:18 +00:00
TreeHugger Robot 37ce975802 Merge "update vndk list" into sc-dev 2021-02-20 15:29:19 +00:00
Brad Ebinger ee9a6cfcd9 Merge "Remove deprecated RcsService/PresencePolling apps" into sc-dev 2021-02-19 23:12:03 +00:00
Martijn Coenen 12137e3c03 Merge "Add on-device signing binary to base." am: e484f03f0d am: 8ba24df564 am: 26b470ef49
Original change: https://android-review.googlesource.com/c/platform/build/+/1512771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23bd4b5a1a6a01f8898cd989f753ca1d3e168b87
2021-02-19 12:54:04 +00:00
Martijn Coenen e484f03f0d Merge "Add on-device signing binary to base." 2021-02-19 11:31:50 +00:00
Treehugger Robot d080b339c4 Merge "update vndk list" 2021-02-19 11:06:35 +00:00
Jeongik Cha 9cc1af64e7 update vndk list
Bug: 150578172
Test: m
Change-Id: I51f582d85a70313423e81fc34fd3688bcdac9ae1
2021-02-19 11:44:09 +09:00
Jeongik Cha 248ee9f249 update vndk list
Test: m
Bug: 150578172
Change-Id: I98fa56d527124008fc60d60a7f45f200f20e5707
Merged-In: Ic53702ede81f9edbc8e29e92df4470b99b696098
2021-02-17 15:58:18 +00:00
Martin Stjernholm caf5768920 Merge "Move ART APEX selection logic to core make." am: 43d4040f6f am: 41e93101ef am: dc903b73d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1580593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdb8c9256b4d804bed370a85eef3d4bbfd443d9d
2021-02-17 14:16:56 +00:00
TreeHugger Robot fbb08b8e6d Merge "update vndk list" into sc-dev 2021-02-17 13:06:42 +00:00
Treehugger Robot e7b5f3143c Merge changes from topic "vendor_property_enforce" am: 32b84909a1 am: b1cb721609 am: 1011fd35a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1571847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53890953d1b5227d3d1e11d5d432468803f86eda
2021-02-17 08:53:27 +00:00
Martin Stjernholm c481de01b7 Move ART APEX selection logic to core make.
It's moved from art/Android.mk that won't be available in platform
builds without ART sources.

This also ensures we depend on com.android.art directly on
PRODUCT_PACKAGES and not through LOCAL_REQUIRED_MODULES which was the
case in com.android.art-autoselect. When com.android.art is overridden
through an `overrides` field, the logic in main.mk drops it from
PRODUCT_PACKAGES, but it doesn't consider overrides when processing
LOCAL_REQUIRED_MODULES dependencies.

Bug: 172480617
Test: `m` with PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD
  set to true and false
Test: `m` on userdebug and eng builds
Change-Id: Ia606de691fe20ac19f2ca9af362408606e71b11c
2021-02-17 08:28:07 +00:00
Treehugger Robot 32b84909a1 Merge changes from topic "vendor_property_enforce"
* changes:
  Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to productVariables
2021-02-17 07:12:30 +00:00
Jeongik Cha 9513ad5599 update vndk list
Bug: 150578172
Test: m
Change-Id: If0c0105b23b1c0ab7e5563430b066823da0a954d
2021-02-17 09:55:41 +09:00
Chris Fries 550f28bbfb Merge "Revert "update vndk list"" into sc-dev 2021-02-16 21:26:36 +00:00
Steven Moreland b5e2aa9fe1 Revert "update vndk list"
Revert submission 13566544-b/150578172

Reason for revert: breaks P21 b/180417006
Reverted Changes:
I6905a2aa9:Add temporary allowlist for old version scheme
Ic53702ede:update vndk list

Change-Id: I8f10701bad29f33ce8904535c632f7f4a22cd6b7
2021-02-16 21:00:17 +00:00
Gavin Corkery b21535182b Merge changes from topic "reboot-readiness-libs" into sc-dev
* changes:
  Add framework-scheduling to UPDATABLE_BOOT_JARS
  Add com.android.scheduling to system partition
2021-02-16 17:48:20 +00:00
TreeHugger Robot 55ca5ae7c5 Merge "update vndk list" into sc-dev 2021-02-16 12:33:59 +00:00
Jeongik Cha 46cdb2f9fc update vndk list
Bug: 150578172
Test: m
Change-Id: Ic53702ede81f9edbc8e29e92df4470b99b696098
2021-02-16 09:48:20 +00:00
Treehugger Robot df0880a6d8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 14201eb3a3 am: 27d927752e am: 11fc9e03e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1589084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I868c39bb0d7efa427c63797ab2da8e7fb82c4132
2021-02-16 01:02:06 +00:00
Bob Badour 0390580262 [LSC] Add LOCAL_LICENSE_KINDS to build/make
Added SPDX-license-identifier-Apache-2.0 to:
  target/product/sysconfig/Android.bp
  tools/apicheck/Android.bp
  tools/product_config/Android.bp
  tools/releasetools/Android.bp
  tools/signapk/Android.bp
  tools/signtos/Android.bp
  tools/zipalign/Android.bp
  tools/ziptime/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL
    SPDX-license-identifier-MIT legacy_not_a_contribution
    legacy_restricted
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-MIT
to:
  tools/Android.bp
  tools/droiddoc/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
to:
  core/base_rules.mk
  core/dex_preopt_libart.mk
  core/package_internal.mk

Added SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution
to:
  target/board/Android.mk

Added legacy_restricted
to:
  core/tasks/tools/package-modules.mk
  target/product/gsi/Android.bp
  target/product/gsi/Android.mk
  target/product/security/Android.bp
  target/product/security/Android.mk
  tools/acp/Android.bp
  tools/atree/Android.bp
  tools/fs_config/Android.bp
  tools/fs_config/Android.mk
  tools/fs_get_stats/Android.bp
  tools/libhost/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id67a4eb1312940f999643b2ae57f45f34f120724
2021-02-14 10:37:20 -08:00
Yo Chiang 2de21432a1 Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" am: 25d0acf00f am: 384b0b319a am: 3e9774f8fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1588251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e4ab6207c1a29f7a9cf33a2c6613330f9921ad2
2021-02-13 10:33:17 +00:00
Yo Chiang 25d0acf00f Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" 2021-02-13 06:09:36 +00:00
Yo Chiang 1178673d5e Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"
This reverts commit ecaa592310.

Reason for revert: b/177495407#comment9 breaks aosp_arm

Exempt-From-Owner-Approval: Clean revert

Change-Id: If4586901fc1806c5394a385c8686ef5fd8748f24
2021-02-13 06:08:54 +00:00
Yo Chiang f73fdc3d79 Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" am: 2ecbebdcd2 am: e42e3a293b am: b4be190fb7
Original change: https://android-review.googlesource.com/c/platform/build/+/1553835

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d4b2e8cfedd12cf2ab1958d51f2706dad973138
2021-02-12 11:12:54 +00:00
Yo Chiang 2ecbebdcd2 Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" 2021-02-12 09:35:55 +00:00
Peter Kalauskas ceeeba0753 Merge "Fix pm.dexopt.first-boot for eng builds" am: a632e7f855 am: 449e59c8fb am: 2c260f3b68
Original change: https://android-review.googlesource.com/c/platform/build/+/1584212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddb8c26d097939e1b77d21a5216ac84b6fa6414a
2021-02-11 20:28:54 +00:00
Peter Kalauskas 9255f59f9b Fix pm.dexopt.first-boot for eng builds
Fix pm.dexopt.first-boot missing on -eng builds causing device not to
boot

Test: Build -eng target, confirm device boots
Bug: 179990152
Change-Id: Ic963a0f7db5a39aff6198842c468de99e4949900
2021-02-11 10:45:08 -08:00
Calin Juravle 91a1d73fb0 Merge "Update the default compiler filter used at boot time" am: 95f5213202 am: a0e8fb0856 am: 93ad65f026
Original change: https://android-review.googlesource.com/c/platform/build/+/1573378

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcf7ae45f01b80553524aca5f869f6870cdfa3d9
2021-02-11 03:50:52 +00:00
Calin Juravle 95f5213202 Merge "Update the default compiler filter used at boot time" 2021-02-11 02:07:59 +00:00
Yan Yan 57b9916d03 Merge "Add IKE to bcp and remove it from system server classpath" 2021-02-10 18:41:41 +00:00
Gavin Corkery c97637636e Add framework-scheduling to UPDATABLE_BOOT_JARS
Test: Manual
Bug: 161353402
Change-Id: Ie32c9d6a50fa5ef41f421636ae6ac32fd7b60f46
2021-02-10 09:13:39 +00:00
Gavin Corkery a270b161b4 Add com.android.scheduling to system partition
Test: Flash, check package is in /system
Bug: 161353402
Change-Id: Ib25bb5a11348f8e66efb473242803459fb992998
2021-02-10 09:10:17 +00:00
TreeHugger Robot 7438c6b970 Merge "Add IKE to bcp and remove it from system server classpath" into sc-dev 2021-02-10 02:52:06 +00:00
Treehugger Robot 1975c1ba63 Merge changes from topic "ps 2.0 cp"
* changes:
  update vndk list
  powerstats: PowerStats HAL has been renamed
  Create Power Stats AIDL interface
2021-02-09 19:20:10 +00:00
Calin Juravle b7e744cd82 Update the default compiler filter used at boot time
For the first-boot (happening after upgrades) use verify as quicken is deprecated.

For the usual boot operations use extract instead of the verify. Under normal behaviour all apps should already be optimized (either with the first-boot option, a/b option or in bg-dexopt). This will speed up the boot process in corner cases and reduce resource contention that could make the device janky in at boot time.

Bug: 172114559
Change-Id: I33f204911bdc825bf6731feb5cea7c260382798b
Test: m
2021-02-08 14:25:46 -08:00
Treehugger Robot a06d7685a8 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" am: 7ef7116014 am: 38aea6ebe4 am: 13ad4052b9
Original change: https://android-review.googlesource.com/c/platform/build/+/1578147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85a61be24bfd40b8fb6f788a1c75fcf2d7bcb2ee
2021-02-08 21:39:26 +00:00
Treehugger Robot 7ef7116014 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" 2021-02-08 20:04:38 +00:00
Yo Chiang ecaa592310 Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk
Set PRODUCT_SHIPPING_API_LEVEL to the latest value (instead of empty) so
that GSIs are always built with the latest build system default configs,
such as PRODUCT_FULL_TREBLE := true and
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true.

Bug: 177495407
Test: Presubmit build_test
Change-Id: Iabd67656c5ed1de8327c40f0f9f604841f24764b
2021-02-08 12:45:15 +08:00
Janis Danisevskis a3c5395672 Keystore 2.0: Disable keystore 2 by default (for now)
Test: System starts without keystore 2 running.
Bug: 160623310
Change-Id: I83d54de602a0f70acc91fd8e55b07706e1b4e55b
2021-02-05 14:39:43 -08:00
Yan Yan cc1fee3594 Add IKE to bcp and remove it from system server classpath
Bug: 177266501
Test: builds
Change-Id: I90df69a4b892a3faab8097111756c1f42c4cfb68
2021-02-05 21:53:22 +00:00
Treehugger Robot f9cd013f74 Merge "GSI: enable dynamic partitions" am: e174dca416 am: 519547ea53 am: a5a181d4f8
Original change: https://android-review.googlesource.com/c/platform/build/+/1576992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e7808188e834f730615c651d04d294e4b77668c
2021-02-05 20:23:14 +00:00
Jeongik Cha de2d7b11e6 update vndk list
Bug: 150578172
Test: m
Change-Id: Ifc160fc225883cc226bfcbacc8607f6f96d9501a
Merged-In: I76e73668faf248ca33a37eb221973d2164d9c9b8
2021-02-05 10:05:49 -08:00
Hung-ying Tyan 4ae09765b7 GSI: enable dynamic partitions
to facilitate mixing GSI onto Cuttlefish

Bug: 178677060
Bug: 179455901
Test: build gsi_x86_64 and aosp_arm64 and check the existence of
      'dynamic_partition_list' in misc_info.txt

Change-Id: I0fd9e9645d4882e2cd7d3508a44fbcad5dce81bc
2021-02-05 18:50:28 +08:00
Yan Yan ab282be1c7 Add IKE to bcp and remove it from system server classpath
Bug: 177266501
Test: builds
Change-Id: I90df69a4b892a3faab8097111756c1f42c4cfb68
Merged-In: I90df69a4b892a3faab8097111756c1f42c4cfb68
2021-02-04 23:33:43 -08:00
Benjamin Schwartz 2430e7e3a3 powerstats: PowerStats HAL has been renamed
Bug: 169864180
Test: m
Change-Id: I1a1680d94bda3a97f4a5c074ba47a7e57e1241ad
(cherry picked from commit 75a532279d)
Merged-In: I1a1680d94bda3a97f4a5c074ba47a7e57e1241ad
2021-02-04 16:51:37 -08:00
Benjamin Schwartz 0cca4d0211 Create Power Stats AIDL interface
Bug: 162472196
Test: m
Change-Id: I195ace557e1db2894d12f6f15d4db494d358c8e8
Merged-In: I195ace557e1db2894d12f6f15d4db494d358c8e8
2021-02-04 16:01:46 -08:00
Martin Stjernholm 900c7b49a1 Merge "Merge the module_* device.mk files into their corresponding product mk files." am: c7e1bdfede am: 2e6a0e59d4 am: 4e3ba6b5c8
Original change: https://android-review.googlesource.com/c/platform/build/+/1570300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I430efca87b8e04f7df2ab625f88387aebf5b49bd
2021-02-03 17:51:50 +00:00
Inseob Kim 05d595194b Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
device/generic/goldfish/sepolicy/common/property_contexts still contains
violations, so temporarily setting build_broken to relax vendor property
check.

Bug: 176210699
Test: m vendor_property_contexts
Change-Id: Ia7d7830a7e994fd0766fd8854524bb6f9fa5cce6
2021-02-03 18:35:37 +09:00
Brad Ebinger e94e9b4bb7 Remove deprecated RcsService/PresencePolling apps
There is now an AOSP API for RCS UCE, removed the
deprecated RcsService/PresencePolling app targets.

Bug: 178489990
Test: make + inspect build
Change-Id: I0eaa321dfd75de8217c465a523d439ea702deea4
2021-02-02 19:47:42 +00:00
Martin Stjernholm 02aea13272 Add top level product definitions for module_* devices.
Test: lunch module_{arm,arm64,x86,x86_64}
  Inspect target arches in the banner
Bug: 176171716
Merged-In: Iba7818cfc1385d3f84dce1ef95c2bb8d279926bb
Change-Id: Iba7818cfc1385d3f84dce1ef95c2bb8d279926bb
2021-02-02 12:18:24 +00:00
Martin Stjernholm 4ca749cb11 Merge the module_* device.mk files into their corresponding product mk
files.

To clean up an unnecessary indirection. Instead introduce a common file
for module products.

Test: lunch module_{arm,arm64,x86,x86_64}
      inspect the build banners
Change-Id: Ia312431a664e731f5d801ee2671f62f5cd23bd51
2021-02-02 11:32:25 +00:00
Hyundo Moon b0eb96d483 Merge "Add "service-media-s" into PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS" into sc-dev 2021-02-01 06:11:27 +00:00
Treehugger Robot 3e72b47c67 Merge "Add top level product definitions for module_* devices." am: 289a0ffdaf am: b87559a800 am: 0cba6f43a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1561960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92ec9a46a9b9ba120b1a28584929609bed1440a4
2021-01-29 23:34:51 +00:00
Hyundo Moon 91196b0d73 Add "service-media-s" into PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
Bug: 175511943
Test: MediaCommunicationService can run.
      'adb shell service list' shows the service.
Change-Id: I16f0f5adab0c0d5d656cadc5dff7d6808c02649c
Merged-In: I16f0f5adab0c0d5d656cadc5dff7d6808c02649c
2021-01-28 13:08:35 +00:00
Martin Stjernholm 29c5d1a4f1 Add top level product definitions for module_* devices.
Test: lunch module_{arm,arm64,x86,x86_64}
  Inspect target arches in the banner
Bug: 176171716
Change-Id: Iba7818cfc1385d3f84dce1ef95c2bb8d279926bb
2021-01-27 20:29:19 +00:00
Treehugger Robot 31f86aa67b Merge "Disable BLE_VND_INCLUDED in GSI" am: ee7aa0906c am: 3f5064ae05 am: 82389f1dd5
Original change: https://android-review.googlesource.com/c/platform/build/+/1398276

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80085ce0ad241e96c665c3e576806ae8b3287797
2021-01-26 11:18:55 +00:00
Treehugger Robot ee7aa0906c Merge "Disable BLE_VND_INCLUDED in GSI" 2021-01-26 09:18:51 +00:00
Jeongik Cha 3000bb809e update vndk list
AIDL interface will need to specific its version. For gradually adpating
those library is temporarily okay.
It will be cleaned up once the transition is done

Bug: 150578172
Test: m
Change-Id: I93e4f9f8e56f2f6e0e90f01a80a5c390ca49be63
Merged-In: I93e4f9f8e56f2f6e0e90f01a80a5c390ca49be63
2021-01-26 10:01:07 +09:00
Jeongik Cha 51f7c89ae9 Merge "update vndk list" 2021-01-26 00:16:58 +00:00
TreeHugger Robot 85c7490af6 Merge "Add CameraExtensionsProxy to handheld_system" 2021-01-25 23:16:30 +00:00
Hai Zhang 5ca8c00827 Merge "Include framework-permission-s in bootclasspath." 2021-01-24 07:58:06 +00:00
Yan Wang aa1a33a421 Merge "Revert "Do not set ro.iorapd.enable=true"" am: 7ffa8b89d4 am: 2d862ef86b am: 7b2b15ac6c
Original change: https://android-review.googlesource.com/c/platform/build/+/1557011

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic77a02fc3a1c34235146ea4860a2bcb8f875637f
2021-01-23 04:22:09 +00:00
Yan Wang 7ffa8b89d4 Merge "Revert "Do not set ro.iorapd.enable=true"" 2021-01-23 02:51:13 +00:00
Yan Wang af2e80471b Revert "Do not set ro.iorapd.enable=true"
This reverts commit 4a4a4df0af.

Reason for revert: This CL leaves the flag unset. Iorap is disabled by default now and rely on this flag to wake up in Rasta experiment.

IORap is disabled by default. We set this flag to run
Rasta experiment. This conflicts with go/aog/1557011.

To be more specific about how "ro.iorapd.enable" works now,
we added two device configs.
Iorap by default is off and starts when
(https://source.corp.google.com/android/system/iorap/iorapd.rc?q=iorapd.rc)

* ro.iorapd.enable is true excluding unset
* One of the device configs is true.

We have to set "ro.iorapd.enable" to true, so that iorap
can be started in the Rasta experiments.

Change-Id: I9630712b74cd411a5678632fb1ff695a84ed1048
2021-01-23 00:22:38 +00:00
Elliott Hughes caf8f60ae4 Merge "current.txt: remove libadf since it is no longer supported" 2021-01-22 23:37:48 +00:00
Marissa Wall 00c7fcc766 current.txt: remove libadf since it is no longer supported
Libadf is being removed since there are no android common kernels
that support adf. Remove support from miniui.

Test: Compiles and boots
Bug: 150467766
Change-Id: I67b52c62aaaba0da9a0cbb762f0947a4ea8e1b89
Merged-In: I67b52c62aaaba0da9a0cbb762f0947a4ea8e1b89
2021-01-22 12:53:55 -08:00
Jeongik Cha a8bb211c4c update vndk list
AIDL interface will need to specific its version. For gradually adpating
those library is temporarily okay.
It will be cleaned up once the transition is done

Bug: 150578172
Test: m
Change-Id: I93e4f9f8e56f2f6e0e90f01a80a5c390ca49be63
2021-01-22 17:10:27 +09:00
Chengyou Ho e52575dafc Merge "Add weaver HAL to VNDK-core list" am: e9df7af1ed am: 2485072817 am: e3365c3709
Original change: https://android-review.googlesource.com/c/platform/build/+/1554182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d7b0e1994707d4fbc41659050b449aed93d245c
2021-01-22 07:44:07 +00:00
ChengYou Ho 604fc5f8fa Add weaver HAL to VNDK-core list
Bug: 176107318
Change-Id: Ifec01698ee6b8bb688fb446d087cfa3ae608b49f
2021-01-22 06:34:13 +00:00
Hai Zhang 298f938fb8 Include framework-permission-s in bootclasspath.
Bug: 173606718
Test: build
Test: manually verify role related functionality works
Change-Id: Ifc148e3af6a7a0cb5972cac0c94371386a831d1d
2021-01-21 12:15:20 -08:00
Yo Chiang 7861e5aa4d Merge "Move gsi_arm64 makefile to device/generic/common" am: 6059135b8b am: 040df0fa52 am: 2e70f2dd6b
Original change: https://android-review.googlesource.com/c/platform/build/+/1552334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c777c21217c68e4bbb008d0bc732bae31ec66a1
2021-01-21 04:41:39 +00:00
Yo Chiang 6059135b8b Merge "Move gsi_arm64 makefile to device/generic/common" 2021-01-21 02:25:21 +00:00
Yifan Hong 661ad6c170 Merge "Add health storage V1 to VNDK list" am: ef3186def7 am: 1cc806eca3 am: fcad485d00
Original change: https://android-review.googlesource.com/c/platform/build/+/1553153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fda31a01a83b017c0782864894cde9497790b15
2021-01-20 20:49:05 +00:00
Treehugger Robot 0817f06f2a Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" am: 6e455b8ca3 am: f72ca016c5 am: 9c3a698d81
Original change: https://android-review.googlesource.com/c/platform/build/+/1552075

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9451f3369aabbb932eda4054adcfc00f015302c1
2021-01-20 20:48:45 +00:00
Yifan Hong ef3186def7 Merge "Add health storage V1 to VNDK list" 2021-01-20 19:45:15 +00:00
Treehugger Robot 6e455b8ca3 Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" 2021-01-20 19:04:11 +00:00
Ulya Trafimovich 347be4037e resolve merge conflicts of 56bf7ca8c9 to master
Test: DIST_DIR=$PWD/dist \
    TARGET_BUILD_VARIANT=userdebug \
    vendor/google/build/build_mainline_modules.sh
Bug: None
Change-Id: I66049dfb90c2583ea6687ac3353e3ce3eb973bd4
2021-01-20 12:44:40 +00:00
Treehugger Robot c895a8a817 Merge "Split out minimal ART dexpreopt config and use it in mainline builds." 2021-01-20 10:04:39 +00:00
Yo Chiang 0d6ffe8c50 Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" am: 95bd22edb6 am: b09c7adb3e am: cb3275e0a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1553834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6857c6a67d91074a9f71bf6410c78efaa4a2a06d
2021-01-20 04:06:01 +00:00
Yo Chiang cb3275e0a5 Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" am: 95bd22edb6 am: b09c7adb3e
Original change: https://android-review.googlesource.com/c/platform/build/+/1553834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20108c9f0999134ac2838638c5b6abedea9278d9
2021-01-20 04:05:37 +00:00
Yo Chiang 95bd22edb6 Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" 2021-01-20 03:27:03 +00:00
Kelvin Zhang 239a79ae19 Emit virtual_ab_compression prop to dynamic_parttiion_info.txt
Test: mm -j && mm -j dist, make sure virtual_ab_compression is set to
true in dynamic_partition_info.txt of target_File.zip

Change-Id: Id0d46bd8ed738b2b69a0c01481b7db0c7127f773
2021-01-19 16:11:32 -05:00
Nicolas Geoffray 897fe0e8df Split out minimal ART dexpreopt config and use it in mainline builds.
The config sets a few system properties that end up in command-line
arguments passed to dex2oat. Without these properties dex2oat invocation
fails, because options -Xms and -Xmx are do not have an argument.

Test: buid_mainline_modules.sh
Bug: 176171716
Change-Id: I4fd1f059aad5d48495948bfd668307de8b3d9ee1
2021-01-19 17:03:30 +00:00
Yo Chiang 2099e6eda2 Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk
PRODUCT_COMPATIBLE_PROPERTY defaults to true now, so we don't need this
override anymore.

Bug: 177495407
Test: Presubmit
Change-Id: I7370570fe230e913d16520b7add9404f2d6ec913
2021-01-18 18:02:28 +08:00
Meng Wang 2a2b8c7dc2 Merge "Add ImsServiceEntitlement app" 2021-01-16 04:52:33 +00:00
Yifan Hong b1cfb67a1d Add health storage V1 to VNDK list
Test: pass
Bug: 177470478
Change-Id: I7d6fb08ba7367d4678575a9329d70b0a816a2754
2021-01-15 18:23:37 -08:00
Daniel Norman 53e6cc65d8 Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor." am: fc596c996f am: 3efc0cd50c am: 42ced0a63e
Original change: https://android-review.googlesource.com/c/platform/build/+/1549532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d11544b32061d5038b87794c79978ed9d410e8e
2021-01-15 18:44:11 +00:00
Daniel Norman 42ced0a63e Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor." am: fc596c996f am: 3efc0cd50c
Original change: https://android-review.googlesource.com/c/platform/build/+/1549532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8438550235a041ea52c9c886d526942ef4daf865
2021-01-15 18:00:47 +00:00
Janis Danisevskis f244cc64a9 Merge "Update gsi/current.txt with secure clock and shared secret services." am: 46b0d8c8ef am: 024af72520 am: 7bf768b871
Original change: https://android-review.googlesource.com/c/platform/build/+/1541312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadc293e8041289a5eaa5f82568348aaa9dcb7fe0
2021-01-15 13:55:17 +00:00
Yo Chiang 789641c28c Move gsi_arm64 makefile to device/generic/common
Prepare for compliance GSI release.
Consolidate GSI related files to one common directory.

Bug: 177495624
Test: TH build_test
Change-Id: Ideeec16beeabd9b2d51eda6bdfc3cc19fcec4419
2021-01-15 16:10:54 +08:00
Daniel Norman c3d7fff348 Stops including extra VNDK apexes if the VNDK current apex is on vendor.
This is needed for merged mixed-release builds where the vendor half on
release N contains VNDK current (vN) on /vendor. This change prevents
the system half on release N+k from placing another copy of VNDK vN
on /system_ext.

Test: Build and merge crosshatch with S system and R vendor, boot
Bug: 176993126
Change-Id: I5322931244e060b2e7c92d9578e5eb64b098d1d6
2021-01-14 20:22:48 +00:00
Janis Danisevskis 7bf768b871 Merge "Update gsi/current.txt with secure clock and shared secret services." am: 46b0d8c8ef am: 024af72520
Original change: https://android-review.googlesource.com/c/platform/build/+/1541312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib71d701bd06d8463d3ffaeb092ed5e4db459d276
2021-01-14 18:48:17 +00:00
Janis Danisevskis 46b0d8c8ef Merge "Update gsi/current.txt with secure clock and shared secret services." 2021-01-14 18:04:02 +00:00
Meng Wang 025fb73656 Add ImsServiceEntitlement app
Bug: 176127289
Test: make
Change-Id: I2a74da2fe927b274828c3d5d88509583470bf65c
2021-01-13 11:34:30 -08:00
Anton Hansson 81c965bca8 Merge "Use 64 bit binder in module builds" am: 75232ce489 am: b27d9c665e
Original change: https://android-review.googlesource.com/c/platform/build/+/1549377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I953c783ed7b633932bd38f97e53ee3033de7f9f8
2021-01-13 19:02:18 +00:00
Anton Hansson 0bafe32068 Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Merged-In: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
(cherry picked from commit c0423c8dae)
2021-01-13 11:05:20 +00:00
Presubmit Automerger Backend a43fb599c0 [automerge] Use 64 bit binder in module builds 2p: c0423c8dae
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13327146

Change-Id: Id34b5541f7b362d1418fe42697677cd7036ecd31
2021-01-13 11:05:13 +00:00
Anton Hansson c0423c8dae Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
2021-01-13 11:04:02 +00:00
Chengyou Ho c9240efbe3 Merge "Add AuthSecret HAL to VNDK-core list" am: fe1d9d4336 am: c3a5f43f65 am: b87347a9d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1540866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd14846290f9b23c63e74f59fed7f66faf9cc0c8
2021-01-12 09:37:13 +00:00
Chengyou Ho b87347a9d5 Merge "Add AuthSecret HAL to VNDK-core list" am: fe1d9d4336 am: c3a5f43f65
Original change: https://android-review.googlesource.com/c/platform/build/+/1540866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8750b87a1843aa82643704ede6410388a23648b6
2021-01-12 09:00:41 +00:00
ChengYou Ho c2adfd8efe Add AuthSecret HAL to VNDK-core list
Bug: 176107318
Change-Id: I13dfb105e8aed296028118ec5cc806c220797ff8
2021-01-12 06:01:07 +00:00
Chengyou Ho acb3bc7320 Merge "Add OemLock HAL to VNDK-core list" am: 991fe0a7d5 am: b5cf092456 am: 3e1c88b960
Original change: https://android-review.googlesource.com/c/platform/build/+/1542704

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10d0c9d873de9535760322b4200c89ae39031bc7
2021-01-11 07:43:35 +00:00
Chengyou Ho 3e1c88b960 Merge "Add OemLock HAL to VNDK-core list" am: 991fe0a7d5 am: b5cf092456
Original change: https://android-review.googlesource.com/c/platform/build/+/1542704

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94b18bc5fd5d9ab56b39b4a23fe91bb38841aedf
2021-01-11 06:54:08 +00:00
ChengYou Ho 2ef12cb1c2 Add OemLock HAL to VNDK-core list
Bug: 176107318
Change-Id: I73da53a2c614c7ef68d07d84fd0e82564d56dbd2
2021-01-11 05:56:58 +00:00
Treehugger Robot d5769b4014 Merge "Move keymint to security." am: c19b3445ad am: b2c6e5b29d am: ee4e1bd3bb
Original change: https://android-review.googlesource.com/c/platform/build/+/1540595

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I999ffb336abc22df87a820348899106b13c3ea28
2021-01-08 00:29:34 +00:00
Treehugger Robot ee4e1bd3bb Merge "Move keymint to security." am: c19b3445ad am: b2c6e5b29d
Original change: https://android-review.googlesource.com/c/platform/build/+/1540595

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7523ca0ee3ee163f368194568790469a4a1c121
2021-01-08 00:14:41 +00:00
Treehugger Robot c19b3445ad Merge "Move keymint to security." 2021-01-07 23:32:09 +00:00
Yifan Hong 552f36c2f2 Merge "Add 5.10-android12-0 KMI for generic_arm64" am: 1ed887f2c3 am: 42de1ac4c0 am: da6e54d6cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1531942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ceb59b8093d4bb2879b0d0a45792dca1cc2e6e4
2021-01-07 22:34:55 +00:00
Yifan Hong da6e54d6cb Merge "Add 5.10-android12-0 KMI for generic_arm64" am: 1ed887f2c3 am: 42de1ac4c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1531942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45f85b697bc21ba6d92439c0fce5f71571770257
2021-01-07 21:58:34 +00:00
Yifan Hong 1ed887f2c3 Merge "Add 5.10-android12-0 KMI for generic_arm64" 2021-01-07 21:23:10 +00:00
Janis Danisevskis 08764606de Move keymint to security.
Keymint has moved to hardware/interfaces/security, and all HALs under
security should be cfi enabled.

Test: N/A
Change-Id: Ie40f6a04acdb9091bdf5318b889407af89c787e1
2021-01-07 12:06:50 -08:00
Janis Danisevskis d432027f81 Update gsi/current.txt with secure clock and shared secret services.
Test: N/A
Change-Id: I4a862488081e5eecdddc648d952cf64f01c2b1db
2021-01-07 10:49:33 -08:00
Treehugger Robot 683c2e8696 Merge "Update VNDK list for product modules" am: 939e511748 am: 9120e986a1 am: 9b290f9516
Original change: https://android-review.googlesource.com/c/platform/build/+/1519537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61e7d471db650868ac74a4974aa0006e8fc98d71
2021-01-07 03:16:26 +00:00
Treehugger Robot 9b290f9516 Merge "Update VNDK list for product modules" am: 939e511748 am: 9120e986a1
Original change: https://android-review.googlesource.com/c/platform/build/+/1519537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6384621fe54b2081c49afce2f3b8dc0e2535d2d
2021-01-07 02:25:37 +00:00
Yifan Hong f57771a299 Add 5.10-android12-0 KMI for generic_arm64
... to build 5.10 GKI APEXes.

Test: TH
Bug: 160995535
Change-Id: I822ac73e8fc23cb957f748d4e6becdc3f7ac9567
2021-01-05 11:51:32 -08:00
Justin Yun 54146eeed8 Update VNDK list for product modules
Add the list for product_available VNDK list.
This will be frozen by the release process.

Bug: 174323911
Test: build
Change-Id: Ic5f045d9210b09eef6d6c15230e8177d8c98bd22
2021-01-05 13:14:11 +09:00
Treehugger Robot f3615e136b Merge "Include snapuserd in recovery for VABC builds." am: 4a632325a4 am: f4f4ba7300 am: 67c6b1551d
Original change: https://android-review.googlesource.com/c/platform/build/+/1530572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic02c3c45bba3c0ef2c2fa8d3fefd736ff0ad8f60
2020-12-30 09:54:09 +00:00
Treehugger Robot 67c6b1551d Merge "Include snapuserd in recovery for VABC builds." am: 4a632325a4 am: f4f4ba7300
Original change: https://android-review.googlesource.com/c/platform/build/+/1530572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee612ad0f443d5ae9fa9e469785f304394b3d40c
2020-12-30 09:34:44 +00:00
Treehugger Robot 4a632325a4 Merge "Include snapuserd in recovery for VABC builds." 2020-12-30 08:27:43 +00:00
Isaac Chen b835f3aee3 Merge "Update GF board variable for dynamic partition" am: a886df692e am: 471db4c7c5 am: d180c32852
Original change: https://android-review.googlesource.com/c/platform/build/+/1535670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac31ecb625100b6c2240d0fbc5b15befe8e6d8f6
2020-12-30 03:32:57 +00:00
Isaac Chen d180c32852 Merge "Update GF board variable for dynamic partition" am: a886df692e am: 471db4c7c5
Original change: https://android-review.googlesource.com/c/platform/build/+/1535670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I449949afd95f01561d605a5651e8d183c3cdae1f
2020-12-30 03:16:44 +00:00
Isaac Chen c311ff6b68 Update GF board variable for dynamic partition
Goldfish specific board variable:

BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE

is used to create misc_info.txt, which is needed to mix GSI or CSI on
Goldfish vendor image, and need to reflect the size of the current
super.img, which is now set to 4G+8M (from 3G+8M previously).

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
      super_emulator_dynamic_partitions_group_size=4294967296
Change-Id: Idd0fb302b20780ac97959fabec231a632205d46d
2020-12-25 06:14:43 +00:00
Chong Zhang 1c2093a21b Merge "Move mediatranscoding from system to apex" 2020-12-23 03:28:03 +00:00
Kalesh Singh 6729228eff Merge "Reply: Add stable aidl memtrack hal to vndk list" am: 7af0218468 am: a091b6dadc am: f94cc1793e
Original change: https://android-review.googlesource.com/c/platform/build/+/1534550

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f38177272c513625ebf5d6b79cf250e256344d8
2020-12-23 02:14:39 +00:00
Kalesh Singh f94cc1793e Merge "Reply: Add stable aidl memtrack hal to vndk list" am: 7af0218468 am: a091b6dadc
Original change: https://android-review.googlesource.com/c/platform/build/+/1534550

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa977c18d36a4e76e9aa1ccaad67eb4c721aec0a
2020-12-23 02:00:43 +00:00
Kalesh Singh 7af0218468 Merge "Reply: Add stable aidl memtrack hal to vndk list" 2020-12-23 01:20:51 +00:00
Kalesh Singh 0386daa353 Reply: Add stable aidl memtrack hal to vndk list
Bug: 175021432
Test: m; boot;
Change-Id: I68906dde64d70c5be63ddea050b20f320a3e78aa
2020-12-22 20:50:06 +00:00
Isaac Chen da255b5cdc Merge "Increase the size of super.img for Goldfish" am: 3aa08cfa94 am: a675bc6d18 am: d1306c0df2
Original change: https://android-review.googlesource.com/c/platform/build/+/1534301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38006ba30aaf803b05105a3ccef7b91e32faa70c
2020-12-22 18:16:14 +00:00
Isaac Chen d1306c0df2 Merge "Increase the size of super.img for Goldfish" am: 3aa08cfa94 am: a675bc6d18
Original change: https://android-review.googlesource.com/c/platform/build/+/1534301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafd088a292e4b70ff250f08814f7e4fac0a198ef
2020-12-22 17:39:14 +00:00
Isaac Chen 3aa08cfa94 Merge "Increase the size of super.img for Goldfish" 2020-12-22 16:56:49 +00:00
Anton Hansson 3ce9d68bd3 Merge "Add mainline_sdk device and product" am: 6d10bf974a am: 87e92d6e57 am: 96fb33a5d1
Original change: https://android-review.googlesource.com/c/platform/build/+/1512778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d11513357f5ea21e84668529f1d9534e83f78f8
2020-12-22 13:07:48 +00:00
Anton Hansson 96fb33a5d1 Merge "Add mainline_sdk device and product" am: 6d10bf974a am: 87e92d6e57
Original change: https://android-review.googlesource.com/c/platform/build/+/1512778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I840beb16ef38d5395169b8252615ecae15d20c66
2020-12-22 12:35:00 +00:00
Anton Hansson 6d10bf974a Merge "Add mainline_sdk device and product" 2020-12-22 11:40:32 +00:00
Isaac Chen 91a641324c Increase the size of super.img for Goldfish
Current super image for GF is almost full in sdk_gphone_x86_arm
product, and not big enough to include CSI for mixed configuration,
which is a bit bigger than the system image of sdk_gphone_x86_arm.

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
Change-Id: Ia2473231c8490995a10700cbd6e0f82598a5e078
2020-12-22 03:43:26 +00:00
David Anderson da770507ab Include snapuserd in recovery for VABC builds.
Bug: N/A
Test: snapuserd available in recovery
Change-Id: Ide10a1da72becffad53f1daf2594d57813fc6636
2020-12-21 23:35:45 +00:00
Andy Hung ec5246ddb8 Merge "Remove libwebrtc_audio_processing" am: d51e4c473f am: 116ae0c6f8 am: de34bec94d
Original change: https://android-review.googlesource.com/c/platform/build/+/1530932

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If34f458321cf8b83ed1e11330913c636de877ffd
2020-12-17 17:41:20 +00:00
Andy Hung de34bec94d Merge "Remove libwebrtc_audio_processing" am: d51e4c473f am: 116ae0c6f8
Original change: https://android-review.googlesource.com/c/platform/build/+/1530932

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69ec0c3faf3a5325baefefae5ec0de1dfe10b67a
2020-12-17 17:22:24 +00:00
Andy Hung d51e4c473f Merge "Remove libwebrtc_audio_processing" 2020-12-17 16:14:59 +00:00
Treehugger Robot 0de3a8b99f Merge "Move ro.zygote to vendor" 2020-12-17 07:02:25 +00:00
Treehugger Robot 35f6614178 Merge "Move jacocoagent installation to base_system" am: 98b7ac4602 am: a88a997a7a am: a9bfe835c2
Original change: https://android-review.googlesource.com/c/platform/build/+/1532100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcdc828243382d7ae6dc244192abf6d441baafc1
2020-12-17 01:23:38 +00:00
Treehugger Robot a9bfe835c2 Merge "Move jacocoagent installation to base_system" am: 98b7ac4602 am: a88a997a7a
Original change: https://android-review.googlesource.com/c/platform/build/+/1532100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3075df9537b0f27de59389f2e32a83009fb8d8c5
2020-12-17 00:49:27 +00:00
Treehugger Robot 98b7ac4602 Merge "Move jacocoagent installation to base_system" 2020-12-17 00:25:50 +00:00
Yifan Hong 42cae00cb0 Move jacocoagent installation to base_system
jacocoagent and its dependencies emits artifacts to system/,
hence it belongs to base_system.mk. It was rather incorrect
to add jacocoagent to EVERY product makefile because those
product makefiles may be enforcing artifact path requirements
(e.g. generic_ramdisk.mk).

Test: EMMA_INSTRUMENT=true m nothing
Bug: 175605139
Bug: 173742069
Change-Id: If9cb93ab8fd69d11e764ab830dc791bbe6106cf5
2020-12-16 09:50:42 -08:00
Treehugger Robot 502400104a Merge "generic_ramdisk.mk add missing slash." am: fb991de5fe am: 3eeefdca5b am: 16bf35b170
Original change: https://android-review.googlesource.com/c/platform/build/+/1530574

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31b5e21a99a5259988f0d778a0a582467df2616d
2020-12-16 15:10:51 +00:00
Treehugger Robot 16bf35b170 Merge "generic_ramdisk.mk add missing slash." am: fb991de5fe am: 3eeefdca5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1530574

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c6edde56092500972c7bef1a01a954087d30fc6
2020-12-16 14:27:18 +00:00
Treehugger Robot fb991de5fe Merge "generic_ramdisk.mk add missing slash." 2020-12-16 13:53:29 +00:00
Anton Hansson dc9a98bfd7 Merge "Add devices suitable for single-arch module builds" am: df38c92dd1 am: 1997f2c6d8 am: 8719b81073
Original change: https://android-review.googlesource.com/c/platform/build/+/1511789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45b90df6605fc70c2e5b97a8a23ed5cbb8786d9f
2020-12-16 12:02:23 +00:00
Anton Hansson 8719b81073 Merge "Add devices suitable for single-arch module builds" am: df38c92dd1 am: 1997f2c6d8
Original change: https://android-review.googlesource.com/c/platform/build/+/1511789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6270c2715f0fd5a33331d9938e90cf813dd8ecd9
2020-12-16 11:27:15 +00:00
Anton Hansson df38c92dd1 Merge "Add devices suitable for single-arch module builds" 2020-12-16 10:23:30 +00:00
Harish Mahendrakar 044ef90bf9 Remove libwebrtc_audio_processing
libwebrtc_audio_processing is no longer used by audio
preprocessing effects

Bug: 175749641
Test: Builds
Change-Id: Id60fe90d481ae74ea617260fb3cf88c0cc7da79b
2020-12-15 21:22:27 -08:00
Kalesh Singh 9e3e2c509c Merge "Revert "Add stable aidl memtrack hal to vndk list"" am: 37638180d6 am: 9ba9be0432 am: 9564f6d6ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1530884

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99e193e1eea3765564253abc61d57123fa48de25
2020-12-16 02:22:57 +00:00
Kalesh Singh 9564f6d6ef Merge "Revert "Add stable aidl memtrack hal to vndk list"" am: 37638180d6 am: 9ba9be0432
Original change: https://android-review.googlesource.com/c/platform/build/+/1530884

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe5412ecba0519b6d6d4ec9ad3d8b557a6d9f253
2020-12-16 01:46:34 +00:00
Kalesh Singh 37638180d6 Merge "Revert "Add stable aidl memtrack hal to vndk list"" 2020-12-16 00:48:05 +00:00
Kalesh Singh 009936a198 Revert "Add stable aidl memtrack hal to vndk list"
Revert "Memtrack HAL stable aidl sepolicy"

Revert "Add android.hardware.memtrack-unstable-ndk_platform"

Revert submission 1518702-memtrack-aidl

Reason for revert: Broken tests and boot time regressions
Reverted Changes:
Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor...
Iaf99d0ca4:Add stable aidl memtrack HAL to product packages
Iac54ae2ba:Add stable aidl memtrack hal to vndk list
If310210a3:libmemtrack: Add support for AIDL memtrack HAL
Ib6c634def:Memtrack HAL: Add stable AIDL implementation
I5e1d0e006:Memtrack HAL stable aidl sepolicy

Change-Id: I922441bf3629a5d50672f1466a1f52fb9e2c3cb0
2020-12-16 00:19:38 +00:00
Yifan Hong e3a09008fb generic_ramdisk.mk add missing slash.
Test: pass
Bug: 173742069
Change-Id: Ie489858ff57cfc24b3cb28c61f85fffed1bbd4db
2020-12-15 13:53:19 -08:00
Anton Hansson 82996e4bbc Add devices suitable for single-arch module builds
Prior to this the generic_* devices were typically used for this
purpose. There are a few reasons to create new specific ones:
- the generic_arm64 device has a hack specifically for building
  multi-arch packages that we want to avoid
- the generic_* devices include a bunch of emulator config that does not
  make sense for unbundled builds

Bug: 172256440
Test: verify unbundled builds migrated from generic_* don't change
Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15 18:59:40 +00:00
Anton Hansson f68f92d3d5 Add mainline_sdk device and product
This device/product is suitable for a soong-only build that builds for
all the architectures needed for mainline modules sdk prebuilts.

Bug: 174315599
Test: TARGET_PRODUCT=mainline_sdk soong_ui --make-mode --skip-kati;
      (inspect soong.variables)
Change-Id: I3ab5d3611e25a666de39752dedaddbf32ddf6df7
2020-12-15 12:48:37 +00:00
Anton Hansson bbd95df172 Add devices suitable for single-arch module builds
Prior to this the generic_* devices were typically used for this
purpose. There are a few reasons to create new specific ones:
- the generic_arm64 device has a hack specifically for building
  multi-arch packages that we want to avoid
- the generic_* devices include a bunch of emulator config that does not
  make sense for unbundled builds

Bug: 172256440
Test: verify unbundled builds migrated from generic_* don't change
Merged-In: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15 11:42:39 +00:00
Treehugger Robot 6af2e3930c Merge "Move goldfish RRO to vendor partition" am: 78ee012509 am: 88bdcb8f76 am: bb9bad1f5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1526759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ef983707d0a20438737cb56af2590827f6cd830
2020-12-15 02:41:54 +00:00
Treehugger Robot bb9bad1f5b Merge "Move goldfish RRO to vendor partition" am: 78ee012509 am: 88bdcb8f76
Original change: https://android-review.googlesource.com/c/platform/build/+/1526759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbff098c392b06ad132999c051befbbee8aa0908
2020-12-15 02:23:18 +00:00
Treehugger Robot 78ee012509 Merge "Move goldfish RRO to vendor partition" 2020-12-15 01:53:03 +00:00
Treehugger Robot c271344aa9 Merge "Add stable aidl memtrack hal to vndk list" am: 886049dc15 am: 7c18afcc00 am: c28ab30baa
Original change: https://android-review.googlesource.com/c/platform/build/+/1518924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c740b8e8cfe7b2e93f148934c4729ae2a476498
2020-12-14 20:09:30 +00:00
Treehugger Robot c28ab30baa Merge "Add stable aidl memtrack hal to vndk list" am: 886049dc15 am: 7c18afcc00
Original change: https://android-review.googlesource.com/c/platform/build/+/1518924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b9bd9b750074d3915ee82c2a9f9a705807c2c89
2020-12-14 19:52:36 +00:00
Treehugger Robot 886049dc15 Merge "Add stable aidl memtrack hal to vndk list" 2020-12-14 18:36:10 +00:00
TreeHugger Robot c4ec682cb2 Merge "Move ro.zygote to vendor" into rvc-qpr-dev-plus-aosp am: e75f0995de
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13177249

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia23efbd819c4f33db431a163cd1c938c112b4cb4
2020-12-14 17:28:52 +00:00
TreeHugger Robot e75f0995de Merge "Move ro.zygote to vendor" into rvc-qpr-dev-plus-aosp 2020-12-14 16:42:11 +00:00
Yo Chiang 9cf722cf2c Move goldfish RRO to vendor partition
Change PRODUCT_PACKAGE_OVERLAYS to DEVICE_PACKAGE_OVERLAYS so that
goldfish RROs are not pulled into GSI.
This moves the goldfish configs to vendor partition, and since GSI
doesn't include a vendor, this means GSI won't include the goldfish
configs.

Bug: 174816040
Test: Presubmit
Change-Id: Ia3b4ca5fbf23278e55f1f200c9b96568d8d03606
2020-12-14 14:52:56 +08:00
Treehugger Robot 927af7eb0f Merge "Revert^2 "Move keymint to android.hardware.security."" am: 2a9b7d7f9e am: cd7aa3bdca am: 5de221ca99
Original change: https://android-review.googlesource.com/c/platform/build/+/1525183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95599575d9b237e44c3b6d02abec4cbdd2975bfe
2020-12-12 01:07:06 +00:00
Treehugger Robot 5de221ca99 Merge "Revert^2 "Move keymint to android.hardware.security."" am: 2a9b7d7f9e am: cd7aa3bdca
Original change: https://android-review.googlesource.com/c/platform/build/+/1525183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdcbfa0c5cd350763c5ea50a3b08293229ec1aa4
2020-12-12 00:49:57 +00:00
Treehugger Robot 2a9b7d7f9e Merge "Revert^2 "Move keymint to android.hardware.security."" 2020-12-12 00:14:21 +00:00
Tianjie Xu f6b0177efc Merge "Use sha256 to build the hashtree in avb image" am: 7d958f4fd0 am: 5e1d91756b am: f6dcbbe401
Original change: https://android-review.googlesource.com/c/platform/build/+/1518920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38e818e1fc340943ce675bb4247691b121f11cc1
2020-12-11 21:47:09 +00:00
Yifan Hong 8163f82b70 Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." am: 999779bdce am: 1b38e254df am: c102a147ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1524321

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I995b9d4a77ad376ca088a214d35c5fdc574c9ed3
2020-12-11 21:46:49 +00:00
Tianjie Xu f6dcbbe401 Merge "Use sha256 to build the hashtree in avb image" am: 7d958f4fd0 am: 5e1d91756b
Original change: https://android-review.googlesource.com/c/platform/build/+/1518920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9650ba77ea46df0e8692239f90c5a81e292c196
2020-12-11 21:26:24 +00:00
Yifan Hong c102a147ad Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." am: 999779bdce am: 1b38e254df
Original change: https://android-review.googlesource.com/c/platform/build/+/1524321

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If89a284d99143e10bbc4abff7d2f128c26f80bc3
2020-12-11 21:26:00 +00:00
Tianjie Xu 7d958f4fd0 Merge "Use sha256 to build the hashtree in avb image" 2020-12-11 20:56:05 +00:00
Shawn Willden 49e1a2bb72 Revert^2 "Move keymint to android.hardware.security."
ea21979e96

Bug: 175345910
Bug: 171429297
Exempt-From-Owner-Approval: re-landing topic with no changes in this CL.
Change-Id: I1e49cee30493e4dd116bfbf0b2b78ec93191a7e5
2020-12-11 20:36:05 +00:00