Commit Graph

42755 Commits

Author SHA1 Message Date
Mathew Inwood 4669614b92 Update error message for new policy.
A new presubmit hook enforces that required information is present in
any CL that adds new dependencies to allowed_deps.txt.

Test: m
Bug: 195303213
Merged-In: I1fb932a52f64f9cbf0d12ead75ffd3d9c2a5e942
Change-Id: I1fb932a52f64f9cbf0d12ead75ffd3d9c2a5e942
2021-08-24 13:17:08 +01:00
Treehugger Robot 4c48b27091 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours am: 5fa40b1a2b -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I563147d07f921809bfa6ac432169a9c4f1025b10
2021-08-19 19:56:27 +00:00
Treehugger Robot c7409844c7 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours am: 1ffe58c42b -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: Ie1066b72483d6ccfa92e66349d5803baa4576e22
2021-08-19 19:56:16 +00:00
Treehugger Robot 5fa40b1a2b [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I74586233adc72131f77e4fb6c6ee777df07dffd2
2021-08-19 19:40:34 +00:00
Treehugger Robot 1ffe58c42b [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I7169df1cda5f89648159bff750aea245384346a6
2021-08-19 19:40:30 +00:00
Treehugger Robot 0b7859c0d9 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: Ibf4e6d9cb9077871b480651137e7444670eb88ac
2021-08-19 19:24:21 +00:00
Treehugger Robot 41a0ece7d4 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: If98b1b5871568e54889b195a475d670e00030c6e
2021-08-19 19:23:27 +00:00
Treehugger Robot 46d4a14089 Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816

Change-Id: If65b22f21e7b46113800525668598d63020c26fe
2021-08-19 19:09:43 +00:00
Treehugger Robot 9ba871bbe9 Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816

Change-Id: I9e55824b4e8359eb514c6cb3d31b8e0a98c55a7d
2021-08-19 19:09:04 +00:00
Treehugger Robot 907bbdfc9f Add FAILED: prefix to RBE Fatal error message"
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560871

Bug: b/195592452
Change-Id: I00e2cb26eb3e1e3b695ba067cad24f45169f3a58
(cherry picked from commit ab2803a870)
Merged-In: Ie0c9acee2739acf149384e33804b5fca3273c24f
2021-08-19 17:08:49 +00:00
Colin Cross 2047053d56 Collect lint reports from apps in apexes am: 192221b55e am: e9fc2e55b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15531885

Change-Id: I1db1a27444ddadd5978382722789551ea0883283
2021-08-11 19:34:33 +00:00
Colin Cross e9fc2e55b3 Collect lint reports from apps in apexes am: 192221b55e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15531885

Change-Id: I013e140227377cb6226a1e771f858f11f0f17fe8
2021-08-11 18:57:57 +00:00
Colin Cross 192221b55e Collect lint reports from apps in apexes
Lint reports were only being collected from jars in apexes, not
apps.

Bug: 188772607
Test: mainline_modules_arm64 build
Change-Id: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
Merged-In: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
(cherry picked from commit 8355c1524fbb1d6b7b7a25a13f66feffb1aa7214)
2021-08-11 09:07:57 -07:00
Kun Niu b6676298e7 Merge "Use prebuild modules even when coverage is enabled." into sc-dev am: fe1d6c535c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15472697

Change-Id: I82893d0059d77e6d65cb0fa5b3f2bbd01a60c2cb
2021-08-06 19:32:48 +00:00
Kun Niu fe1d6c535c Merge "Use prebuild modules even when coverage is enabled." into sc-dev 2021-08-06 19:12:27 +00:00
Kousik Kumar c430022a5d resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942 am: a907f283fc am: 0c49dac503
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: I3a1193cc317f2eb45bd7f7275a9e176de53e730f
2021-08-06 16:24:39 +00:00
Kousik Kumar f031e61072 resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942 am: 4d645c7791 am: e8d959e5cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: I36205409c661ffce7330e79b77e35c71f98db598
2021-08-06 16:24:30 +00:00
Kousik Kumar 0c49dac503 resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942 am: a907f283fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: I42938333328a0a42f99f80ba4b53e64b33935316
2021-08-06 16:09:04 +00:00
Kousik Kumar e8d959e5cf resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942 am: 4d645c7791
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: I5568c2f0fed211356a521bed0e26332e930bd22b
2021-08-06 16:03:42 +00:00
Kousik Kumar a907f283fc resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: Ied3e486f490decd767d4ae3c7c63947bf41cdc64
2021-08-06 15:45:40 +00:00
Kousik Kumar 4d645c7791 resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: I2168fdd669b5ea1b73fce690609be8293fd9069a
2021-08-06 15:45:38 +00:00
Kousik Kumar 3c12576942 resolve merge conflicts of 233c1be0bd to rvc-dev
Bug: b/194679562

Change-Id: Icb42c43c1b4c8018b1402bd508271a0d4a052b14
Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
2021-08-05 20:16:26 +00:00
Kun Niu ce1dcf6a9f Use prebuild modules even when coverage is enabled.
Bug: 194323871
Test: local build passed.
Change-Id: I94a3922453473de7d754afce4b05ac3b6ae3765d
2021-08-05 18:15:28 +00:00
Kousik Kumar 233c1be0bd Merge "Load RBE related env vars from config files" am: b3a5d18470 am: 9f6fa868c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15454953

Change-Id: Ie1e7b2bdb392c33a286d7f52e0fee4ccf560b1b7
2021-08-05 18:08:31 +00:00
Kousik Kumar 9f6fa868c5 Merge "Load RBE related env vars from config files" am: b3a5d18470
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773209

Bug: b/194679562
Change-Id: Id84167a3ae6ab15c8b74b72b4cc2c179e0da5d0c
Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
(cherry picked from commit a7ab7c9394ccfc80e163b5e405792a3975eaf2f3)
2021-08-03 13:22:44 -04:00
Mathew Inwood 284e1cf37a Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" into sc-dev am: e6cc66da0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15300391

Change-Id: Ifdd0e6b12fcbf89710184d2fa006c88c31ef1284
2021-07-26 12:36:48 +00:00
Mathew Inwood e6cc66da0e Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" into sc-dev 2021-07-26 12:16:14 +00:00
Chang Li 5df815ce31 Allowlist external/libtextclassifier for sdk_variant_only. am: 66d3cb727f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15358458

Change-Id: I14b2544d0501a3600587a1b760b012e490bd1a6b
2021-07-23 09:45:26 +00:00
Paul Duffin dbcc29647a Build updatable-bcp-packages.txt from prebuilts in sdk snapshot
Previously, the java_import and java_sdk_library_import modules did not
make their permitted_packages available to the rule that generates the
updatable-bcp-packages.txt file. This change corrects that.

Bug: 193095050
Test: m nothing
      - Added unit tests, which all failed and then fixed the tests.
Merged-In: If0706e4551a331b48d383123088e63924dded48b
Change-Id: If0706e4551a331b48d383123088e63924dded48b
(cherry picked from commit 630b11e9d4d63e5fabaa20adf5d1b1c81ede6681)
2021-07-23 09:42:28 +01:00
Chang Li 66d3cb727f Allowlist external/libtextclassifier for sdk_variant_only.
Bug: 166040889
Change-Id: If8a9d916dada116f52fd84194fa42e9179526b2c
2021-07-22 09:42:33 +00:00
Paul Duffin 1a8bb48592 Propagate permitted packages to sdk snapshot am: 7b3e10a1c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15300390

Change-Id: Ib2b7f65b363962e9190e135f319ba884deca4997
2021-07-15 16:32:41 +00:00
Paul Duffin 7b3e10a1c2 Propagate permitted packages to sdk snapshot
Previously, permitted_packages were not copied to the sdk snapshot.
This change corrects that.

Bug: 193763688
Test: m nothing
      - Added unit tests, which all failed and then fixed the tests.
Merged-In: I4560987f746f78c0ae706058195b6db4bea438aa
Change-Id: I4560987f746f78c0ae706058195b6db4bea438aa
(cherry picked from commit 869de147abdb2c86a91cced4fda7d27746c52af4)
2021-07-15 16:00:11 +01:00
Ulya Trafimovich cb416397a4 Drop "prebuilt_" prefix when adding libraries to class loader context. am: fa20b187dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15296451

Change-Id: I49b10389dac5cb085d6e5ed16643be3526f24d4f
2021-07-15 11:15:52 +00:00
Ulya Trafimovich fa20b187dc Drop "prebuilt_" prefix when adding libraries to class loader context.
This is needed when some source libraries get replaced with prebuilt
variants: CLC should contain one entry for a library (the prebuilt one
or the source one, whichever of them is preferred). Because the prebuilt
module name starts with "prebuilt_" prefix, previously Soong considered
such libraries as two different ones libraries and added both to CLC.

Bug: 193425964

Test: mark "prebuilt_android.net.ipsec.ike" as preferred and `m nothing`
      (before this CL it would fail the build, now it builds fine).

Test: $ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
      $ adb wait-for-device && \
        adb root && \
        adb logcat | \
        grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C 1
      # empty output, no errors
Change-Id: Icc42533d9915060d7fffda12aa93b9d18dc4f83d
Merged-In: Icc42533d9915060d7fffda12aa93b9d18dc4f83d
(cherry picked from commit 69c1aa94ac88bcb07f32c2ae4217776e82903068)
2021-07-15 11:17:24 +01:00
Martin Stjernholm 663d5a74d0 Merge "Do not allow duplicate deapexer dependencies." into sc-dev am: 8410eb1551
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15156931

Change-Id: Ifa13bc41cf84eca11214d374925eac03b8c453db
2021-07-12 09:15:17 +00:00
Martin Stjernholm 8410eb1551 Merge "Do not allow duplicate deapexer dependencies." into sc-dev 2021-07-12 09:01:43 +00:00
Paul Duffin d0687fd6a4 Merge "Generate boot images for host from prebuilts" into sc-dev am: d507060257
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15216505

Change-Id: I100fec6a236b48b15bae16ad3e6c5cccb42ffbce
2021-07-07 09:17:43 +00:00
Paul Duffin 103c8a760c Merge "Switch boot image generation to use GetGlobalSoongConfig(ctx)" into sc-dev am: 4ca4800023
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15217814

Change-Id: If3ac410611a6043feab3809706145a96af156ca7
2021-07-07 09:17:31 +00:00
Paul Duffin d507060257 Merge "Generate boot images for host from prebuilts" into sc-dev 2021-07-07 09:02:20 +00:00
Paul Duffin 4ca4800023 Merge "Switch boot image generation to use GetGlobalSoongConfig(ctx)" into sc-dev 2021-07-07 09:02:13 +00:00
TreeHugger Robot 17a8e769af Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev am: 0618d4e9ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15167733

Change-Id: I3a16693b3da64bba6ba5938969bc0200b0ff6dac
2021-07-07 03:24:16 +00:00
Inseob Kim 4d716ddbfd Revert "Add ramdisk_available to sysprop_library" am: 2594e41a07
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15167732

Change-Id: I71b64e3da089799a0627645ef39d75b3b2688d23
2021-07-07 03:24:08 +00:00
Inseob Kim af2bfec7ec Revert "Fix ndk and aml arch order" am: f64377ca2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15167731

Change-Id: Ia3fc37e9c594ba4d7611f5ca181bc0d25f69e0ab
2021-07-07 03:24:02 +00:00
TreeHugger Robot 0618d4e9ec Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev
* changes:
  Revert "Add install_in_root to cc_binary"
  Revert "Add ramdisk_available to sysprop_library"
  Revert "Fix ndk and aml arch order"
2021-07-07 03:02:00 +00:00
Paul Duffin 6e89b54780 Generate boot images for host from prebuilts
Previously, when building from prebuilts boot no rules were created to
produce the boot image files for the host, i.e. the OS on which the
build was running. That caused problems with checkbuilds. No rules were
produced as there was no host variant of a prebuilt apex to provide
them.

This change restructures the code to allow the prebuilt bootclasspath
fragment to build the host variants of the files from the dex files
provided by the prebuilt APEX. The generated files will not be the same
as they would be if built from source as there is no boot image profile
to use but it should be sufficient to satisfy the checkbuild target and
allow for host side testing.

Bug: 192575099
Test: m SOONG_CONFIG_art_module_source_build=false droid dist checkbuild
Merged-In: I6af00f19bb71aa18dd462f5eac6aa38e3e721023
Change-Id: I6af00f19bb71aa18dd462f5eac6aa38e3e721023
(cherry picked from commit a56be7d7815ad164cdd854f8fc6b1cbc3bbf1918)
2021-07-06 22:20:24 +01:00
Paul Duffin d564c32818 Switch boot image generation to use GetGlobalSoongConfig(ctx)
Previously, boot image generation used GetCachedGlobalSoongConfig(ctx)
in order to get access to the GlobalSoongConfig. That required that
some other part of the code had called GetGlobalSoongConfig(ctx) to
initialize the cached value. That was left over from when the boot
image generation was done in a singleton which could not call
GetGlobalSoongConfig(ctx) directly. That is no longer true.

This change switches the uses of GetCachedGlobalSoongConfig(ctx) to
GetGlobalSoongConfig(ctx) and removes the now unnecessary call to
GetGlobalSoongConfig(ctx) from outside the functions.

Bug: 192575099
Test: m nothing
Merged-In: I34b7b1526d072d8b09fda7caa96e381695888e16
Change-Id: I34b7b1526d072d8b09fda7caa96e381695888e16
(cherry picked from commit 8fc51a8eb6ca20dbb4b65822123201568bb297f1)
2021-07-06 22:20:24 +01:00
Paul Duffin b2e0dfd8e0 Generate boot zip file from prebuilt_bootclasspath_fragment am: bb2e205603
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15215491

Change-Id: I3ee3004f9cce95094823158acb5ca2470620fe60
2021-07-06 19:05:29 +00:00
Paul Duffin 141e562e6a Use both module name and stem name to filter updatable boot jars am: aba5275676
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15215490

Change-Id: I81d777d596e10565f68ea220a533ce7d27c71d38
2021-07-06 17:40:57 +00:00
Paul Duffin bb2e205603 Generate boot zip file from prebuilt_bootclasspath_fragment
Previously, the boot zip file, containing all the boot image files for
all the supported architectures, was only created from source. It was
not created when building from a prebuilt_bootclasspath_fragment. That
lead to build failures when building from ART prebuilts.

This change pulls the boot zip file creation out so that it can be done
for both source and prebuilt bootclasspath_fragment modules as well as
for the platform_bootclasspath module.

Bug: 192575099
Test: m out/target/product/generic_arm64/boot.zip
      m SOONG_CONFIG_art_module_source_build=false out/target/product/generic_arm64/boot.zip
      - Compare the output of the first command from before the change
        with the output from them both after and confirm that when the
        ART prebuilts are up to date with the source that there are no
        differences.
Merged-In: Ie7dd5e2ca4a865d06fd9ebf87320cf68c4d05bc3
Change-Id: Ie7dd5e2ca4a865d06fd9ebf87320cf68c4d05bc3
(cherry picked from commit 56afb27fb099cb79c1537c661628db1776f1fcc3)
2021-07-06 13:34:26 +01:00
Paul Duffin aba5275676 Use both module name and stem name to filter updatable boot jars
Sometimes the stem property is set to change both the installed file
name and the name use to filter the configured module list, e.g. when
adding a test library to replace the standard library, e.g. test_foo
instead of foo.

Sometimes it is used just to change the installed file name.

This change uses both to filter the updatable boot jars and not just
the stem.

Bug: 180105615
Test: m nothing
Merged-In: I6c459fc3597b1e4f062bc9a4e52843305b538c5f
Change-Id: I6c459fc3597b1e4f062bc9a4e52843305b538c5f
(cherry picked from commit 56c93e899a355311463d41e988c9ba511af14278)
2021-07-06 13:34:25 +01:00