Commit Graph

37326 Commits

Author SHA1 Message Date
Colin Cross
adf79a5e3e Merge "Add prebuilt_rfsa module type" am: 8d0ed7ebd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1671668

Change-Id: I603dee969c5dea822b89e5501c95aa338d83abc0
2021-04-30 16:52:23 +00:00
Paul Duffin
60bdd6c0ff Merge "Split findAndCopyBootJars into separate find and copy functions" am: 21695e2ce9 am: ca945032c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688393

Change-Id: I06de6a17abd3d80c4a45834cfa73d43801c5ee9c
2021-04-30 16:44:18 +00:00
Colin Cross
8d0ed7ebd5 Merge "Add prebuilt_rfsa module type" 2021-04-30 16:35:20 +00:00
Paul Duffin
ca945032c8 Merge "Split findAndCopyBootJars into separate find and copy functions" am: 21695e2ce9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688393

Change-Id: I91ec7304577005fed8ce50690fcedfd08e6f6b21
2021-04-30 16:29:27 +00:00
Paul Duffin
21695e2ce9 Merge "Split findAndCopyBootJars into separate find and copy functions" 2021-04-30 16:09:56 +00:00
Lukács T. Berki
30b77b329e Merge "Handle the version_script property." am: dac1db044b am: 8e9c7d9212
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690878

Change-Id: I7f7321b313458ddf967540d4a535a46c2fe293bb
2021-04-30 15:06:39 +00:00
Colin Cross
b56c6b9379 Merge "Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries" am: a5b1ea248f am: 46c461b968
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1691266

Change-Id: I360afe1bec4479f73e5fde005cde467236a00513
2021-04-30 15:06:34 +00:00
Colin Cross
3d1c6a5757 Merge "Clean symbols directory during installclean" am: 13b03bf5bb am: 8226a33d4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688963

Change-Id: I4a04fae99003337eedddbfea49b808ce5aeb54e3
2021-04-30 15:06:28 +00:00
Lukács T. Berki
8e9c7d9212 Merge "Handle the version_script property." am: dac1db044b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690878

Change-Id: I9a76a28df76088171def80b57c1e067f17382dc0
2021-04-30 14:59:31 +00:00
Colin Cross
46c461b968 Merge "Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries" am: a5b1ea248f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1691266

Change-Id: I719b1c8cbdf79d279c3e8d0d8c3d5e262388495b
2021-04-30 14:58:21 +00:00
Paul Duffin
fba7e1865b Merge "Fix build failure when building unbundled apps (second try)" am: fdf4050440 am: 3e7cb6c6e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690873

Change-Id: I22f53ffb39fe742312b0c46f88df873a399e0159
2021-04-30 14:57:29 +00:00
Colin Cross
8226a33d4d Merge "Clean symbols directory during installclean" am: 13b03bf5bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688963

Change-Id: I32d7f8827fda969ab9be74875fb6362a206d8d55
2021-04-30 14:57:27 +00:00
Lukács T. Berki
dac1db044b Merge "Handle the version_script property." 2021-04-30 14:50:19 +00:00
Lukacs T. Berki
1353e59690 Handle the version_script property.
Doesn't work when depends on arch/target/etc., but good enough for
libdl_android.

Bug: 186650430
Test: Presubmits.
Change-Id: Ib0facb41a89454717c74663e5e078aedd33d1b9c
2021-04-30 16:46:41 +02:00
Colin Cross
a5b1ea248f Merge "Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries" 2021-04-30 14:43:03 +00:00
Colin Cross
13b03bf5bb Merge "Clean symbols directory during installclean" 2021-04-30 14:42:46 +00:00
Paul Duffin
3e7cb6c6e2 Merge "Fix build failure when building unbundled apps (second try)" am: fdf4050440
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690873

Change-Id: If6e07f9574085d7b0a26b1f2b07a7d9973ef49e0
2021-04-30 14:36:13 +00:00
Paul Duffin
fdf4050440 Merge "Fix build failure when building unbundled apps (second try)" 2021-04-30 14:16:32 +00:00
Jingwen Chen
6d722f14de Merge "bp2build: add bugs and update bp2build denylist." am: bb546aaea0 am: 2a205101c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690928

Change-Id: I7eee1685d1bc1ae39a27e911a1f9ddb682982bf0
2021-04-30 13:38:09 +00:00
Treehugger Robot
a1fe410f89 Merge "Move configuration checks from getBootImageJar" am: 3f9af76391 am: e4a004eaa3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688391

Change-Id: Ibca12ee5931a2de6738a42b320ae0f4ce2628f64
2021-04-30 13:37:58 +00:00
Jingwen Chen
2a205101c3 Merge "bp2build: add bugs and update bp2build denylist." am: bb546aaea0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690928

Change-Id: I00db822c5ec46f38277fee19b0bf113fb2eb7a7c
2021-04-30 13:13:38 +00:00
Treehugger Robot
e4a004eaa3 Merge "Move configuration checks from getBootImageJar" am: 3f9af76391
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688391

