Commit graph

31057 commits

Author SHA1 Message Date
Treehugger Robot
7e9e1ae787 Merge "Add a doc about dex_preopt_check." am: a3dc792131 am: eabde79e55
Original change: https://android-review.googlesource.com/c/platform/build/+/2098894

Change-Id: Iec3ed9d888831bc77aa4c5604edfb3d46de1b38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 11:10:18 +00:00
Treehugger Robot
a3dc792131 Merge "Add a doc about dex_preopt_check." 2022-05-23 10:25:43 +00:00
Paul Duffin
dddc036bd1 Revert "Enable mainline prebuilts on tm-dev branch."
This reverts commit de9f0b12f1.

Reason for revert: breaks build_test and build_test2 on git_tm-dev.

Reverting the topic together does not work due to limitations with TH. However, this is the change that caused the error, the other changes were just fixing issues unrelated to this specific problem.

Bug: 233412962
Bug: 230478310
Bug: 223592962
Change-Id: I4d4de4f4c63c9c34fb083edbe76b09852af357e4
Test: presubmit
2022-05-21 00:17:09 +00:00
Jiakai Zhang
500671f61c Add a doc about dex_preopt_check.
The doc lists some possible causes of a `dex_preopt_check` error, which
can be useful for developers to understand how to debug the error.

Bug: 232542678
Test: m nothing
Change-Id: I2e9868a6a470e41e8c3743c045e0cf4cf7367efa
2022-05-20 16:21:46 +01:00
Dario Freni
de9f0b12f1 Enable mainline prebuilts on tm-dev branch.
Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Change-Id: Ibc3ea584b95f8186c63e29f71b5164451dc433cd
2022-05-20 11:40:39 +00:00
Yi Kong
b30e92b381 Merge "Rename modulesAddedWall to modulesWarningsAllowed" am: 05b2217940 am: 57e3ba803a
Original change: https://android-review.googlesource.com/c/platform/build/+/2100875

Change-Id: Ib5fb1502c8503c902492b971938b50970361a31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 00:49:00 +00:00
Yi Kong
05b2217940 Merge "Rename modulesAddedWall to modulesWarningsAllowed" 2022-05-20 00:26:18 +00:00
Yi Kong
ee99ddf900 Rename modulesAddedWall to modulesWarningsAllowed
MODULES_ADDED_WALL is deceiving and it actually meant which modules are
allowed to have warnings (do not automatically append -Werror flag).

Test: presubmit
Bug: 233183337
Change-Id: Ia2eb972d3d76ba245840f9872cbcc66d2894dab3
2022-05-19 20:16:00 +08:00
Dmitrii Merkurev
03e324006b Merge "Introduce EROFS compress hints to the Android build system" am: 494358dec8 am: a13fbaa01f
Original change: https://android-review.googlesource.com/c/platform/build/+/2098052

Change-Id: I3ed091156c4b39dad6eaf578144ac3d070025988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 11:41:19 +00:00
Treehugger Robot
507b4e863f Merge "Create $(zip_root)/PVMFW & archive prebuilt used" am: d528b3c553 am: 7520b7526f
Original change: https://android-review.googlesource.com/c/platform/build/+/2096401

Change-Id: I751deaa8d3c030f8b26de1346a079c1514445348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 11:01:22 +00:00
Dmitrii Merkurev
8ab6603a43 Introduce EROFS compress hints to the Android build system
Make it possible to provide a prebuilt hints file to specify different compression strategies on a file basis for all partitions using:

BOARD_EROFS_COMPRESS_HINTS := <path>/erofs-hints.txt

or separately for every partition using:

BOARD_SYSTEMIMAGE_EROFS_COMPRESS_HINTS := <path>/system-partition-erofs-hints.txt
BOARD_VENDORIMAGE_EROFS_COMPRESS_HINTS := <path>/vendor-partition-erofs-hints.txt

Hints format: Each line is defined by tokens separated by spaces in the following form:

<pcluster-in-bytes> <match-pattern>

pcluster-in-bytes can be specified as 0 which mean file will not be compressed

Bug: 231934752
Test: used dump.erofs -S system.img to verify the system image isn't compressed after specifying BOARD_SYSTEMIMAGE_EROFS_COMPRESS_HINTS := no-compress.txt, where no-compress.txt contains 0 .*
Test: used dump.erofs --nid=<inode-for-all-apk-files> vendor.img to verify apk files are not compressed (the rest of the partition content is compressed)
Test: used dump.erofs -S <all-images> to verify all images are not compressed after specifying BOARD_EROFS_COMPRESS_HINTS := <path>/no-compress.txt
Change-Id: I64054e26af5ea5781c45d2183b7796a9ad2b7927
2022-05-17 23:10:37 +00:00
Android Build Coastguard Worker
453b3a97c8 Version bump to SQ3A.220705.002 [core/build_id.mk]
Change-Id: I58d7db826390e958fc7e0ebd145ea6ba5f46502b
2022-05-17 18:42:22 +00:00
Treehugger Robot
d528b3c553 Merge "Create $(zip_root)/PVMFW & archive prebuilt used" 2022-05-17 16:34:22 +00:00
Treehugger Robot
54c1f7cea3 Merge "Add keep rules for @KeepForWeakReference annotation" am: 3eb3ca0c9b am: 41437def9a
Original change: https://android-review.googlesource.com/c/platform/build/+/2094724

Change-Id: I1d84cfafbe51f2a0a2e090aef1f10beff55a52f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:05:55 +00:00
Treehugger Robot
3eb3ca0c9b Merge "Add keep rules for @KeepForWeakReference annotation" 2022-05-16 21:19:03 +00:00
Android Build Coastguard Worker
3ab635a463 Make change and version bump to SQ3A.220705.001
Change-Id: I6f97b3953f0edf81f2643a7a46d333a8c52f2fbe
2022-05-16 21:13:40 +00:00
Steve Berbary
0ba2eacbcc Update Security String to 2022-07-05
Bug: 231380374
Change-Id: I745bd646af530a8c202994e48a0821a5cb7ec3dd
(cherry picked from commit e359b90082)
Merged-In: I745bd646af530a8c202994e48a0821a5cb7ec3dd
2022-05-16 21:10:55 +00:00
Steve Berbary
5fa9538fa3 Update Security String to 2022-07-05 am: e359b90082 am: 4dba876f41
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356643

Change-Id: Id4983957783d3d21d04ff853ed833ce645124373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:17:08 +00:00
Steve Berbary
4dba876f41 Update Security String to 2022-07-05 am: e359b90082
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18356643

Change-Id: I79b195940e52d9ec1b6c8fa77b63b880a7b1a894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 19:58:43 +00:00
Treehugger Robot
b9355f6f6a Merge "Revert "Do not compress zip file for unit tests."" am: 266225ccb2 am: 2fc9d4c28b
Original change: https://android-review.googlesource.com/c/platform/build/+/2096861

Change-Id: Iccee362de0bf09b78db7fccee527fd1f146e1962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:31:52 +00:00
Treehugger Robot
266225ccb2 Merge "Revert "Do not compress zip file for unit tests."" 2022-05-13 23:44:57 +00:00
Sam Saccone
7d7ae94bef Revert "Do not compress zip file for unit tests."
This reverts commit a24c755f66.

Reason for revert: not worth the additional storage cost.

Change-Id: I8ed24ddef4ac3f640bf35e79cddf433e0df0854d
2022-05-13 19:55:25 +00:00
Anton Hansson
d8dd1090a5 Merge "Remove unused dependencies from sdk goals" am: 59f95bcd1c am: 3a3e601827
Original change: https://android-review.googlesource.com/c/platform/build/+/2096393

Change-Id: I844e032594ff9896da935c56f455ab656d5bae7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:39:49 +00:00
Anton Hansson
59f95bcd1c Merge "Remove unused dependencies from sdk goals" 2022-05-13 08:55:55 +00:00
Steve Berbary
e359b90082 Update Security String to 2022-07-05
Bug: 231380374
Change-Id: I745bd646af530a8c202994e48a0821a5cb7ec3dd
2022-05-12 18:49:14 +00:00
Colin Cross
67e5e7f150 Merge "Remove HOST_DALVIK_*" am: 544aedda27 am: 265c1cc9a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2059991

Change-Id: I2ab5dfd7d579f9b141c4e6022f40034a1c6ccfaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 16:54:18 +00:00
Colin Cross
544aedda27 Merge "Remove HOST_DALVIK_*" 2022-05-12 15:44:20 +00:00
Pierre-Clément Tosi
c7b837872d Create $(zip_root)/PVMFW & archive prebuilt used
It might be useful to have access to the prebuilt that the Android build
used to create the pvmfw partition so add a new directory (similarly to
other partitions) containing the prebuilt (which is also the only
content of the partition). This is particularly useful in ATC, when
detecting if the prebuilt was updated by the build.

