tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
73571 commits 1 branch 0 tags 119 MiB
Commit graph

7616 commits

Author SHA1 Message Date
Janis Danisevskis
7bc7da051f Merge "Keystore 2.0: Remove keystore and keystore2.enable property." am: bacb3ebb2a am: fd04a29fe0 am: c4f4a4dc5d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1626719

Change-Id: I60dcef6658f18a547217fa59cf53b01fa87b3b62
 2021-04-07 20:56:01 +00:00
Janis Danisevskis
bacb3ebb2a Merge "Keystore 2.0: Remove keystore and keystore2.enable property." 2021-04-07 19:30:12 +00:00
Yo Chiang
5882361bd1 Merge "gsi_skip_mount.cfg skips system sub-mountpoints" am: 7716d479cc am: 3a29a4bb95 am: 7382c3b81b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1659982

Change-Id: I71226eb7dd86567d2cd25159297efe956e146771
 2021-04-07 06:51:17 +00:00
Yo Chiang
7382c3b81b Merge "gsi_skip_mount.cfg skips system sub-mountpoints" am: 7716d479cc am: 3a29a4bb95 
Original change: https://android-review.googlesource.com/c/platform/build/+/1659982

Change-Id: I09901df8416ddd996941925f1834a7c1de2a9d29
 2021-04-07 06:00:43 +00:00
Yo Chiang
7716d479cc Merge "gsi_skip_mount.cfg skips system sub-mountpoints" 2021-04-07 05:04:21 +00:00
Christian Wailes
a033000df4 Merge "Add the service-art JAR to the System Server classpath." am: 8c614d2515 am: 37c941146a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1595811

Change-Id: I83a193cf612c0ab4cb38405bd34cefb320c13486
 2021-04-06 21:08:50 +00:00
Christian Wailes
8c614d2515 Merge "Add the service-art JAR to the System Server classpath." 2021-04-06 20:30:18 +00:00
Paul Duffin
5e496e7c15 Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a am: 853c2c867d am: 04173099d5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: I891adf770e30ca94e358dfd3f747f83b8a5bdb2c
 2021-04-06 15:27:39 +00:00
Paul Duffin
04173099d5 Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a am: 853c2c867d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: Ic0664d1bf5622c7a45760f45670301a633cfb794
 2021-04-06 14:41:52 +00:00
Paul Duffin
24f62069d0 Remove use of REMOVE_ATB_FROM_BCP 
This change cleans up after the work to remove the android.test.base
classes from the bootclasspath. That work allowed the presence of
android.test.base in the bootclasspath to be configured at build time
to allow the changes to be tested without affecting the standard
Android builds and avoiding having to repeatedly reapply/revert the
changes that excluded android.test.base from the bootclasspath. That
change has been applied and stuck and no builds change the default by
setting REMOVE_ATB_FROM_BCP=false so we no longer need to support that
capability.

This change removes the build time switch to add
framework-atb-backward-compatibility to the bootclasspath and another
change in the same topic merges those classes into the
framework-minus-apex module. So, while a module has been removed from
the bootclasspath the classes available on it have not changed.

Bug: 184331423
Test: m nothing
Change-Id: I9dadaf8b0c2684bf1983b353bb2acf4f42655e1a
 2021-04-06 11:53:08 +01:00
Christian Wailes
11d5f6b335 Merge "Add the service-art JAR to the System Server classpath." into sc-dev 2021-04-06 00:02:38 +00:00
Yo Chiang
d8db785ed0 Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" 
This reverts commit 1178673d5e.

Reason for revert: reland after aosp/1663197 is submitted

Change-Id: I3e03e62af38f329e24c057748d1e90a09a38a3b8
 2021-04-03 14:56:51 +00:00
Elliott Hughes
d63b6a1054 Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693 am: a6600c241e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: I0a6a96a61ec4a195c89fdd3d48a3011f01023a42
 2021-04-02 22:56:23 +00:00
Elliott Hughes
a6600c241e Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693 
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: Ia46e509718525427316575db53be1459cedc1949
 2021-04-02 22:10:44 +00:00
Elliott Hughes
a445ef6cde Remove honggfuzz support. 
Everyone's on libFuzzer now.

(The "fuzz" referred to in base_system.mk was removed in Android 11, but
this reference was left lying around.)

Bug: http://b/184301511
Test: treehugger
Change-Id: I6fe0f2c37e014647802279a656d2c6c9625b7a44
 2021-04-02 10:24:48 -07:00
Chris Wailes
efe5ca180c Add the service-art JAR to the System Server classpath. 
Bug: 177273468
Test: m
Merged-In: Iddf07fb98a86d626c993b7b175a25413f42b833c
Change-Id: Iddf07fb98a86d626c993b7b175a25413f42b833c
 2021-03-31 12:31:47 -07:00
Yi-Yo Chiang
df13f6f6c8 gsi_skip_mount.cfg skips system sub-mountpoints 
Bug: 184132970
Test: GSI Boot test
Change-Id: I6cb6735d41b6dc6c19a27d730226b200d362bc1d
 2021-04-01 00:59:16 +08:00
Chris Wailes
ea8111cff4 Add the service-art JAR to the System Server classpath. 
Bug: 177273468
Test: m
Merged-In: Iddf07fb98a86d626c993b7b175a25413f42b833c
Change-Id: Iddf07fb98a86d626c993b7b175a25413f42b833c
 2021-03-30 12:38:01 -07:00
Yo Chiang
060db4f10e Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" am: 910d352ee6 am: 1fe7d8ccae am: 862dd38076 
Original change: https://android-review.googlesource.com/c/platform/build/+/1652241

