Commit graph

6884 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
248ee9f249 update vndk list
Test: m
Bug: 150578172
Change-Id: I98fa56d527124008fc60d60a7f45f200f20e5707
Merged-In: Ic53702ede81f9edbc8e29e92df4470b99b696098
2021-02-17 15:58:18 +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
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
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
2ecbebdcd2 Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" 2021-02-12 09:35:55 +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
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