Bug: 232253742
Test: m
Change-Id: I1116d91ffb073821568bcaeed30bbb43873dcafa
2022-05-12 16:37:46 +01:00
Anton Hansson
55a8f02ea8 Remove unused dependencies from sdk goals
The SDK no longer includes system images, so no longer needs to depend
on targets that are only relevant for the system images.

Remove all the explicit dependencies that end up depending on
"everything" but are not included in the sdk zip.

Two positive side-effects:
- fewer unused things get built (now ~32k targets, down from ~108k)
- apexes no longer get built, eliminating the risk of mismatch between
  module sdk prebuilts and source-built AOSP apexes.

There are some potential risks with this CL:
- because we no longer forcefully rebuild everything, if there are bugs
  in dependencies of exising files in the SDK, incremental builds may
  not rebuild them.
- some files that get built into the SDK may be being built as a
  side-effect of other files included in the SDK, so removing one file
  may cause another to not get built. The solution to that is to add
  the file not getting built to ALL_SDK_FILES.

Bug: 205008975
Test: m sdk sdk_repo dist && diff sdk.zip before/after (identical)
Change-Id: I97284864f66aa88556fbe16864f45b04be97634e
2022-05-12 12:28:49 +00:00
Treehugger Robot
478a4e289b Merge "Remove all_product_makefiles" am: a09c684e27 am: 0221a9a4af
Original change: https://android-review.googlesource.com/c/platform/build/+/2095123

Change-Id: Iac20e50b3b435d5663bcc07bd411e3ba7ef962c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 01:21:59 +00:00
Cole Faust
a307ea51af Merge "Add function for flattening 2d lists" am: 8ccac5198d am: 6d0c689c23
Original change: https://android-review.googlesource.com/c/platform/build/+/2088663

Change-Id: I9b68e862c17241f558ccca8c1a931613aa464c61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:43:56 +00:00
Jared Duke
7d0c90b51f Add keep rules for @KeepForWeakReference annotation
Ensure annotated fields are kept when treeshaking-related optimizations
are enabled. Note that this still allows field removal if tree shaking
reveals no references, but will avoid removal if there are references
that might impact downstream usage, e.g., weak references.

Bug: 227455445
Test: atest InternalAnnotationsTest
Change-Id: I59c6277c43b14c5de8154fa1eefad01f0702e413
2022-05-11 09:47:12 -07:00
Colin Cross
a9203e6d87 Remove HOST_DALVIK_*
There are no more BUILD_HOST_DALVIK_* modules, remove the host dalvik
support.  The equivalent support in Soong just copies the device dex
file to the host dalvik location.

Test: m checkbuild
Change-Id: I4bcf916518317b28d3217994b2fe9ee95d7f50d6
2022-05-11 08:17:45 -07:00
Cole Faust
4edc0b30ff Remove all_product_makefiles
It was unused, along with all_product_configs.

Bug: 228518445
Test: Presubmits
Change-Id: Ibd105241581f8b03254b8fee382d916ea3a98890
2022-05-10 15:39:10 -07:00
Android Build Coastguard Worker
1f6930364b Version bump to SQ3A.220605.009 [core/build_id.mk]
Change-Id: I9c038f563e6798cf18dffd83fc505a4dbb5ca443
2022-05-09 23:50:02 +00:00
Yurii Zubrytskyi
5e3cd45b5c Merge "RESTRICT AUTOMERGE platform/build/make - Tiramisu is now REL" into tm-dev 2022-05-07 15:11:19 +00:00
Android Build Coastguard Worker
af4256c1a8 Version bump to SQ3A.220605.008 [core/build_id.mk]
Change-Id: Id449fd8f20d723b45e20f93810b95ed437c84c8f
2022-05-06 18:47:18 +00:00
Cole Faust
6f6060a358 Add function for flattening 2d lists
Bug: 226974242
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Iae977b34ca0ac156ec795c54f4951c769fa994dd
2022-05-05 11:41:59 -07:00
Ulya Trofimovich
b91d60cd22 Merge "Extend hardcoded list of optional uses-libraries." am: de1949b562 am: 98a1730bf9
Original change: https://android-review.googlesource.com/c/platform/build/+/2087124

Change-Id: I12348bd913f724c4675177ce6cdf582948d9d03c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:58:47 +00:00
Ulya Trofimovich
de1949b562 Merge "Extend hardcoded list of optional uses-libraries." 2022-05-05 12:57:54 +00:00
Xin Li
c01930f7d7 Merge "Merge SP2A.220505.002" 2022-05-04 20:30:21 +00:00
Treehugger Robot
852217b90f Merge "fixup! Embed host liblz4.so in target_files" am: 5161627644 am: 14e4ad63e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2083403

Change-Id: I4ceb8e8fdb6c2169027abd750216813142ea206c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:45:57 +00:00
Treehugger Robot
14e4ad63e5 Merge "fixup! Embed host liblz4.so in target_files" am: 5161627644
Original change: https://android-review.googlesource.com/c/platform/build/+/2083403

Change-Id: Id1a30721887e9d46e169f4ecc71d47414b69265f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:11:55 +00:00
Treehugger Robot
5161627644 Merge "fixup! Embed host liblz4.so in target_files" 2022-05-04 17:23:40 +00:00
Ulya Trafimovich
0932a821c0 Extend hardcoded list of optional uses-libraries.
This is a temporary workaround that should be replaced with build logic
that would propagate optionality via generated exported-sdk-libs files.

Bug: 214255490
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'
    # empty output, no errors at boot
Change-Id: I05e22e5f72a9f936b6e0010240f5e71849a9b2b0
2022-05-04 13:36:47 +01:00
Xin Li
a08bbcebb4 Merge SP2A.220505.002
Bug: 231319788
Merged-In: I5a35451e14cba5f115ab66926d62c4fa4556a267
Change-Id: Iebd16f49429a66da431c4277c60de7030b55b7a5
2022-05-03 20:54:36 +00:00
Treehugger Robot
be9545ded0 Merge "Remove RBC_BOARD_CONFIG" am: 7d2d41ce2e am: db91e4b4f4
Original change: https://android-review.googlesource.com/c/platform/build/+/2084523

Change-Id: Id183a913b73d8f7f7c45324a5b28458322177de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 18:10:39 +00:00
Treehugger Robot
db91e4b4f4 Merge "Remove RBC_BOARD_CONFIG" am: 7d2d41ce2e
Original change: https://android-review.googlesource.com/c/platform/build/+/2084523

Change-Id: Ibdaa6580668f405aad7aac736c652ec7fb0702b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:44:31 +00:00
Treehugger Robot
7d2d41ce2e Merge "Remove RBC_BOARD_CONFIG" 2022-05-03 17:22:56 +00:00
Treehugger Robot
c210b52f20 Merge "Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: 7a79a27356 am: 911a63c0ff
Original change: https://android-review.googlesource.com/c/platform/build/+/2082702

Change-Id: Ibbcbe94b158572c0ef5d626b11c91de372a3f40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:23:52 +00:00
Treehugger Robot
911a63c0ff Merge "Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: 7a79a27356
Original change: https://android-review.googlesource.com/c/platform/build/+/2082702

Change-Id: I61a443f962f39d1163a8f01b5e239b68580fd92c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 02:21:49 +00:00
Yurii Zubrytskyi
f1687f9848 RESTRICT AUTOMERGE platform/build/make - Tiramisu is now REL
Bug: 225745567
Test: Build
Change-Id: I9efa0b919e15bb2f55054ae0d59f53f572ba87cd
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
2022-05-02 23:16:08 +00:00
Cole Faust
127115190b Remove RBC_BOARD_CONFIG
Always enable the rbc board config along with
the product config now that board config works
well.

Bug: 231224938
Test: Presubmits
Change-Id: I52a79d53dfe54878477ee015bd21863c4cee6b05
2022-05-02 14:16:04 -07:00
Håkan Kvist
8cabc71bf6 fixup! Embed host liblz4.so in target_files
Fix typo introduced in 6877e81467

Bug: 206729162
Test: m dist