Change-Id: I5418758e42053eba9e3e00dd52e4ca3a12ff9237
 2021-03-30 08:43:53 +00:00
Yo Chiang
862dd38076 Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" am: 910d352ee6 am: 1fe7d8ccae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1652241

Change-Id: I85039f4084566191762da1dec9782f7601b7c819
 2021-03-30 08:00:00 +00:00
Yo Chiang
910d352ee6 Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" 2021-03-30 06:29:09 +00:00
Remi NGUYEN VAN
f99d2f7595 Merge "Add framework-connectivity to bootclasspath" into sc-dev 2021-03-25 14:51:56 +00:00
Ulyana Trafimovich
78932b7f26 Merge "Disable <uses-library> checks for SDK products." am: 3140fc9e15 am: 9c33ee6f6a am: e64b952686 
Original change: https://android-review.googlesource.com/c/platform/build/+/1652331

Change-Id: I488915a39b342ecd57a9e3484bf0d7ec4c489812
 2021-03-25 12:25:27 +00:00
Ulyana Trafimovich
e64b952686 Merge "Disable <uses-library> checks for SDK products." am: 3140fc9e15 am: 9c33ee6f6a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1652331

Change-Id: I3f25e4d9a2837d6924209c8774d054896c3c0b14
 2021-03-25 11:30:02 +00:00
Ulyana Trafimovich
3140fc9e15 Merge "Disable <uses-library> checks for SDK products." 2021-03-25 10:14:37 +00:00
Yo Chiang
075a6d3327 Revert^2 "Nextgen release: Don't build super_empty.img" 
This reverts commit 63c65c776d.

Reason for revert: Original bug was resolved by updating branch config

Change-Id: I1136570f9bd01d050beb55705cc90040dd396ecc
 2021-03-25 10:12:58 +00:00
SzuWei Lin
6ef237b9d0 Export prebuilt-info.txt of perbuilts kernel to dist 
aosp_arm64 and gsi_arm64 build the boot.img binaries with prebuilt
kernels.Exporting the prebuilt-info.txt in dist folder makes to
easier to see which kernel build on AndroidCI.

Bug: 183504624
Test: lunch gsi_arm64-userdebug; make -j dist
Change-Id: I18f63af8588ced93e57b9d24e3b196d6f5694e72
 2021-03-25 18:03:10 +08:00
Tianjie Xu
608d2aa11f Merge changes from topic "revert-1644988-nextgen-release-img-zip-cleanup-KPBTKCTROS" am: 4b2242de5e am: 402c4f9426 am: f4f10b1a0d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1653539

Change-Id: Ib3662301ca35fc3296debd32f571592cabe49323
 2021-03-25 07:11:17 +00:00
Tianjie Xu
f4f10b1a0d Merge changes from topic "revert-1644988-nextgen-release-img-zip-cleanup-KPBTKCTROS" am: 4b2242de5e am: 402c4f9426 
Original change: https://android-review.googlesource.com/c/platform/build/+/1653539

Change-Id: I85e259402ab88b98417a4b89534eabdd078f7bcc
 2021-03-25 06:27:37 +00:00
Tianjie Xu
63c65c776d Revert "Nextgen release: Don't build super_empty.img" 
Revert submission 1644988-nextgen-release-img-zip-cleanup

Reason for revert: b/183654818
Reverted Changes:
I2474e5fd6:Nextgen release: Don't build super_empty.img
I549439528:Add option to allow product makefiles to skip buil...

Change-Id: I91fb23542f7f70b0c1d6d3dabf97c0844956cfb0
 2021-03-25 05:00:12 +00:00
Ulya Trafimovich
918f71acf7 Disable <uses-library> checks for SDK products. 
They lack some libraries (e.g. RadioConfigLib), which makes it
impossible to translate their module names to library name, so the check
fails.

Bug: 183339664
Bug: 132357300
Bug: 183616134
Test: treehugger
Change-Id: I2f5f646f0fba054f9ef6a0e45afa2ecc70d5fcf0
 2021-03-24 17:14:20 +00:00
Remi NGUYEN VAN
c40a51ddf6 Add framework-connectivity to bootclasspath 
The framework-connectivity jar contains connectivity API classes moved
to the tethering APEX.

This currently uses framework-connectivity.impl, but will be renamed to
just framework-connectivity after combining the libraries.

Bug: 171540887
Test: m, boots
Change-Id: Iad9fedaee122e079d84ba866b8eabbd806951ab6
 2021-03-24 12:20:54 +00:00
Yo Chiang
2f10270a1d Merge changes from topic "nextgen-release-img-zip-cleanup" am: 18015cef3b am: d26db0e15e am: e936355b48 
Original change: https://android-review.googlesource.com/c/platform/build/+/1644989

Change-Id: Iff7166e25dd8ec8614cbbaf737085cb880632415
 2021-03-24 07:26:24 +00:00
Yo Chiang
e936355b48 Merge changes from topic "nextgen-release-img-zip-cleanup" am: 18015cef3b am: d26db0e15e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1644989

Change-Id: I2653bdb677d86af340a9b8bf2e62385dfb4f669d
 2021-03-24 06:44:59 +00:00
Yi-Yo Chiang
16973880c6 Nextgen release: Don't build super_empty.img 
Bug: 183068624
Test: "m dist" on GSI and check the build artifacts under OUT and DIST
      directories, and check the contents of *-img-*.zip
Change-Id: I2474e5fd69534a5890eecd0c81e10a583e4423be
 2021-03-24 05:35:37 +00:00