Change-Id: Ide21375eb1303c2ea57bd687de71c99d1f78da04
2021-04-30 13:13:07 +00:00
Jingwen Chen
bb546aaea0 Merge "bp2build: add bugs and update bp2build denylist." 2021-04-30 13:08:32 +00:00
Andrei-Valentin Onea
c4e90a7a3f Merge "Exclude RequiresApi from generated stubs" am: f794e8269d am: ea34723186
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690867

Change-Id: I62b2271e6cdddedfb1b1e7ce417cd3f2fd0ab910
2021-04-30 13:05:55 +00:00
Treehugger Robot
3f9af76391 Merge "Move configuration checks from getBootImageJar" 2021-04-30 12:56:56 +00:00
Andrei-Valentin Onea
ea34723186 Merge "Exclude RequiresApi from generated stubs" am: f794e8269d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690867

Change-Id: I497cd4d988d32d2302e566739bd9cbfce486af28
2021-04-30 12:49:54 +00:00
Paul Duffin
d504c3ac83 Fix build failure when building unbundled apps (second try)
The previous attempt, which simply skipped the hidden API processing
altogether when unbundled builds were enabled failed when attempting to
build module snapshots as while they enabled an unbundled build they
actually need the hidden API processing to be performed.

This change just checks whether missing dependencies are allowed and if
so it fakes up any missing files so that the build will only fail if
they are not present AND they are used.

Bug: 186695448
Bug: 185828824
Test: tapas Calendar
      m -j60

Change-Id: Ie13fed05af0aba51f45f6791fce944d0e4285037
2021-04-30 13:42:44 +01:00
Andrei-Valentin Onea
f794e8269d Merge "Exclude RequiresApi from generated stubs" 2021-04-30 12:31:07 +00:00
Paul Duffin
d6894ca4b9 Split findAndCopyBootJars into separate find and copy functions
The main difference between the dexpreopt_bootjars singleton and the
platform_bootclasspath singleton module is the way they find the
modules to use. The former searches all modules, the latter adds
dependencies on the modules that they need. This change separates the
finding of the modules from the copying of the boot jars for those
modules to make it easier to move the remaining functionality to
platform_bootclasspath.

This temporarily creates a singleton specific copy of the hidden API
function isModuleInConfiguredList() to select the modules in place of
the logic in the getBootJar() method. There is a slight loss of context
information from the error messages but as these methods will be
removed once the boot image creation has moved this is not an issue.

While switching the isModuleInConfiguredListForSingleton() to use the
SingletonContext the error message was fixed to include the name of
the module with the issue.

Bug: 177892522
Test: m nothing
Change-Id: Iaea906da95d9da5301fb964fc593890f2216d336
2021-04-30 12:10:54 +01:00
Paul Duffin
f23bc472b0 Move configuration checks from getBootImageJar
The getBootImageJar function will be removed once the boot image
creation has been moved to the platform_bootclasspath and
bootclasspath_fragment module types. However, the consistency checks
that it performs are still useful so this change moves them out
first.

The ART boot image related checks are now performed in the
bootclasspath_fragment module type. A previous change accidentally
disabled the checks when the contents property was not empty which has
been fixed. Also, the error messages have been tweaked to make it clear
that the art-bootclasspath-fragment is now the source of truth as to
its contents not the configuration.

The framework boot image related checks are now performed in the
platform_bootclasspath module type.

Initially, this change included an extra check to make sure that
UpdatableBootJars comes from updatable APEXes but that broke because
framework-wifi and framework-tethering are not currently marked as
updatable in AOSP.

Bug: 177892522
Test: m nothing
Change-Id: I80fb600fa2c7cec4566b3461c6a33c4c6f0743f4
2021-04-30 12:06:28 +01:00
Jingwen Chen
790324e69c bp2build: add bugs and update bp2build denylist.
This CL updates the error messages and reorganizes the bottom half of
the bp2build denylist.

Test: TH
Change-Id: Ib15d019ba9cd006a78474477af34c66b5e418348
2021-04-30 09:43:20 +00:00
Rupert Shuttleworth
ebd79bcb13 Update reasons for modules being on the deny list (and add bug links). am: 47aa58420b am: 2168230e8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1692285

Change-Id: I41770945169f4f18e820edff17a97551ee3dbdbb
2021-04-30 09:24:01 +00:00
Rupert Shuttleworth
2168230e8c Update reasons for modules being on the deny list (and add bug links). am: 47aa58420b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1692285

Change-Id: Ibce30d1eab7a504cb1cda17ddd61f4e690a43850
2021-04-30 08:58:27 +00:00
Rupert Shuttleworth
47aa58420b Update reasons for modules being on the deny list (and add bug links).
Test: bp2build; bazel build //bionic/...
Test: build/bazel/scripts/run_presubmits.sh

