Commit graph

5670 commits

Author SHA1 Message Date
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
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
Jeongik Cha
b84e1deb5e update vndk list
Bug: 150578172
Bug: 180417006
Test: m
Change-Id: I096b2c9f165a88c9725f4c63c87c7a9deab72f72
2021-03-02 22:46:48 +09: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
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
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