Przemyslaw Szczepaniak
f851149ef5 Merge "Add new llndk library, libneuralnetworks_shim.so" am: fd444b55b5 am: 8a7e8d1166 am: 9354bdc53b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1584864

Change-Id: Ief51da809fc14905e24a0008f9d134e065fa18e6
 2021-03-23 12:50:53 +00:00
Przemyslaw Szczepaniak
9354bdc53b Merge "Add new llndk library, libneuralnetworks_shim.so" am: fd444b55b5 am: 8a7e8d1166 
Original change: https://android-review.googlesource.com/c/platform/build/+/1584864

Change-Id: I1e8d228d6d3222d320b81a4d18904e849ab05444
 2021-03-23 12:06:36 +00:00
Przemyslaw Szczepaniak
fd444b55b5 Merge "Add new llndk library, libneuralnetworks_shim.so" 2021-03-23 09:15:42 +00:00
SzuWei Lin
822a76daef Merge "Update OWNERS for GSI files" am: ebb3176268 am: e2080ee1ff am: a3af3a84f8 
Original change: https://android-review.googlesource.com/c/platform/build/+/1645003

Change-Id: I0751575d3a4159dc4cfd6fb656d87879476cdd2c
 2021-03-23 05:55:48 +00:00
SzuWei Lin
a3af3a84f8 Merge "Update OWNERS for GSI files" am: ebb3176268 am: e2080ee1ff 
Original change: https://android-review.googlesource.com/c/platform/build/+/1645003

Change-Id: Ice278100e7186c49c4389eff8f3ddf4d62ea8250
 2021-03-23 05:08:38 +00:00
SzuWei Lin
ebb3176268 Merge "Update OWNERS for GSI files" 2021-03-23 03:53:33 +00:00
Yo Chiang
79aea39645 Merge "Nextgen release: Don't build images that GSI don't need" am: 680a642645 am: d5c7c3eb59 am: 557b5fd283 
Original change: https://android-review.googlesource.com/c/platform/build/+/1644987

Change-Id: I8201abea792289ba22e7c334da76e711204e490b
 2021-03-22 08:01:05 +00:00
Yo Chiang
557b5fd283 Merge "Nextgen release: Don't build images that GSI don't need" am: 680a642645 am: d5c7c3eb59 
Original change: https://android-review.googlesource.com/c/platform/build/+/1644987

Change-Id: I8ddc8daa5225ed0613285fc2b7197de6da88c0f1
 2021-03-22 07:17:08 +00:00
Yi-Yo Chiang
a88d2da587 Nextgen release: Don't build images that GSI don't need 
These images are never used by GSI. Building them is a waste of resource
and a potential source of confusion, for they are packaged into the
*-img-*.zip of GSI. Skip building them.

Bug: 183068624
Test: "m dist" on GSI and check the build artifacts under OUT and DIST
  directories, and check the contents of *-img-*.zip
Change-Id: Ic14cfdd10ed26d975b369ce128e4b284378219ef
 2021-03-22 05:41:23 +00:00
SzuWei Lin
76d96ae6b6 Update OWNERS for GSI files 
Bug: 183342911
Test: n/a
Change-Id: Ia3faa182266a8203391884d79dae56f3212a3b7e
 2021-03-22 12:13:55 +08:00
Janis Danisevskis
cf8a05bbfa Keystore 2.0: Remove keystore and keystore2.enable property. 
* Remove keystore as build target.
* Remove the default setting of the keystore2.enable property.

Bug: 171563717
Test: N/A
Change-Id: I2f29d18650a5e2b819985d202cb0c4002bbe94de
 2021-03-19 10:31:40 -07:00
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
Yifan Hong
999779bdce Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." 2020-12-11 20:24:19 +00:00
Orion Hodson
28597b5ab3 Merge "Revert "Move keymint to android.hardware.security."" am: 88256fd724 am: 46a5e283fb am: e91c0ac7fd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1525799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07051ffab23c4c2907a7f3b94837b02dad66f6b9
 2020-12-11 14:02:27 +00:00
Orion Hodson
e91c0ac7fd Merge "Revert "Move keymint to android.hardware.security."" am: 88256fd724 am: 46a5e283fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1525799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45b2ad560dd9548fb3ebcb2b2f152e5598171f6d
 2020-12-11 13:31:37 +00:00
Orion Hodson
88256fd724 Merge "Revert "Move keymint to android.hardware.security."" 2020-12-11 12:29:46 +00:00
Shawn Willden
e6d5fea66a Merge "Move keymint to android.hardware.security." am: 43943c65e2 am: aad1b4e472 am: 2d9112ad68 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieea40511d490321950b1aee4df9c760727091dee
 2020-12-11 11:01:04 +00:00
Orion Hodson
ea21979e96 Revert "Move keymint to android.hardware.security." 
Revert "Move keymint to android.hardware.security."

Revert submission 1522123-move_keymint

Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.

Change-Id: I1d1b8e1131328dd27b3a1818298b1c019dac59aa
 2020-12-11 10:45:43 +00:00
Will McVicker
db9cbcb516 Merge "Update aosp_arm64 kernel 4.19 prebuilt name" am: c0d7c7204f am: 1c6d82a879 
Original change: https://android-review.googlesource.com/c/platform/build/+/1524118

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a95886dda7ae75b7870308dbdd0227c522d5ec9
 2020-12-11 08:53:19 +00:00
Will McVicker
c0d7c7204f Merge "Update aosp_arm64 kernel 4.19 prebuilt name" 2020-12-11 07:52:19 +00:00
Tianjie
055128bf10 Use sha256 to build the hashtree in avb image 
The hashtree is used in verified boot, and sha256 is more robust against
malicious attacks. Also, sha256 uses the same space as sha1 in the
hashtree. And there isn't much performance regression per
https://b.corp.google.com/issues/156162446#comment18