Change-Id: I852146b9df57689c022cb4e6c5b9e4a764866822
2021-04-30 04:28:49 -04:00
Jingwen Chen
3fd3d76d9c Group some modules together under a single bug for tracking purposes. am: d01da05860 am: baf10be386
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690927

Change-Id: Ib2e3279e25c7f731120c3126afc274db9f60fc60
2021-04-30 06:05:20 +00:00
Jingwen Chen
baf10be386 Group some modules together under a single bug for tracking purposes. am: d01da05860
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690927

Change-Id: I82be1a199afd621a268077de6e4b5f6155b71e8e
2021-04-30 05:47:45 +00:00
Kousik Kumar
19c7101d2d [automerger skipped] Print the output from RBE bootstrap shutdown am: 91a46d0ef4 am: 1f3a7f6ccf am: 6874a5b8d0 am: e992416430 -s ours
am skip reason: Merged-In I90082a8433504e40bbf92992c3c8d1d656c49429 with SHA-1 2081052592 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: Ifcaed471ad5060720eeb8ae94f0129ebce8551c9
2021-04-30 05:47:40 +00:00
Kousik Kumar
e992416430 Print the output from RBE bootstrap shutdown am: 91a46d0ef4 am: 1f3a7f6ccf am: 6874a5b8d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: I7a0c74d03a14f0d6e4ec320306d965dd13b10b2e
2021-04-30 05:23:14 +00:00
Kousik Kumar
6874a5b8d0 Print the output from RBE bootstrap shutdown am: 91a46d0ef4 am: 1f3a7f6ccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: I7d8dd627fd0e93c2ae1a48bb635beb06089dd80a
2021-04-30 05:07:38 +00:00
Kousik Kumar
1f3a7f6ccf Print the output from RBE bootstrap shutdown am: 91a46d0ef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: Ie450c8f1b27f21246b5f17ae6a56b918b7a3a78a
2021-04-30 04:49:24 +00:00
Jingwen Chen
d01da05860 Group some modules together under a single bug for tracking purposes.
Test: TH
Change-Id: I3f75bbd5c1455ab42d589d884a705bf09ef0b825
2021-04-30 03:33:15 +00:00
Treehugger Robot
60fd78300a Merge "Revert "Fix build failure when building unbundled apps"" am: 1468cc4a10 am: 00803e6ee9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1691213

Change-Id: If8752e8d442d5141af41b9e607e78634a0121cf7
2021-04-30 03:22:59 +00:00
Treehugger Robot
00803e6ee9 Merge "Revert "Fix build failure when building unbundled apps"" am: 1468cc4a10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1691213

Change-Id: I0c3523d447222dd95ee1efa2acec7121dbb19dce
2021-04-30 02:56:18 +00:00
Treehugger Robot
1468cc4a10 Merge "Revert "Fix build failure when building unbundled apps"" 2021-04-30 01:52:57 +00:00
Kousik Kumar
91a46d0ef4 Print the output from RBE bootstrap shutdown
The output from bootstrap would contain the a one-line summary of RBE
download / upload stats.

Bug: b/183007125
Change-Id: I90082a8433504e40bbf92992c3c8d1d656c49429
Merged-In: I90082a8433504e40bbf92992c3c8d1d656c49429
2021-04-29 20:49:13 -04:00
Vishnu Nair
0dbd02a3ac Revert "Fix build failure when building unbundled apps"
This reverts commit c027119e73.

Reason for revert: b/186797512
Test: vendor/google/build/build_mainline_modules.sh -j80

Change-Id: I2bb062cce09ac6717702c4f6b110acbb2887adec
2021-04-30 00:24:07 +00:00
Paul Duffin
223ffec55e Merge "Fix build failure when building unbundled apps" am: 5983d856c1 am: 7e953b936d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690870

Change-Id: I24060082f5c72f6973c05d757b40089e4412b24f
2021-04-29 21:20:15 +00:00
Paul Duffin
29742054b5 Merge "Move generation of hidden API make vars to platform_bootclasspath" am: ad7fa97f8d am: 8eee268aa7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690548

Change-Id: I28a48fc2e7a40b5445a23154430b0673072b302d
2021-04-29 21:19:17 +00:00
Paul Duffin
7e953b936d Merge "Fix build failure when building unbundled apps" am: 5983d856c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690870

Change-Id: I23780570f7ea33639d479dcbbd0b5e5870d523f4
2021-04-29 20:59:52 +00:00
Colin Cross
76f0ba81d3 Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries
The modules in a flattened apex have suffixes that ensure they don't
conflict with the platform versions, so they can ignore HideFromMake.
This ensures that Make can install symbols for all libraries in
apexes.

Fixes: 180622230
Test: banchan com.android.adbd && m && ls $OUT/symbols/apex/com.android.adbd/lib
Change-Id: I76d1aba2eed6ae27d9a954bf88f40f0d00fc6a98
2021-04-29 13:54:49 -07:00