Change-Id: I799cbc2048f0a3ac715ecf094049776b507b1505
2022-05-02 09:52:50 +02:00
Inseob Kim
0b734ccd91 Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Test: m selinux_policy
Change-Id: I0efaf48ff96c6225183cdbf13904ef41c9f2389d
2022-05-02 14:19:51 +09:00
Inseob Kim
788648f63f Add PLATFORM_VERSION_LAST_STABLE to soong config
Bug: 189164487
Test: build
Change-Id: Iec36d22af80225f6da848bae1e02d263ff957df8
Merged-In: Iec36d22af80225f6da848bae1e02d263ff957df8
(cherry picked from commit a59b4dcd33)
2022-05-02 09:52:26 +09:00
Android Build Coastguard Worker
cace3edbeb Version bump to SQ3A.220605.007 [core/build_id.mk]
Change-Id: I5ce47894800561f4786c47440ce0744375285acf
2022-04-30 01:25:43 +00:00
Treehugger Robot
a9b2077b42 Merge "Add deprecation warning for base-rules-hook" am: e30f7e8be1 am: 35c9a04254
Original change: https://android-review.googlesource.com/c/platform/build/+/2080730

Change-Id: Ie1dbe8b0fe4797ba443a264be046d80f5be41cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 00:00:36 +00:00
Treehugger Robot
35c9a04254 Merge "Add deprecation warning for base-rules-hook" am: e30f7e8be1
Original change: https://android-review.googlesource.com/c/platform/build/+/2080730

Change-Id: Id2b7f201b00a2ba36055c90374a161a36c43933a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:41:28 +00:00
Treehugger Robot
e30f7e8be1 Merge "Add deprecation warning for base-rules-hook" 2022-04-29 23:24:48 +00:00
Cole Faust
0c4b0f8ebb Merge "Add implementations for firstword/lastword" am: 997cfaaceb am: 9129807bb8
Original change: https://android-review.googlesource.com/c/platform/build/+/2078089

Change-Id: Ia3c12fab75ed3f6800ec3d1aa441085d9feacf15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 19:19:32 +00:00
Cole Faust
9129807bb8 Merge "Add implementations for firstword/lastword" am: 997cfaaceb
Original change: https://android-review.googlesource.com/c/platform/build/+/2078089

Change-Id: Iad404bfe49fcc1d7a96a286ff701ba1608a4dfc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:50:49 +00:00
Cole Faust
997cfaaceb Merge "Add implementations for firstword/lastword" 2022-04-29 18:32:40 +00:00
Treehugger Robot
1ae34af4b8 Merge "Update OWNERS." am: f4e2f4150b am: 86c5f3b5cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2079379

Change-Id: Ib103cbe7ff2b8a527b7a468b9fa248add0654f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:12:57 +00:00
Sebastian Ene
c5fdaea177 Merge "Drop the PLATFORM_VERSION_CODENAME conditional" am: 399c35d490 am: c47a55fdbc
Original change: https://android-review.googlesource.com/c/platform/build/+/2077518

Change-Id: Ie5077d32953c68e2f3254e8ecbc3cc989e415cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:12:08 +00:00
Treehugger Robot
68f909dd59 Merge "Fix incorrect function call in product-graph" am: 0941f062af am: 82ecb99a3b
Original change: https://android-review.googlesource.com/c/platform/build/+/2078438

Change-Id: I20ca3bbd96e86301b658159c1f0b205dc60a7f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:11:26 +00:00
Treehugger Robot
54d875ee34 Merge "Allow non-compat suite to locate testcases dir properly" am: f8935efee8 am: d03c6145f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2080295

Change-Id: I5dd3302a5808ae039f3b56b7293220ba61d71f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:39 +00:00
Treehugger Robot
86c5f3b5cf Merge "Update OWNERS." am: f4e2f4150b
Original change: https://android-review.googlesource.com/c/platform/build/+/2079379

Change-Id: Icb71135f5661c8a1f5305751a37dfe97ef7929f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:32 +00:00
Sebastian Ene
c47a55fdbc Merge "Drop the PLATFORM_VERSION_CODENAME conditional" am: 399c35d490
Original change: https://android-review.googlesource.com/c/platform/build/+/2077518

Change-Id: I14788fa34f0c4673c991ef2cafe68005a83c1126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:03 +00:00
Treehugger Robot
a4ac2fdcef Merge "Prototype changes for multitree" am: 55d522096a am: fe781b347d
Original change: https://android-review.googlesource.com/c/platform/build/+/2076562

Change-Id: I9ded1444554b57a10d2acf13046d33067585b701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:34 +00:00
Treehugger Robot
82ecb99a3b Merge "Fix incorrect function call in product-graph" am: 0941f062af
Original change: https://android-review.googlesource.com/c/platform/build/+/2078438

Change-Id: Id557f9c506d6caf16e1606ef1d3aeb7450474934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:33 +00:00
Treehugger Robot
d03c6145f7 Merge "Allow non-compat suite to locate testcases dir properly" am: f8935efee8
Original change: https://android-review.googlesource.com/c/platform/build/+/2080295

Change-Id: Ie035f0c8001f94a657759d1a1f3a04f7118828f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:04 +00:00
Cole Faust
5a6481f0ea Merge "Sort rblf_wildcard results and remove file existence functions" am: 76413f4c58 am: 75ed0c7cdf
Original change: https://android-review.googlesource.com/c/platform/build/+/2076126

Change-Id: I82f3d55bba268e5603b2996b5c298986b80d68d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:07:43 +00:00
Treehugger Robot
bbc004ce98 Merge "Replace DEX_FLAGS by flags for D8 and R8." am: b27140daa0 am: dbcc7e454b
Original change: https://android-review.googlesource.com/c/platform/build/+/2059747

Change-Id: I3f3dcc83ffae4c3e9c837693784c74872e991ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:05:04 +00:00
Ulya Trofimovich
de1d700127 Merge "Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed." am: 4faef3876d am: 1d332af2b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2069047

Change-Id: Ic325ebb2fe0ae0dc77b011aa2fce7300de540e5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:43 +00:00
Cole Faust
792a49d1d7 Merge "Make mkstrip always return a string" am: 542399a8e8 am: 360b2b5253
Original change: https://android-review.googlesource.com/c/platform/build/+/2076128

Change-Id: I1b353e509b6100506f581a038c3aae5809d6ad1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:33 +00:00
Cole Faust
0a95e83cf5 Merge "Send trace logs to stderr instead of stdout" am: 63e1012b05 am: 1024fb58b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2076121

Change-Id: I6463cb300e0fa969f5664df77ef53e32425fe2bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:23 +00:00
Treehugger Robot
fe781b347d Merge "Prototype changes for multitree" am: 55d522096a
Original change: https://android-review.googlesource.com/c/platform/build/+/2076562

Change-Id: Id0e9ef26a6a47f6518df77e23b7e9157d0e8c876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:14 +00:00
Treehugger Robot
f4e2f4150b Merge "Update OWNERS." 2022-04-29 17:05:22 +00:00
Sebastian Ene
399c35d490 Merge "Drop the PLATFORM_VERSION_CODENAME conditional" 2022-04-29 13:02:22 +00:00
Ulya Trafimovich
c6ebb82b9f Update OWNERS.
Some people left, some new files were added.

Bug: 214255490
Test: none
Change-Id: I39a4b313ad69e2a2076a0dc87e131add5dc85b20
2022-04-29 13:51:31 +01:00
Sebastian Ene
573fbcd114 Drop the PLATFORM_VERSION_CODENAME conditional
Evaluate the list of all active codenames when version_util.mk is
invoked.

Bug: 230720688
Change-Id: I1c6a3e94230e856cf41f1f79b37893576957dc3d
Signed-off-by: Sebastian Ene <sebastianene@google.com>
2022-04-29 09:09:03 +00:00
Treehugger Robot
0941f062af Merge "Fix incorrect function call in product-graph" 2022-04-29 07:54:05 +00:00
Treehugger Robot
f8935efee8 Merge "Allow non-compat suite to locate testcases dir properly" 2022-04-29 01:23:44 +00:00
Cole Faust
f773f3a024 Add deprecation warning for base-rules-hook
This lets product/board config define a function that
is called while processing modules defined in an
Android.mk file.

When the product/board configs are converted
to starlark, they won't be able to supply a base-rules-hook
anymore. Emit a warning saying that it's deprecated.

Bug: 226974242
Test: Manually
Change-Id: Ie6baa4952516a3ec5c6c440f9106f7b5185803b7
2022-04-28 16:20:32 -07:00
Cole Faust
c93109dc36 Add implementations for firstword/lastword
Bug: 226974242
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ibb992f42a59212bae48acd55647b2d0872c2f69e
2022-04-28 15:56:33 -07:00
Treehugger Robot
55d522096a Merge "Prototype changes for multitree" 2022-04-28 22:20:47 +00:00
Cole Faust
75ed0c7cdf Merge "Sort rblf_wildcard results and remove file existence functions" am: 76413f4c58
Original change: https://android-review.googlesource.com/c/platform/build/+/2076126