By putting the config in BoardConfigMainlineCommon.mk, we enable sha256
on all Pixels. And devices who want to use a different hash algorithm
can override it in it's own board configs.

Bug: 156162446
Test: boot the device and check performance
Change-Id: I9f1d3bcf241bc65adf10376cc5ae7ab1986216fa
 2020-12-11 01:26:12 +00:00
Shawn Willden
2d9112ad68 Merge "Move keymint to android.hardware.security." am: 43943c65e2 am: aad1b4e472 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib875956e49549dff589fa1d5d026e5b4154b4d1b
 2020-12-10 23:49:39 +00:00
Shawn Willden
43943c65e2 Merge "Move keymint to android.hardware.security." 2020-12-10 22:49:14 +00:00
yawanng
a5a0ab7e6a [DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d551613 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13194361

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I110f7abf1009ecf428483e80eea6d1f679c979d9
 2020-12-10 22:17:39 +00:00
Yifan Hong
e086ae045e require-artifacts-in-path does not require PRODUCT_NAME/BRAND. 
Also make generic_ramdisk.mk not to define them.

Test: m nothing
Change-Id: I5eff49abebe4194e3eba78557e5765e6ef2231e6
 2020-12-10 13:18:29 -08:00
yawanng
b73d551613 [DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. 
Setting 'ro.iorapd.enable' flag will be safter to turn off
IORap for R qpr compared with setting mendel flags.

Bug: 174588448
Test: Make
Change-Id: Ia4b3c3f4108e58847082c9a3b2229bab83fe02c5
 2020-12-10 19:32:42 +00:00
Will McVicker
55cd0ee523 Update aosp_arm64 kernel 4.19 prebuilt name 
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
Merged-In: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
 2020-12-10 18:47:03 +00:00
Will McVicker
86f6344fbb Update aosp_arm64 kernel 4.19 prebuilt name 
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
 2020-12-10 10:45:26 -08:00
Anton Hansson
bb7111322c Merge changes Ib2a4a208,Ic8235912 am: 63d3835f4a am: 5f71a978d0 am: c6bd47a429 
Original change: https://android-review.googlesource.com/c/platform/build/+/1520781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76f7065fa5c49c4ab33c024edeac9d5b11b92eab
 2020-12-10 13:22:01 +00:00
Anton Hansson
63d3835f4a Merge changes Ib2a4a208,Ic8235912 
* changes:
  Set allow list for generic ramdisk
  Add a "relaxed" mode for require-artifacts-in-path
 2020-12-10 12:20:26 +00:00
Shawn Willden
85573ddd41 Move keymint to android.hardware.security. 
Test: VtsAidlKeyMintTargetTest
Change-Id: I86bccf40e0f5351b573248b59846cea017204c4a
 2020-12-09 20:55:53 -07:00
Lingfeng Yang
93f74429fa Merge "emulator_arm64: Don't support AArch32" am: d5f89b11e6 am: e44fd5916c am: 12492e2810 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518218

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9cd59f6ed5c7051b85ea670f35a3f15eed78f92
 2020-12-09 20:19:45 +00:00
Lingfeng Yang
e44fd5916c Merge "emulator_arm64: Don't support AArch32" am: d5f89b11e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518218

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad467e4dd38e55d978142fa8582194278d371e3
 2020-12-09 18:34:38 +00:00
Lingfeng Yang
d5f89b11e6 Merge "emulator_arm64: Don't support AArch32" 2020-12-09 17:47:33 +00:00
Anton Hansson
1a9d81a06b Add bootclasspath config to its own makefile 
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Merged-In: Id3f91e387bba2e0525b4010f22fe380d1d8be537
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
 2020-12-09 17:16:52 +00:00
Yifan Hong
e51c7e8aef Set allow list for generic ramdisk 
Devices that uses generic ramdisk must inherit from generic_ramdisk.mk.
This makefile ensures that only a set of files can be installed to the
ramdisk. Other files must be installed to the vendor-ramdisk.

Let aosp_arm64 use this makefile.

Fixes: 173742069
Test: manual
Change-Id: Ib2a4a208deaf2f4d707bec256207b4b8479a601a
(cherry picked from commit bc9608c4c3f3cd0ac3f29863209c80fcfe4e2f7f)
 2020-12-09 16:31:25 +00:00
SzuWei Lin
9faf469d27 Move ro.zygote to vendor 
The system property ro.zygote should be define in vendor. It went
to system wrongly when replacing PRODUCT_DEFAULT_PROPERTY_OVERRIDES.

Bug: 173452246
Test: build a Pixel device and check build.prop under system and vendor
Change-Id: I86919f993ae44f3502eb63e728d33acaa14f7088
 2020-12-09 07:11:37 +00:00
Christian Wailes
4af080d7d7 Merge "Added new compiler filter properties for dexopt." am: e42b9ceb81 
Original change: https://android-review.googlesource.com/c/platform/build/+/1479801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4adf3e98b8ee18683339247537433239e33e2046
 2020-12-09 01:22:52 +00:00
Christian Wailes
e42b9ceb81 Merge "Added new compiler filter properties for dexopt." 2020-12-09 00:00:26 +00:00
Yifan Hong
2b7b66d475 Merge "Remove e2fsck from generic ramdisk." am: 748d568b29 am: 6dbe939e08 am: d7fe9121b0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a728504e674d02d66c7240ddd9f41abbd1c905c
 2020-12-08 20:34:39 +00:00
Yifan Hong
6dbe939e08 Merge "Remove e2fsck from generic ramdisk." am: 748d568b29 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eb169faa932d05c4ad79ed9e2304b5bb8157375
 2020-12-08 19:18:27 +00:00
Yifan Hong
748d568b29 Merge "Remove e2fsck from generic ramdisk." 2020-12-08 18:43:28 +00:00
Lingfeng Yang
9b6de576dc emulator_arm64: Don't support AArch32 
This is needed for the emulator to run on Apple Silicon.

In addition, we're going to move to 64-bit only soon across the platform
so it makes more sense to go with 64-bit-only going forward here.

Change-Id: I0d9d189cd0b7a07d6c315e8c0f99c7b4766b4bde
 2020-12-08 00:26:06 +00:00
Chris Wailes
edbbf82586 Added new compiler filter properties for dexopt. 
Bug: 173137187
Test: build
Merged-In: Ie413f5f0bcf5f691135530caee9111a496788ef8
Change-Id: Ie413f5f0bcf5f691135530caee9111a496788ef8
 2020-12-07 16:15:55 -08:00
Christian Wailes
5ccc11d23c Merge "Added new compiler filter properties for dexopt." 2020-12-07 20:08:06 +00:00
Kalesh Singh
343a6e9cf5 Add stable aidl memtrack hal to vndk list 
Bug: 175021432
Test: m; boot;
Change-Id: Iac54ae2ba8aacee7fa9c5b1c8b49ff1cfd7c8785
 2020-12-07 13:00:02 -05:00
SzuWei Lin
1b0f9bff9c Move ro.zygote to vendor 
The system property ro.zygote should be define in vendor. It went
to system wrongly when replacing PRODUCT_DEFAULT_PROPERTY_OVERRIDES.

Bug: 173452246
Test: build a Pixel device and check build.prop under system and vendor
Change-Id: I86919f993ae44f3502eb63e728d33acaa14f7088
Merged-In: I86919f993ae44f3502eb63e728d33acaa14f7088
 2020-12-07 08:05:27 +00:00
Chong Zhang
f09bc4bc3b Move mediatranscoding from system to apex 
bug: 159172726
Change-Id: If50286c743f5ba4286980ddaafd30c856be388d9
 2020-12-05 18:03:58 +00:00
Yifan Hong
1482fba34f Remove e2fsck from generic ramdisk. 
On devices using the generic ramdisk / GKI,
e2fsck is moved to vendor ramdisk now.

Fixes: 173425293
Test: build and manual inspect.
Change-Id: I27562a875ca33a1b6dd3dcf862232fd4dfef6564
 2020-12-04 15:28:57 -08:00
Yifan Hong
1ab5b9e4a1 Merge "Add linker to VAB with vendor_ramdisk" am: 69ba9af617 am: a3237f249c am: 6cf5fb4010 
Original change: https://android-review.googlesource.com/c/platform/build/+/1515823

Change-Id: I4bab84ec54cbba165308b151389d67e4d9ed8018
 2020-12-04 01:35:43 +00:00
Chris Wailes
6cac3c2d0c Added new compiler filter properties for dexopt. 
Bug: 173137187
Test: build
Change-Id: Ie413f5f0bcf5f691135530caee9111a496788ef8
 2020-12-03 15:12:31 -08:00
Yifan Hong
a3237f249c Merge "Add linker to VAB with vendor_ramdisk" am: 69ba9af617 
Original change: https://android-review.googlesource.com/c/platform/build/+/1515823

Change-Id: I080a319718999524d1d6420570c0408b4613c785
 2020-12-03 20:14:59 +00:00
Yifan Hong
0f87e32b42 Merge "Add Virtual A/B with vendor ramdisk product." am: 08d1865332 am: 90dd8696d4 am: 2d3d56f1aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506505

Change-Id: I427f79cf5d369edba314b9f69bf244ee8bb6b1e0
 2020-12-03 05:20:45 +00:00
Yifan Hong
914ef21c28 Add linker to VAB with vendor_ramdisk 
Add linker.vendor_ramdisk for Virtual A/B devices with
a vendor_ramdisk because e2fsck is dynamic.

Test: pass
Bug: 173425293
Change-Id: I0a6f5bf15362e28eaa07a4d639ea23749b94b0f5
 2020-12-02 19:51:16 -08:00
Yifan Hong
90dd8696d4 Merge "Add Virtual A/B with vendor ramdisk product." am: 08d1865332 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506505

Change-Id: If927d3717936c4eaa382ceb691f780a9f7e3f2c1
 2020-12-03 03:46:54 +00:00
Yifan Hong
08d1865332 Merge "Add Virtual A/B with vendor ramdisk product." 2020-12-03 03:02:35 +00:00
Xin Li
4bc4ff3c11 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: I880b5dfb7bfea4b6abef9fcb603abcb383d84f42
Change-Id: I3c3385a1c58004f1ee6124de0c86dfff614a3bf6
 2020-12-02 00:03:31 -08:00
Martijn Coenen
05d7fefb7d Add on-device signing binary to base. 
Bug: 165630556
Test: inspect image
Change-Id: Ia428165be4a9800df23918330ab027458c84836d
 2020-11-27 12:22:46 +01:00
Anton Hansson
ad38c3f252 Merge "Add bootclasspath config to its own makefile" 2020-11-26 10:56:01 +00:00
Anton Hansson
5add55ede1 Add bootclasspath config to its own makefile 
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
 2020-11-25 19:32:02 +00:00
Anton Hansson
8c73673e73 Add bootclasspath config to its own makefile 
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Merged-In: Id3f91e387bba2e0525b4010f22fe380d1d8be537
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
 2020-11-25 18:53:37 +00:00
Neil Fuller
8cb8a5f900 Merge "Add the geotz jar to the system server" 2020-11-24 15:38:59 +00:00
Treehugger Robot
e91a9246ab Merge changes from topic "vab_makefile_move" am: 3e2f8dae78 am: e4b1c1c64e am: 107d74afb3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506504

Change-Id: I869d330ab5c3cd76d2fb4387300309d1e7dec31b
 2020-11-24 03:37:12 +00:00
Treehugger Robot
107d74afb3 Merge changes from topic "vab_makefile_move" am: 3e2f8dae78 am: e4b1c1c64e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506504

Change-Id: Id0de80c9be38deac1201c4ab0b8c883f67a75d64
 2020-11-24 02:35:23 +00:00
Yifan Hong
6b7cc73ec5 Add Virtual A/B with vendor ramdisk product. 
If vendor_ramdisk exists, it is preferred to use launch_with_vendor_ramdisk.mk
because it moves e2fsck to vendor_ramdisk, making ramdisk smaller.

Devices that uses VABC is assumed to have a vendor ramdisk, so inherit
from this new makefile.

Test: pass
Change-Id: If6adad9985ca4750225fd4263edb42de1ddaf486
 2020-11-23 15:17:01 -08:00
Yifan Hong
942987d116 Add symlinks to legacy Virtual A/B makefiles. 
For Virtual A/B makefiles that is created before S, add
symlinks so that existing devices don't break.

Test: pass
Change-Id: Ie04c4a8a2375edc673a8a7a2adcd162b21178f68
 2020-11-23 15:17:01 -08:00
Yifan Hong
018c698280 Move virtual_ab makefiles to its own dir. 
Also add a readme file.

Test: none

Change-Id: Ia1e02d8fb0c6df13271f208b3ca1dc1f250b085b
 2020-11-23 15:17:01 -08:00
David Anderson
616d6bead7 Merge "Move snapuserd into the vendor ramdisk." am: 01585c5ce6 am: f32cb7f738 am: 0095342759 
Original change: https://android-review.googlesource.com/c/platform/build/+/1501055

Change-Id: I419ef2a7dcfcd50622cf200b890e2d692d9a90c9
 2020-11-23 22:40:33 +00:00
David Anderson
0095342759 Merge "Move snapuserd into the vendor ramdisk." am: 01585c5ce6 am: f32cb7f738 
Original change: https://android-review.googlesource.com/c/platform/build/+/1501055

Change-Id: I35a31aba6436fe4c8fa71c063d180e5a129df9ed
 2020-11-23 22:19:41 +00:00
David Anderson
01585c5ce6 Merge "Move snapuserd into the vendor ramdisk." 2020-11-23 21:18:07 +00:00
Neil Fuller
6009a0a38f Add the geotz jar to the system server 
Add the geotz jar to the system server classpath. This jar comes from a
new module "com.android.geotz".

Bug: 172546738
Test: build / boot
Change-Id: I0293d6e059cb53fb693a7ecf064874cbae5f8df0
 2020-11-20 19:33:25 +00:00
Bo Hu
bb17bd82c4 Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1 am: a084e1bf83 am: e1a86fedc0 am: a5cf995bdc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496

Change-Id: I69d1891ee38701136155805b9c47637677c0c338
 2020-11-20 04:42:46 +00:00
Bo Hu
a5cf995bdc Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1 am: a084e1bf83 am: e1a86fedc0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496

Change-Id: I9cde12bb589f4ef855e5d7aacd8ab606e3182b39
 2020-11-20 04:07:29 +00:00
Bo Hu
e1a86fedc0 Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1 am: a084e1bf83 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496

Change-Id: Ica00df7f3b8d62470311ce4020f799a52f3dcd80
 2020-11-20 03:21:22 +00:00
Treehugger Robot
8e73e27b2e Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc am: d6b56ebb57 am: 9be500f3e1 am: e4fa02b341 
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: Ie3f7346acb9603db4ded6f4bc757c12f18414684
 2020-11-20 02:51:12 +00:00
Treehugger Robot
e4fa02b341 Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc am: d6b56ebb57 am: 9be500f3e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: I6278d2dc2f730dc87cd0e4897c7a333d81a3cb38
 2020-11-20 02:29:48 +00:00
Bo Hu
1816caecf1 Merge "emulator: enable cfi for emulator's wifi driver" 2020-11-20 02:17:44 +00:00
Treehugger Robot
9be500f3e1 Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc am: d6b56ebb57 
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: I2233d95a50a198c014507aed6e57c9d0bb9a71d7
 2020-11-20 02:05:22 +00:00
Treehugger Robot
3ccf730cdc Merge "Use 'inherit-product/inherit-product-if-exists to include config files" 2020-11-19 23:54:27 +00:00
Emilian Peev
780b804233 Add CameraExtensionsProxy to handheld_system 
Include the camera extensions proxy service as
part of the handheld system image.

Bug: 170481080
Test: Camera CTS
Change-Id: Icb81abd9468f15a823c9de5b8b29a0e1eeee46d9
 2020-11-19 15:12:40 -08:00
bohu
79106cd3ab emulator: enable cfi for emulator's wifi driver 
Since the wpa_supplicant_8 has enabled cfi, the
static lib that it uses should enable cfi, otherwise
there will be runtime crashes.

BUG: 169343095
Test:
lunch sdk_phone_arm64-userdebug
m -j
run the image on the aarch64-linux host
hostapd_nohidl and wpa_supplicant should
not crash with cfi failures.

Change-Id: I00e3840032530ee62aac69cab0b54755f83291f9
 2020-11-19 12:50:47 -08:00
David Anderson
8820eaa5e5 Move snapuserd into the vendor ramdisk. 
For devices that are GKI capable, including virtual_ab_ota_compression
will now include snapuserd in the vendor ramdisk.

For devices that are not GKI-capable (eg do not have vendor_boot),
virtual_ab_ota_compression_retrofit.mk must be included in addition to
virtual_ab_ota_compression.mk. This structure is to avoid needing a
large combination of different Makefiles.

Bug: 173463595
Test: manual test
Change-Id: Idc740d3523c2d166dd578cee41ea07d7eaf8edfa
 2020-11-18 22:12:34 -08:00
Treehugger Robot
e40cceccaa Merge "Make related stuff for Keymint V1." am: fa91bf2fad am: d051b1381f am: a2f30a1d39 am: 39a9a9a19f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1390756

Change-Id: I4c9da1334c31896024c87e3faa63bde3a3422ae7
 2020-11-17 17:51:30 +00:00
Treehugger Robot
39a9a9a19f Merge "Make related stuff for Keymint V1." am: fa91bf2fad am: d051b1381f am: a2f30a1d39 
Original change: https://android-review.googlesource.com/c/platform/build/+/1390756

Change-Id: I9025feac3ead776f748acd400e204efc56374945
 2020-11-17 17:33:06 +00:00
Treehugger Robot
a2f30a1d39 Merge "Make related stuff for Keymint V1." am: fa91bf2fad am: d051b1381f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1390756

Change-Id: Idd08b32d91647cf9651ac4aee7e03b13cca6c22c
 2020-11-17 17:10:02 +00:00
Treehugger Robot
fa91bf2fad Merge "Make related stuff for Keymint V1." 2020-11-17 16:13:50 +00:00
Palmer Dabbelt
aa201ddd64 Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" am: 750061ddf8 am: 793516264d am: 6086d8175f am: 890be30837 
Original change: https://android-review.googlesource.com/c/platform/build/+/1482957

Change-Id: Ic112a91a28bb16a396597ce4ab0bd9c14fb53ecd
 2020-11-17 05:08:39 +00:00
Palmer Dabbelt
890be30837 Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" am: 750061ddf8 am: 793516264d am: 6086d8175f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1482957

Change-Id: I469e1dbe6fd4c2827e4861f961e2c327872787e1
 2020-11-17 04:48:18 +00:00
Palmer Dabbelt
6086d8175f Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" am: 750061ddf8 am: 793516264d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1482957

Change-Id: I303b79a4a89c23579bcc646f6c2d3b20032eeb7a
 2020-11-17 04:12:26 +00:00
Palmer Dabbelt
750061ddf8 Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" 2020-11-17 03:45:50 +00:00
Treehugger Robot
b10f45078a Merge "aosp_arm64: clarify GKI in readme." am: 68f59362f4 am: 3cb8c98c30 am: 56ba49aae8 am: ca7201d88c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1500890

Change-Id: I590d6e48a273566ad4a203ee6f7d451f7c1e2dbf
 2020-11-17 02:25:23 +00:00
Treehugger Robot
ca7201d88c Merge "aosp_arm64: clarify GKI in readme." am: 68f59362f4 am: 3cb8c98c30 am: 56ba49aae8 
Original change: https://android-review.googlesource.com/c/platform/build/+/1500890

Change-Id: I9ed5d28fef40c325c7f6e521be3c943725b72613
 2020-11-17 02:02:16 +00:00
Treehugger Robot
56ba49aae8 Merge "aosp_arm64: clarify GKI in readme." am: 68f59362f4 am: 3cb8c98c30 
Original change: https://android-review.googlesource.com/c/platform/build/+/1500890

Change-Id: I3da1d6e86783faf458b6fefe08704e14817e3dcf
 2020-11-17 01:53:36 +00:00
Treehugger Robot
68f59362f4 Merge "aosp_arm64: clarify GKI in readme." 2020-11-17 00:46:41 +00:00
Yifan Hong
d440184471 aosp_arm64: clarify GKI in readme. 
Test: none
Change-Id: Id24912a67c8700f3c68dfa924ab7b85246c7fcb0
 2020-11-16 11:40:58 -08:00
Treehugger Robot
5a31062e55 Merge "OWNERS: include core sepolicy OWNERS" am: 696b0a2667 am: a9ca48d96a am: 045334a644 am: b1cb21701a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1499364

Change-Id: I5da0cf33e19d410544c1653c0ca78b052b4e97bf
 2020-11-16 17:28:16 +00:00
Treehugger Robot
b1cb21701a Merge "OWNERS: include core sepolicy OWNERS" am: 696b0a2667 am: a9ca48d96a am: 045334a644 
Original change: https://android-review.googlesource.com/c/platform/build/+/1499364

Change-Id: Ic42545b1faf9a3e900023cbe92bb3215b2d739cd
 2020-11-16 16:57:37 +00:00
Treehugger Robot
045334a644 Merge "OWNERS: include core sepolicy OWNERS" am: 696b0a2667 am: a9ca48d96a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1499364

Change-Id: I2a8643d5d21d559b65ba57a123ee1abb5e2e5afa
 2020-11-16 16:26:34 +00:00
Jeff Vander Stoep
f5dd057095 OWNERS: include core sepolicy OWNERS 
Simplify OWNERS by referencing a centralized list.

Test: n/a
Change-Id: Ibbdb8b217e387bdc66069e91d034a933ca9fa2b0
 2020-11-16 13:26:38 +01:00
Treehugger Robot
fc0f67f54d Merge "Add libdmabufheap to VNDK SP list" am: 8e00778fb6 am: 2226b642da am: 77f953ced5 am: a77dfccb7a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1496768

Change-Id: If08fc4644360cd0017265454091beb66d537ea78
 2020-11-14 02:58:59 +00:00
Treehugger Robot
a77dfccb7a Merge "Add libdmabufheap to VNDK SP list" am: 8e00778fb6 am: 2226b642da am: 77f953ced5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1496768

Change-Id: Ia081ad756b509ab1133aa175f8ea66fc25c188e5
 2020-11-14 02:15:32 +00:00
Treehugger Robot
77f953ced5 Merge "Add libdmabufheap to VNDK SP list" am: 8e00778fb6 am: 2226b642da 
Original change: https://android-review.googlesource.com/c/platform/build/+/1496768

Change-Id: If83ff25387b6826e6fd5b4f56c9fcd9d950598df
 2020-11-14 02:02:07 +00:00
Treehugger Robot
8e00778fb6 Merge "Add libdmabufheap to VNDK SP list" 2020-11-14 01:25:09 +00:00
Yifan Hong
24aca416d3 Merge "aosp_arm64 Copy boot image from $OUT to target files" am: f07ceb45b2 am: 1564782378 am: 254a91de7e am: aea8fc2c84 
Original change: https://android-review.googlesource.com/c/platform/build/+/1493256

Change-Id: I2366770390aea0f86e7e0baf8d55979fc2c940f8
 2020-11-13 01:39:22 +00:00
Yifan Hong
aea8fc2c84 Merge "aosp_arm64 Copy boot image from $OUT to target files" am: f07ceb45b2 am: 1564782378 am: 254a91de7e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1493256

Change-Id: I31ddb7044f9cb127f81d1f839948a9581362210a
 2020-11-13 01:20:53 +00:00
Yifan Hong
254a91de7e Merge "aosp_arm64 Copy boot image from $OUT to target files" am: f07ceb45b2 am: 1564782378 
Original change: https://android-review.googlesource.com/c/platform/build/+/1493256

Change-Id: Ie56a170cf6f7a7aa3d12250beb1bae9f65b7f3a6
 2020-11-13 00:49:22 +00:00
Hridya Valsaraju
cfd80b3a6e Add libdmabufheap to VNDK SP list 
Test: make
Bug: 154310076
Change-Id: I0ec2bce1a6636ac332c7dee370173a727d9d013b
 2020-11-11 16:31:31 -08:00
Jeff Sharkey
688682b235 Merge "Custom binary XML wire protocol tools." 2020-11-11 18:11:52 +00:00
Palmer Dabbelt
2d691edf69 Add dmuserd to PRODUCT_PACKAGES_DEBUG 
This is a simple dm-user daemon that will be used for the QA tests.

Test: manual, b/171749628
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Change-Id: I37b78a1479f08f37fe7cff3f2e201dc6d8a6e584
 2020-11-10 13:48:02 -08:00
Yifan Hong
49968aa137 aosp_arm64 Copy boot image from $OUT to target files 
If BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES is defined,
in target files, instead of rebuilding the boot image, copy the boot
image already built in $OUT to target files package directly so that
they are the same package.

Define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES for aosp_arm64.

The GKI APEX is built using the boot image in $OUT. If the boot image in
$OUT is different from the boot image in target files, aka the generic
boot image we release, the GKI APEX we built is invalid.

If another device needs to copy $OUT/boot.img to target files, it can
define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES.

Fixes: 172682114
Test: lunch aosp_arm64 &&
Change-Id: I10fc7a5aa36e976dbeaf25434239687455bba061
 2020-11-10 12:55:40 -08:00
Sasha Smundak
66589d1328 Use 'inherit-product/inherit-product-if-exists to include config files 
Bug: 172923994
Test: treehugger
Change-Id: I762dfa8dc48c0b09597d2f7b6ef7f53062915a79
 2020-11-10 09:59:28 -08:00
David Anderson
84fe04bef7 Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450 am: c0a5fefc1f am: 498a4291ff am: 015a38a81c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824

Change-Id: Ic6a99179687a029cd64e5df0cdb6c937f63e43dc
 2020-11-07 04:15:20 +00:00
Yifan Hong
3917b2019b Merge "Install e2fsck_ramdisk to GKI ramdisk." am: 97c8455634 am: 38d4d432b7 am: d0e4a325d5 am: c4803f8900 
Original change: https://android-review.googlesource.com/c/platform/build/+/1489086

Change-Id: Ie1b1c7848ba3eae13b045c3cd06e70dd531f2a71
 2020-11-07 04:14:55 +00:00
David Anderson
015a38a81c Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450 am: c0a5fefc1f am: 498a4291ff 
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824

Change-Id: I971745c0a7861b1e017ec273d3da8cc188a81443
 2020-11-07 03:44:49 +00:00
Yifan Hong
c4803f8900 Merge "Install e2fsck_ramdisk to GKI ramdisk." am: 97c8455634 am: 38d4d432b7 am: d0e4a325d5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1489086

Change-Id: Ibd03e59df3801149912b1e6664999fc556ab0a36
 2020-11-07 03:44:25 +00:00
David Anderson
498a4291ff Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450 am: c0a5fefc1f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824

Change-Id: Icce918e6ee1ffece1e8515929095e9aaa5a2d83e
 2020-11-07 00:28:25 +00:00