Commit graph

76299 commits

Author SHA1 Message Date
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
Treehugger Robot
95654c5113 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" 2022-04-19 16:17:38 +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
Xin Li
959692ce64 Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master 2022-04-18 23:39:47 +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
Xin Li
fc75ee3331 Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0
Change-Id: Ib78e46b46934800a767685a8d91e8929fe0cf686
2022-04-18 21:04:36 +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
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
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
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
f4ad50eeb6 Merge "Revert "Create lists of projects to share per dist target"" 2022-04-15 17:31:03 +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
Cole Faust
90814c0706 Merge "Evaluate intermediate products properly" 2022-04-15 17:11:55 +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
Treehugger Robot
03ea8842af Merge "Non-module targets." 2022-04-15 04:41:23 +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
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
4a2f1f84d0 Merge "Rename listshare and checkshare." am: e487fa3ccb
Original change: https://android-review.googlesource.com/c/platform/build/+/2063382

Change-Id: Iaeb6cea374eed9bd4a168da50701734255d6a6e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:26:32 +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
e487fa3ccb Merge "Rename listshare and checkshare." 2022-04-14 22:09:15 +00:00
Treehugger Robot
fc0dcc1bc1 Merge "Non-module targets." 2022-04-14 22:02:53 +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
Cole Faust
b760b469c7 Merge "Remove usages of long-form variables" 2022-04-14 16:55:18 +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
213095a919 Rename listshare and checkshare.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses
Change-Id: I223c4496d776a1bbd4fdce31ed79a638ed3491d8
2022-04-13 11:04:43 -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
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
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