Change-Id: Ia0b59123331106d6373b39d420e3d73aa481f060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:40:36 +00:00
Dan Shi
3e85ca9d4b Allow non-compat suite to locate testcases dir properly
cc_test that can run on hostside are default to be part of
host-unit-tests suite. The suite is set up similar to device-tests and
general-tests, and it's not a compatibility suite. So following variable
will always be empty:
$(COMPATIBILITY_TESTCASES_OUT_host-unit-tests.
It should use HOST_OUT_TESTCASES as testcases dir.

The same logic should be applied to art-host-tests.

Bug: None
Test: build
Change-Id: Ieddacd5157da73c6df473c103be109d9c3a55281
2022-04-28 13:36:36 -07:00
Cole Faust
76413f4c58 Merge "Sort rblf_wildcard results and remove file existence functions" 2022-04-28 19:54:32 +00:00
Treehugger Robot
dbcc7e454b Merge "Replace DEX_FLAGS by flags for D8 and R8." am: b27140daa0
Original change: https://android-review.googlesource.com/c/platform/build/+/2059747

Change-Id: I69aead43a62c80acb9e53c52db062b8da5d4704f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 13:12:18 +00:00
Treehugger Robot
b27140daa0 Merge "Replace DEX_FLAGS by flags for D8 and R8." 2022-04-28 12:40:13 +00:00
Ulya Trofimovich
1d332af2b6 Merge "Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed." am: 4faef3876d
Original change: https://android-review.googlesource.com/c/platform/build/+/2069047

Change-Id: Id717a1359b2e6daf0c14e115c5db665ce2b24a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 10:09:03 +00:00
Ulya Trofimovich
4faef3876d Merge "Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed." 2022-04-28 09:44:21 +00:00
Inseob Kim
05fa7f1455 Prototype changes for multitree
This change contains a prototype implementation for multitree.
A new file core/tasks/multitree.mk adds a goal named "update-meta",
which searches for "imported" and "exported" Android.bp modules and
writes a json metadata to track dependencies between components.

Bug: 230448564
Test: m
Change-Id: Ie93e3bf130cacb6b6de41acee3bd302f64f1ab95
2022-04-28 08:03:55 +00:00
Cole Faust
360b2b5253 Merge "Make mkstrip always return a string" am: 542399a8e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2076128

Change-Id: Ibaf21180f44ec8feb2251b9a3926f14348a2db73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 21:59:10 +00:00
Cole Faust
542399a8e8 Merge "Make mkstrip always return a string" 2022-04-27 21:37:25 +00:00
Cole Faust
23b94e63ba Fix incorrect function call in product-graph
This was accidentally broken in aosp/2064287

Fixes: 230599451
Test: m product-graph
Change-Id: Ibc9aabc5ddf7ad4d347e89019be44ef0c8ae0ff7
2022-04-27 11:55:08 -07:00
Android Build Coastguard Worker
84d14fec83 Version bump to SQ3A.220605.006 [core/build_id.mk]
Change-Id: I404c064afd6c51c16c1060f4fdb71a019c30972d
2022-04-27 17:53:04 +00:00
Cole Faust
1024fb58b4 Merge "Send trace logs to stderr instead of stdout" am: 63e1012b05
Original change: https://android-review.googlesource.com/c/platform/build/+/2076121

Change-Id: I29d3292629ea88182264a41034f7452e178c5d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:42:12 +00:00
Cole Faust
63e1012b05 Merge "Send trace logs to stderr instead of stdout" 2022-04-27 16:50:10 +00:00
Treehugger Robot
393e929af7 Merge "Add PLATFORM_VERSION_LAST_STABLE to soong config" am: b9b9c000d5 am: 8a186b9f16
Original change: https://android-review.googlesource.com/c/platform/build/+/2073410

Change-Id: I89f803965216db0d645cbf09597b7c58c04f4aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 13:50:50 +00:00
Treehugger Robot
8a186b9f16 Merge "Add PLATFORM_VERSION_LAST_STABLE to soong config" am: b9b9c000d5
Original change: https://android-review.googlesource.com/c/platform/build/+/2073410

Change-Id: Ib4c6564e3f8e6058f7e1eb2ba40e73b2bc6f759b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 13:27:17 +00:00
Treehugger Robot
b9b9c000d5 Merge "Add PLATFORM_VERSION_LAST_STABLE to soong config" 2022-04-27 13:00:36 +00:00
Ulya Trafimovich
30142ffc0a Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed.
Bug: 170935728
Test: lunch aosp_cf_x86_64_phone-userdebug && m && lunch_cvd
Change-Id: Icc50932228b6ce27799ac9ce9b2f637029436b6b
2022-04-27 13:32:04 +01:00
Anton Hansson
f78b3ba480 Merge "Remove notice file for sdk system image" am: 721a377982 am: 148ece6d76
Original change: https://android-review.googlesource.com/c/platform/build/+/2075119

Change-Id: I2aac4396465f199ff35faf76e4569c0d21c60e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 11:36:18 +00:00
Anton Hansson
148ece6d76 Merge "Remove notice file for sdk system image" am: 721a377982
Original change: https://android-review.googlesource.com/c/platform/build/+/2075119

Change-Id: I43a6a3da329503ec748a696ba05b4cfa913b953b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 11:18:52 +00:00
Anton Hansson
721a377982 Merge "Remove notice file for sdk system image" 2022-04-27 10:56:04 +00:00
Cole Faust
5e43109586 Make mkstrip always return a string
This is what mk2rbc assumes, and previously that
assumption was incorrect when passing a list to
mkstrip.

Bug: 226974242
Test: Presubmits
Change-Id: I7b1596662df7c966404aab2a99d7c2e53d917bd6
2022-04-26 15:30:20 -07:00
Cole Faust
c7b8b6ed88 Sort rblf_wildcard results and remove file existence functions
Kati's $(wildcard) results are guaranteed to be sorted,
but go's filepath.Glob() is not.

Remove the file existence functions because they can
just be replaced with wildcards.

Bug: 226974242
Test: go test
Change-Id: I02fb6292b932bc28cd856ec3c7cb9ed9e96ca630
2022-04-26 12:15:41 -07:00
Cole Faust
c6024abe99 Send trace logs to stderr instead of stdout
Stdout gets redirected to a makefile that is
ingested by the rest of the build system.
The trace outputs were being mixed up with
the rest of the output, making them hard to
read. In addition, some of the trace output
wasn't commented out, so it was defining
make rules.

Fixes: 230495885
Test: Manually
Change-Id: I02f9038cd89598fc1c1561bf4bf2997ac090d9e9
2022-04-26 11:12:46 -07:00
Colin Cross
cf90c05b44 Merge "Update PLATFORM_VERSION to UP1A" am: 62bf0d5c88
Original change: https://android-review.googlesource.com/c/platform/build/+/2072024

Change-Id: I23c2c4bd9bc8aa3688441b6f5ccd7fbcb40ea976
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 01:50:30 +00:00
Colin Cross
62bf0d5c88 Merge "Update PLATFORM_VERSION to UP1A" 2022-04-26 01:15:38 +00:00
Anton Hansson
c3536674a9 Remove notice file for sdk system image
The system image itself is being removed from the sdk zip,
so remove the NOTICE file for it at the same time.

Bug: 205008975
Test: m sdk sdk_repo dist
Change-Id: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
2022-04-25 16:29:15 +01:00
Inseob Kim
a59b4dcd33 Add PLATFORM_VERSION_LAST_STABLE to soong config
Bug: 189164487
Test: build
Change-Id: Iec36d22af80225f6da848bae1e02d263ff957df8
2022-04-25 18:20:36 +09:00
Ian Zerny
8deeb2b64e Replace DEX_FLAGS by flags for D8 and R8.
Bug: b/227746536
Test: manual
Change-Id: Ic3cb8feb7a09d690ecd309162236e49a8d1e52c6
2022-04-25 11:02:41 +02:00
Android Build Coastguard Worker
dedb27a04b Version bump to SQ3A.220605.005 [core/build_id.mk]
Change-Id: Iac14da8e2857b26adeee985d115f72ea8e836a57
2022-04-22 21:07:36 +00:00
Treehugger Robot
9324550dde Merge "Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES." am: 5f6235e580
Original change: https://android-review.googlesource.com/c/platform/build/+/2072023

Change-Id: I410712852c71f9c5515a66ffa1ce40b5921fc446
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 20:21:20 +00:00
Treehugger Robot
5f6235e580 Merge "Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES." 2022-04-22 19:52:05 +00:00
Colin Cross
7fd1802cbd Update PLATFORM_VERSION to UP1A
Update PLATFORM_VERSION to UP1A.  The codename is now UpsideDownCake.

Bug: 219519679
Test: m checkbuild
Change-Id: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
(cherry picked from commit 29919e3b66)
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
2022-04-22 18:56:56 +00:00
Colin Cross
37674b40b4 Update PLATFORM_VERSION to UP1A
Update PLATFORM_VERSION to UP1A.  The codename is now UpsideDownCake.

Bug: 219519679
Test: m checkbuild
Change-Id: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
(cherry picked from commit 29919e3b66)
2022-04-22 09:16:00 -07:00
satayev
e0a44065b1 Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES.
Bug: 220153433
Test: atest BuildTest
Change-Id: I24d73a846d14a032c1e03679cef10cfeac814bb9
Merged-In: I24d73a846d14a032c1e03679cef10cfeac814bb9
(cherry picked from commit da1e41d1f3)
2022-04-22 09:14:48 -07:00
Treehugger Robot
0afb5008fd Merge "Use the new R8/D8_FLAGS vars" am: 8ecc6369f0 am: 24d5aac91d
Original change: https://android-review.googlesource.com/c/platform/build/+/2070111

Change-Id: I25b9bf3c2e54b0f0140c6cd935a63f5704304c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:49:48 +00:00
Treehugger Robot
24d5aac91d Merge "Use the new R8/D8_FLAGS vars" am: 8ecc6369f0
Original change: https://android-review.googlesource.com/c/platform/build/+/2070111

Change-Id: I1f25f0010811e96a0e06f96b7bda4018d6758106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:27:27 +00:00
Treehugger Robot
8ecc6369f0 Merge "Use the new R8/D8_FLAGS vars" 2022-04-22 02:42:06 +00:00
Treehugger Robot
ca429107cb Merge "Add owners for version_defaults.mk" am: 5b945cb354 am: d531263f09
Original change: https://android-review.googlesource.com/c/platform/build/+/2070187

Change-Id: Ifc13514a61d39af449ffcd629953772ce0841032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:19:37 +00:00
Treehugger Robot
d531263f09 Merge "Add owners for version_defaults.mk" am: 5b945cb354
Original change: https://android-review.googlesource.com/c/platform/build/+/2070187

Change-Id: Id79718d66e1a76093d6fe8f9af08e0a41965d7cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 01:37:12 +00:00
Treehugger Robot
5b945cb354 Merge "Add owners for version_defaults.mk" 2022-04-21 23:58:04 +00:00
Jared Duke
1410f684f6 Use the new R8/D8_FLAGS vars
Propagate the new D8/R8 JVM flags vars that were formerly combined in
DEX_FLAGS.

Bug: 205303544
Test: time m
Change-Id: Ifc6051cd9422b3f5c52322833d9a7f5e8263f857
2022-04-21 18:24:55 +00:00
Treehugger Robot
63ff2c20f7 Merge "Declare license metadata for copied files." am: d7856b74dc am: e1da8fe40b am: 75e70bef8b
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I13a3ffed760f9a4fafa1062c38726070265940e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:58:57 +00:00
Treehugger Robot
75e70bef8b Merge "Declare license metadata for copied files." am: d7856b74dc am: e1da8fe40b
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I8d1b2d6c0f8af8cc89de10bd989fbe6cf95a5623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:35:06 +00:00
Treehugger Robot
e1da8fe40b Merge "Declare license metadata for copied files." am: d7856b74dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I70ce9aef9791a18081e989134eadfcb9d20ea5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:19:14 +00:00
Treehugger Robot
d7856b74dc Merge "Declare license metadata for copied files." 2022-04-20 23:58:24 +00:00
Bassem Khalife
5dc6b582be Add owners for version_defaults.mk
Adding members of the RelPgM team to fast track monthly Security SPL update approval

Bug: 219813826
Change-Id: I038e0c7aea6d1aefe5b847978838952fa653d11b
2022-04-20 22:09:56 +00:00
Ivan Lozano
7a9900a3ae Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e am: 2f619a0787 am: 3dba55b9cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: I46d86fd10c8265ce16c17110e67a94c276f5a9fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:19:20 +00:00
Ivan Lozano
3dba55b9cd Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e am: 2f619a0787
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: I222a9d507d31020ee33f3f519bf8b886c837243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:03:20 +00:00
Bob Badour
540a3f8ec1 Declare license metadata for copied files.
Bug: 151177513

Test: m droid dist reportmissinglicenses
Change-Id: Iada4a0ba3583f78e9419a5f487388b5e5eba195a
2022-04-20 13:01:35 -07:00
Ivan Lozano
2f619a0787 Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: Ica503d11bee5a8083e9138b90f912023f3510a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:33:45 +00:00
Treehugger Robot
2763773a1a Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5 am: 7137e03c4b am: abd53cb613
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: I677bde0d9c73f19a2631d2938c8826d949f1731b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:36 +00:00
Ivan Lozano
6689f3889e Merge "rust: Add proc_macro NOTICE files" 2022-04-20 19:21:25 +00:00
Android Build Coastguard Worker
b3fca2e692 Version bump to SQ3A.220605.004 [core/build_id.mk]
Change-Id: Idfe0d95785fbd3b9c3f3b9d420fa77c72f237128
2022-04-20 19:01:27 +00:00
Treehugger Robot
abd53cb613 Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5 am: 7137e03c4b
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: Iadc5b89a256454e009f886ffe34fcae335296f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:56:36 +00:00
Treehugger Robot
7137e03c4b Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: I916fe02c73158a4563c8e3ad6cc8f092a2015fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:32:23 +00:00
Treehugger Robot
8a6fa9c7c5 Merge "Allow init_rc files to be installed in ramdisk" 2022-04-20 18:07:17 +00:00
Trevor Radcliffe
d3325d15ce Merge "Add comment for previous CL" am: 1e63a893dc am: 7cecfb7ffa am: eaaae159bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: Ia79235faba34f3f16fa84415dc8ac5d42cbd662b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:42:57 +00:00
Trevor Radcliffe
eaaae159bc Merge "Add comment for previous CL" am: 1e63a893dc am: 7cecfb7ffa
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: Iaecb70a18e68e9082d40d7debf129b7554cf391f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:18:09 +00:00
Trevor Radcliffe
7cecfb7ffa Merge "Add comment for previous CL" am: 1e63a893dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: I54647f88cee8a17d2b2aee5f58ec4de6a284e6bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:40:24 +00:00
Trevor Radcliffe
1e63a893dc Merge "Add comment for previous CL" 2022-04-20 14:16:22 +00:00
Treehugger Robot
9f99087283 Merge "Correct abspath implementation" am: 9ec1a7aa72 am: fcae811f2c am: 3033cc5982
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367

Change-Id: Ie2fac8474be0853fca2820f9e38f90cb91412216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:24:35 +00:00
Treehugger Robot
f585c50d8e Merge "Sort inherited products correctly" am: 0339142a27 am: 188e38ecd4 am: 8444f7fddf
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079

Change-Id: If2785c4848682aca5dbc2dea7c37793434119cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:23:03 +00:00
Colin Cross
bc28181e3d Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de am: b8999c3d88 am: 1e492a67d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912

Change-Id: I47ac1a65c04c32666535e20c44f989921e013577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:21:19 +00:00
Treehugger Robot
7ec455ad93 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113 am: fa33ae6ff8 am: 1a73e98758
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761

Change-Id: I1e8ff054b8a9946bacf605f7565bbbc7941badeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:03:43 +00:00
Treehugger Robot
3033cc5982 Merge "Correct abspath implementation" am: 9ec1a7aa72 am: fcae811f2c
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367

Change-Id: Ifa14038d168b893001b453da41f3c4d83e8c6df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 02:07:51 +00:00
Treehugger Robot
8444f7fddf Merge "Sort inherited products correctly" am: 0339142a27 am: 188e38ecd4
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079

Change-Id: Ie7c7dcdf981dd04e573cef42aea1a7c0f1066fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 02:07:42 +00:00
Treehugger Robot
fcae811f2c Merge "Correct abspath implementation" am: 9ec1a7aa72
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367

Change-Id: Id0156874a096036a515913c13406cef823f148d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:48:43 +00:00
Treehugger Robot
188e38ecd4 Merge "Sort inherited products correctly" am: 0339142a27
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079

Change-Id: I174012ee8ba083b825825b8b0f616c3f7eb2413d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:48:33 +00:00
Treehugger Robot
9ec1a7aa72 Merge "Correct abspath implementation" 2022-04-20 01:32:16 +00:00
Treehugger Robot
0339142a27 Merge "Sort inherited products correctly" 2022-04-20 01:09:36 +00:00
Colin Cross
1e492a67d2 Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de am: b8999c3d88
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912

Change-Id: I59452bfd60967db2cc8a7e097e044b90f5479e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:49:54 +00:00
Cole Faust
426c7441b0 Correct abspath implementation
realpath doesn't return a path if the file doesn't exist,
but $(abspath) in make does.

Bug: 229132189
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ief7f634024cc52a9e8c5e478666b15512512f0d8
2022-04-19 14:46:09 -07:00
Colin Cross
b8999c3d88 Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912

Change-Id: I42de27dd63ccccad7255da0422d9194a510c0f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:11:05 +00:00
Colin Cross
845e23b0de Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" 2022-04-19 20:52:39 +00:00
Treehugger Robot
1a73e98758 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113 am: fa33ae6ff8
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761

Change-Id: If7455d464bdbaeb8917704678e7d23c7a9ca7583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 17:04:55 +00:00
Treehugger Robot
fa33ae6ff8 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761

Change-Id: I6437f6be96ed0013dc6e8cbc0bda018fa6ca3574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 16:39:15 +00:00
Bowgo Tsai
85578e0a9d Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK
GKI targets, e.g., `gki_arm64` or `gki_x86_64` have only
boot-*.img files without a ramdisk. It has no other images,
e.g., init_boot.img, system.img, etc.

The current build system assumes that the ramdisk is either
in a boot.img or in a init_boot.img, which is not true for
those GKI targets. Adding a new flag to support building
boot-*.img without a ramdisk while not building an init_boot.img.

Bug: 220834917
Test: build and `unpack_bootimg`
Change-Id: I789343c3e3d9ff0c36c0e19680a9792bd31a1c9f
2022-04-19 17:57:51 +08:00
Cole Faust
d370a3f7bd Sort inherited products correctly
We pass the filename without the extension to
rblf.inherit(). Removing the extension changes the
sort order when one file's name is a prefix of another:

```
>>> sorted(["base", "base-secondary"])
['base', 'base-secondary']
>>> sorted(["base.mk", "base-secondary.mk"])
['base-secondary.mk', 'base.mk']
```

Correct the sort order so that global variables get
their correct ordering.

Bug: 229132189
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I22367eb49b33956b71ac1b966fe78c1308b94257
2022-04-18 17:18:08 -07:00
Cole Faust
401af25546 Merge "Implement abspath" am: a9aa002d3b am: bc0c150831 am: a6ea980936
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554

Change-Id: I9aefb9269330f3e7196e3501ec90acaff029955f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:35:00 +00:00
Cole Faust
a6ea980936 Merge "Implement abspath" am: a9aa002d3b am: bc0c150831
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554

Change-Id: Ib32425125c2e6554fbf36f1496047d89e912b5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:14:13 +00:00
Cole Faust
bc0c150831 Merge "Implement abspath" am: a9aa002d3b
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554

Change-Id: I1d3870beed4989bc3cc1fa3671c9f5cdb2169b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 21:44:24 +00:00
Cole Faust
a9aa002d3b Merge "Implement abspath" 2022-04-18 21:26:40 +00:00
Colin Cross
85722b807a Put javac, d8 and r8 rules into RBE ninja pool, take two
I60f7859f3657fc1eff0daf0e0a1b0f9fe63551b6 attempted to put the javac,
d8 and r8 rules into the RBE ninja pool so they could run 500 jobs
in parallel, but rbe.mk is not parsed during the main build phase
and the pool continued to be unset.  Move the pool configuration
into config.mk.

Bug: 228603472
Test: manual
Change-Id: I56377244e1c496034576ba5988393d88c2c5b09f
2022-04-18 12:10:33 -07:00
Ivan Lozano
5880e85a0f rust: Add proc_macro NOTICE files
Collect NOTICE files from proc-macros in a similar fashion to static
libraries.

Test: m
Change-Id: Id8ef8d74c8e0ea6ce3c137231b41addcb763876d
2022-04-18 15:03:37 -04:00
Sam Saccone
70dbe365fd Merge "Do not compress zip file for unit tests." am: 6337ed39e1 am: d03bb4ff75 am: cc8ad353fd
Original change: https://android-review.googlesource.com/c/platform/build/+/2064641

Change-Id: I5164683cbc32a2b597e0f87d5c63af38789b1aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 22:32:57 +00:00
Sam Saccone
cc8ad353fd Merge "Do not compress zip file for unit tests." am: 6337ed39e1 am: d03bb4ff75
Original change: https://android-review.googlesource.com/c/platform/build/+/2064641

Change-Id: I986e79ae1701dec4df99b1d87096c41e9bc3b650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 22:13:44 +00:00
Sam Saccone
d03bb4ff75 Merge "Do not compress zip file for unit tests." am: 6337ed39e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2064641

Change-Id: Iba30f601a609a734d48e7aabe18923782706494d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 21:36:17 +00:00
Sam Saccone
6337ed39e1 Merge "Do not compress zip file for unit tests." 2022-04-16 21:13:00 +00:00
Treehugger Robot
f1efdd1877 Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7 am: 05c690dd2e am: 2d16d3be49
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556

Change-Id: Iffa5eaf98453601e7edf7f012c28bcb1438193f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 06:15:22 +00:00
Treehugger Robot
2d16d3be49 Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7 am: 05c690dd2e
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556

Change-Id: I9bc47f646091562fefdde6163ca16e28c4235f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 05:57:02 +00:00
Treehugger Robot
05c690dd2e Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556

Change-Id: I65b39ed4ad81db9c6a0c222f5d3eaadd3ee33356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 05:26:20 +00:00
Treehugger Robot
80d2c8f7a7 Merge "Add build flags for legacy EROFS support." 2022-04-16 05:10:04 +00:00
Android Build Coastguard Worker
2387029398 Version bump to SQ3A.220605.003 [core/build_id.mk]
Change-Id: If9889998af265cb656558ad3724fe68e92882d5d
2022-04-16 00:31:02 +00:00
Sam Saccone
a24c755f66 Do not compress zip file for unit tests.
BUG=229404699

Change-Id: I91df8973b9308cd3fa572d7afe1e9e4ec8a9af39
2022-04-15 23:50:12 +00:00
Cole Faust
0488f3da5b Implement abspath
This is to minimize the differences between the make
and starlark product configs for the quick ci test.

Bug: 229132189
Test: Manually
Change-Id: I3286ba64e9d8fc9d1b169a7ed18f5a565a117a8d
2022-04-15 15:05:03 -07:00
Bob Badour
e0013ca046 Merge "Revert "Create lists of projects to share per dist target"" am: f4ad50eeb6 am: 7b536df914 am: 10c3f0496b
Original change: https://android-review.googlesource.com/c/platform/build/+/2065621

Change-Id: I8a0377f718b43aae89e1ccf6066c590b57b99afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 18:23:54 +00:00
Cole Faust
a621980cbf Merge "Evaluate intermediate products properly" am: 90814c0706 am: 5ada12d182 am: 0144f19122
Original change: https://android-review.googlesource.com/c/platform/build/+/2060370

Change-Id: I1089f71d09fa5c022d7f9312e4ad3a8c1cdaaffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 18:23:20 +00:00
Bob Badour
10c3f0496b Merge "Revert "Create lists of projects to share per dist target"" am: f4ad50eeb6 am: 7b536df914
Original change: https://android-review.googlesource.com/c/platform/build/+/2065621

Change-Id: Ie3078798dfa46e30d102d0804b1c1ea8d4b3984e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 17:55:02 +00:00
Cole Faust
0144f19122 Merge "Evaluate intermediate products properly" am: 90814c0706 am: 5ada12d182
Original change: https://android-review.googlesource.com/c/platform/build/+/2060370

Change-Id: I4dfaa4cd31e4ba5700e0c801f4997573c25db888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 17:54:15 +00:00
Bob Badour
7b536df914 Merge "Revert "Create lists of projects to share per dist target"" am: f4ad50eeb6
Original change: https://android-review.googlesource.com/c/platform/build/+/2065621

Change-Id: Ie32c16a8e02aa5020103aa0ab5c0d680baa2233c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 17:32:56 +00:00
Cole Faust
5ada12d182 Merge "Evaluate intermediate products properly" am: 90814c0706
Original change: https://android-review.googlesource.com/c/platform/build/+/2060370

Change-Id: If29eead358927e45159e8b843026eeded1fdc033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 17:32:43 +00:00
Bob Badour
59e4951021 Revert "Create lists of projects to share per dist target"
This reverts commit 1fd4bda634.

Reason for revert: Causes flaky build breakages

Bug: 229319921

Change-Id: I82e660e95c8d4d72b88d2de58d82e0d4be901869
2022-04-15 17:29:26 +00:00
Kelvin Zhang
701f161eb6 Allow init_rc files to be installed in ramdisk
Test: th
Test: m target-file-package, then check INIT_BOOT dir of target file,
    make sure snapuserd.rc is there
Bug: 219841787
Bug: 228893064

Change-Id: Iac3f219c763fbf8acd17f0339089c7576974dc05
2022-04-15 10:17:18 -07:00
Cole Faust
90814c0706 Merge "Evaluate intermediate products properly" 2022-04-15 17:11:55 +00:00
Dan Shi
6aae8cd480 Merge "Package vts kernel tests in general-tests.zip" am: 52cf004a37 am: 658d2a7c1f am: bdee7c8512
Original change: https://android-review.googlesource.com/c/platform/build/+/2062947

Change-Id: If102739b08e5a02e7202f0a1d22561b1ceb0723c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 05:47:45 +00:00
Treehugger Robot
6067d6f37c Merge "Non-module targets." am: 03ea8842af am: d13457d943 am: 4b209efdf0
Original change: https://android-review.googlesource.com/c/platform/build/+/2063381

Change-Id: Iae1b0b592be3bf8166ca6d944695624f2a6712f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 05:47:36 +00:00
Dan Shi
bdee7c8512 Merge "Package vts kernel tests in general-tests.zip" am: 52cf004a37 am: 658d2a7c1f
Original change: https://android-review.googlesource.com/c/platform/build/+/2062947

Change-Id: I16a9b5458d980279fb3883a14c9e80432e21c7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 05:32:10 +00:00
Treehugger Robot
4b209efdf0 Merge "Non-module targets." am: 03ea8842af am: d13457d943
Original change: https://android-review.googlesource.com/c/platform/build/+/2063381

Change-Id: I9d01f4999b19e7a7ff3dacfb5a6eb11afb763cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 05:32:01 +00:00
Dan Shi
658d2a7c1f Merge "Package vts kernel tests in general-tests.zip" am: 52cf004a37
Original change: https://android-review.googlesource.com/c/platform/build/+/2062947

Change-Id: I316f60c3845c2b7512f923ac184cb4f3934880fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 05:14:02 +00:00
Treehugger Robot
d13457d943 Merge "Non-module targets." am: 03ea8842af
Original change: https://android-review.googlesource.com/c/platform/build/+/2063381

Change-Id: I9d18ff679e7de22195a43063f1e184a17d600f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 05:13:52 +00:00
Dan Shi
52cf004a37 Merge "Package vts kernel tests in general-tests.zip" 2022-04-15 05:03:20 +00:00
Bob Badour
5acd436645 Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I897cf0e6f875ce2d370772405f31cc94b999ef19
2022-04-14 17:59:01 -07:00
Treehugger Robot
9bad3e7e91 Merge "Create lists of projects to share per dist target" am: 746806b3bb am: 8a4f747caf am: 87a7663b8d
Original change: https://android-review.googlesource.com/c/platform/build/+/2064290

Change-Id: I0e5ee56ac9ea244ef90d78e60a5717325f3cac9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:20:46 +00:00
Treehugger Robot
22b0086c76 Merge "Non-module targets." am: fc0dcc1bc1 am: 664fd353b1 am: 1e1639229b
Original change: https://android-review.googlesource.com/c/platform/build/+/2063380

Change-Id: Ib0e42d451a58426c82dd6990c22d089b9c8202fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:19:08 +00:00
Hongguang Chen
89939ccf89 Merge "Filter out TV GSI build targets" into tm-dev 2022-04-14 23:12:47 +00:00
Treehugger Robot
87a7663b8d Merge "Create lists of projects to share per dist target" am: 746806b3bb am: 8a4f747caf
Original change: https://android-review.googlesource.com/c/platform/build/+/2064290

Change-Id: I837799bb7f6cd3657f13bfe7e34ce1ad608a0126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:45:10 +00:00
Treehugger Robot
1e1639229b Merge "Non-module targets." am: fc0dcc1bc1 am: 664fd353b1
Original change: https://android-review.googlesource.com/c/platform/build/+/2063380

Change-Id: I9c7a835e9ede2295b3fc7a8d6a6c78596ff7804e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:44:21 +00:00
Treehugger Robot
8a4f747caf Merge "Create lists of projects to share per dist target" am: 746806b3bb
Original change: https://android-review.googlesource.com/c/platform/build/+/2064290

Change-Id: Ib35ef1c1a8da7d81ce63aede3bc36d6ff99f7597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:27:39 +00:00
Treehugger Robot
664fd353b1 Merge "Non-module targets." am: fc0dcc1bc1
Original change: https://android-review.googlesource.com/c/platform/build/+/2063380

Change-Id: Ia5b028d82cf1625f7dad1f26c84b069026d2ddbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:25:51 +00:00
Treehugger Robot
746806b3bb Merge "Create lists of projects to share per dist target" 2022-04-14 22:09:19 +00:00
Treehugger Robot
fc0dcc1bc1 Merge "Non-module targets." 2022-04-14 22:02:53 +00:00
Cole Faust
70d6a6d43a Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false" am: 95601112d5 am: 2c90bc41c8 am: a73e42248b
Original change: https://android-review.googlesource.com/c/platform/build/+/2061701

Change-Id: I3af89608bbccdf1d7f2716055b5101dc2f024af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:24:42 +00:00
Cole Faust
e7c1d6e578 Merge changes from topic "colefaust_enforce_product_packages_exist" am: 1be3bddbfa am: 547767afb8 am: 704d539ea3
Original change: https://android-review.googlesource.com/c/platform/build/+/2063512

Change-Id: I2313436f2f4f1c8e9826485eb5ccbc69ff9f4914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:24:13 +00:00
Cole Faust
22785265e1 Optionally dump RBC variables at the end of config.mk am: ec8316de2e am: 414100caeb am: aedeb66f24
Original change: https://android-review.googlesource.com/c/platform/build/+/2063509

Change-Id: I5172ef87c0833b0cefadebd40ce54cf81fef0f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:24:12 +00:00
Cole Faust
28afecfd45 Merge "Remove usages of long-form variables" am: b760b469c7 am: 85f941cf3a am: c091ee15fb
Original change: https://android-review.googlesource.com/c/platform/build/+/2064287

Change-Id: I2610a8c39679c34cb82cb4dbd679dadf5f797666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:23:48 +00:00
Cole Faust
a73e42248b Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false" am: 95601112d5 am: 2c90bc41c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2061701

Change-Id: Ia955f7a4cb19f9b035c759b02184366e41b7b880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:07:02 +00:00
Cole Faust
704d539ea3 Merge changes from topic "colefaust_enforce_product_packages_exist" am: 1be3bddbfa am: 547767afb8
Original change: https://android-review.googlesource.com/c/platform/build/+/2063512

Change-Id: I1cf81bfc62bf0f2c67828f344644996845767306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:06:48 +00:00
Cole Faust
aedeb66f24 Optionally dump RBC variables at the end of config.mk am: ec8316de2e am: 414100caeb
Original change: https://android-review.googlesource.com/c/platform/build/+/2063509

Change-Id: Ia1a854e0a060b890c292418db8001506d24e340b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:06:46 +00:00
Cole Faust
c091ee15fb Merge "Remove usages of long-form variables" am: b760b469c7 am: 85f941cf3a
Original change: https://android-review.googlesource.com/c/platform/build/+/2064287

Change-Id: I0cab896091bd7a668a23c3dbea13bbcb09b0b6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:06:29 +00:00
Cole Faust
2c90bc41c8 Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false" am: 95601112d5
Original change: https://android-review.googlesource.com/c/platform/build/+/2061701

Change-Id: I52e14079ac1f8c7592361b8818643317aeb11e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:39:42 +00:00
Cole Faust
547767afb8 Merge changes from topic "colefaust_enforce_product_packages_exist" am: 1be3bddbfa
Original change: https://android-review.googlesource.com/c/platform/build/+/2063512

Change-Id: I3d98fec7c04e8e846821eedcc0ab495055ba79dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:45 +00:00
Cole Faust
414100caeb Optionally dump RBC variables at the end of config.mk am: ec8316de2e
Original change: https://android-review.googlesource.com/c/platform/build/+/2063509

Change-Id: Ia4f6119c1f325cf26198891d9d17fc26c63cc7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:44 +00:00
Cole Faust
85f941cf3a Merge "Remove usages of long-form variables" am: b760b469c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2064287

Change-Id: I981c3dc7abf4d3508d06ba19bbdbadaa2107327d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:15 +00:00
Cole Faust
95601112d5 Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false" 2022-04-14 16:57:39 +00:00
Cole Faust
1be3bddbfa Merge changes from topic "colefaust_enforce_product_packages_exist"
* changes:
  Implement enforce_product_packages_exist
  Optionally dump RBC variables at the end of config.mk
2022-04-14 16:56:28 +00:00
Hongguang
bbe4842e31 Filter out TV GSI build targets
Bug: 228179256
Bug: 226020975
Test: lunch gsi_tv_arm-userdebug and gsi_tv_arm64-userdebug
Change-Id: Idee55259d5f24638895afd6eaf76cdf854e5807f
2022-04-14 08:06:47 +00:00
Cole Faust
81f1e92ed8 Remove usages of long-form variables
The long-form variables (PRODUCTS.<makefile>.<variable>)
are used to get information about multiple products.
However, they've never really worked correctly, and so
importing multiple products is deprecated behavior.

Remove as many usages of the long-form variables and
multi-product imports as possible.

Bug: 228518445
Test: Manually
Change-Id: I0b67f16360ff8bdcdb39638de739440472bccf76
2022-04-13 15:49:56 -07:00
Cole Faust
e050e8fec0 Implement enforce_product_packages_exist
This is something that didn't show up as a regression
when testing ninja files, but does show up when testing
make variables.

Bug: 229132189
Test: New --quick mode in rbc_dashboard.py
Change-Id: I6c1219cdc5ee1d8b3cc39e8f944e99fc380d4668
2022-04-13 14:48:59 -07:00
Cole Faust
ec8316de2e Optionally dump RBC variables at the end of config.mk
config.mk represents essentially the entire product/board
configuration. In order to develop a "quick" rbc regression
test, dump all the make variables at the end of config.mk.

We can then compare these variable dumps instead of ninja
files, because the ninja files take much longer to generate.

Bug: 229132189
Test: Manually
Change-Id: I4e8371be446b7e511aba22dff58530a6d9ff072f
2022-04-13 14:48:32 -07:00
Bob Badour
1fd4bda634 Create lists of projects to share per dist target
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses
Change-Id: I23ee3a983c205ee2a62e47edc2039b7cc713c420
2022-04-13 11:27:59 -07:00
Bob Badour
b03c16badc Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I4ee8fd67ee30a3e21723e13642fdb89cd626a2dd
2022-04-12 18:57:15 -07:00
Dan Shi
dadf7ca475 Package vts kernel tests in general-tests.zip
Bug: 228204473
Test: m dist general-tests
Change-Id: Ic6dac4427f1cc2c3bbfdb6905936e2478e5a4350
2022-04-12 15:50:53 -07:00
Cole Faust
1c08360ca8 Evaluate intermediate products properly
When an intermediate product is evaluated, it needs to
act as if it's the only product being evaulated. However,
currently, if it inherited a makefile that was also being
inherited by the overall top level product via a different
path, it would not get the values from that makefile.

Copy the configs dictionary before evaluating each product
that needs artifact path requirements, and create seperate
postfix orders for all of them that don't contain any products
that they don't inherit from.

Bug: 221312707
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I235ad78d587a2e315ba446b5e126d8f6d0fbbea7
2022-04-12 15:25:14 -07:00
Cole Faust
5d46c6133b Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false
Some products clear PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS
in order to disable it. But oftentimes this clearing relies on
the fact that clearing a variable will also cause it to not
inherit from any already-inherited files. Starlark doesn't support
this inheritance behavior, so allow setting
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false so that it
can be explicetly disabled instead of relying on the clearing
behavior.

Bug: 221312707
Test: Manually
Change-Id: I03a227911c6985a65fc5d210682bbd4ac9bd6747
2022-04-12 13:43:28 -07:00
Yurii Zubrytskyi
97191b2095 platform/build/make - T is now 33
Bug: 225745567
Test: Build
Change-Id: If115998c2ef9ef58329faa937e11d673f5585aab
2022-04-12 12:47:25 -07:00
Android Build Coastguard Worker
ff65f276bb Version bump to SQ3A.220605.002 [core/build_id.mk]
Change-Id: Iacae8bd95aae30c039556a2432fed72fd823c488
2022-04-12 17:37:24 +00:00
Treehugger Robot
f18826ae8c Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d am: ffa398e6a2 am: a98fd151ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990

Change-Id: I7cd8b1c59323e9deb314e8f2d9b17e4d8a57bd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:19:48 +00:00
Treehugger Robot
a98fd151ea Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d am: ffa398e6a2
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990

Change-Id: I5112f75f2edc2701819592fbca88d28bdbd5bee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:59:51 +00:00
Treehugger Robot
ffa398e6a2 Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990

Change-Id: I54635a2f6372bd81ab082a8b0ad07c8ceb5f8da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:43:57 +00:00
Treehugger Robot
7bc6d0e71d Merge "Put javac, d8 and r8 rules into RBE ninja pool" 2022-04-12 14:27:24 +00:00
Android Build Coastguard Worker
68dcc0ed53 Make change and version bump to SQ3A.220605.001
Change-Id: I3311c0e99ef39d6ec9f3aa8eafbf4a7aaa29e5c9
2022-04-11 23:06:46 +00:00
Steve Berbary
e71eb9afd5 Update Security String to 2022-06-05
Bug: 228265025
Change-Id: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
(cherry picked from commit ee052ac0e5)
Merged-In: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
2022-04-11 23:04:57 +00:00
Christopher Ferris
66b6fd6049 Add support for only starting 64 bit zygote.
Added code to support a single system image that can start the
64 bit zygote only, or both the 64 bit and 32 bit zygote. By
default, the system will default to 64 bit only.

For this image, all abilist properties are only present in the
vendor partition. All other copies of these properties are deleted.

Bug: 227482437

Test: Verified that secondary doesn't start with same disk image
Test: with ro.zygote set to zygote64 and abilists set appropriately.
Test: Verified that secondary does not start when restarting netd.
Test: with ro.zygote set to zygote64_32 and abilists set appropriately.
Test: Verified that secondary does start when restarting netd.
Test: Verified that a 64 bit device only starts the primary.
Test: Verified that a 32 bit device only starts the primary.
Change-Id: Ifc6413cecc4df8ba041699f7d0b10786d1926d64
2022-04-11 14:18:58 -07:00
Treehugger Robot
d816479292 Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69 am: 5324ea0ca6 am: 2de37f9424
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032

Change-Id: I2751ba90417c8960ab5539f2fe181c66b4c69b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:39 +00:00
Treehugger Robot
fdfbd833eb Merge "Non-module targets." am: ff15a27bd7 am: 7c30a61bc6 am: 6687e127b0
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

Change-Id: I5a6aa6499b4c39a8933ffee3d622023f2e8e0bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:09 +00:00
Treehugger Robot
2de37f9424 Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69 am: 5324ea0ca6
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032

Change-Id: I05a20192bdbb375729a7b19fa0215b5223bc4727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:26:52 +00:00
Treehugger Robot
6687e127b0 Merge "Non-module targets." am: ff15a27bd7 am: 7c30a61bc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

Change-Id: I3ee4934b40b57652945d81dea7a3f63b495ae5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:26:21 +00:00
Treehugger Robot
5324ea0ca6 Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032

Change-Id: Iae8c43ab5fa0236b75b98baa34ab429ab4051a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:11:51 +00:00
Treehugger Robot
7c30a61bc6 Merge "Non-module targets." am: ff15a27bd7
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

Change-Id: I188d24d5bcfbd11d5ad1b894e3ddc211a882d48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:11:01 +00:00
Treehugger Robot
2f6aa08f69 Merge "Remove unused combine-notice-files macro." 2022-04-11 19:42:48 +00:00
Treehugger Robot
ff15a27bd7 Merge "Non-module targets." 2022-04-11 19:42:29 +00:00
TreeHugger Robot
97ca005658 Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into sc-v2-dev-plus-aosp am: 31d5f5bb57
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615283

Change-Id: Iee3240448514a7486bbc66427f6bd5bfdb045af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 19:37:43 +00:00