StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,226 Commits 1 Branch 0 Tags
2a19321e3d86f23f35bf67c22885c64dae7b51d8
Commit Graph

36880 Commits

Author SHA1 Message Date
Treehugger Robot
602c9df271 Merge "Add .product suffix for the product variants" into main am: 251ad2f41f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418

Change-Id: I9a8ec444e9fdc19e3426d5f163ec61b765306868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 08:35:10 +00:00
Justin Yun
59fbdf0bba Add .product suffix for the product variants 
Instead of adding .vendor suffix, add .product suffix to include
product variants.

Bug: 309511650
Test: atest com.android.gts.vndk.VndkDependencyTest#testVndkDependencyTestCase
Change-Id: I6d578be95c618c565347f0fdf660e82945ac77a3
 2023-11-15 14:59:39 +09:00
Alyssa Ketpreechasawat
82f52a7cfc Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d am: 566f69178c am: b02812d84c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531

Change-Id: Ia37497d25763fcd2ef563f2cc6097a9cae65737b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 20:42:55 +00:00
Alyssa Ketpreechasawat
b02812d84c Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d am: 566f69178c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531

Change-Id: I004ff3a20eccd4ebc2a0105551f80e0571da1ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 20:07:39 +00:00
Alyssa Ketpreechasawat
9364c5e506 Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531

Change-Id: I594a68a6b0e12363378a62e7c59bae2a706f455d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 19:46:03 +00:00
Alyssa Ketpreechasawat
566f69178c Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531

Change-Id: I28dde980714a4eb4571f605c6e217f5750e8f6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 19:44:58 +00:00
Alyssa Ketpreechasawat
c7bc53999d Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main 2023-11-14 19:13:32 +00:00
Colin Cross
93e1e702a4 Remove ALL_DEPS.MODULES 
Nothing reads it any more.

Test: m checkbuild
Change-Id: I6f11a5273b0c2cc92a3b0c49bbefbf084cb734a1
 2023-11-14 11:03:08 -08:00
Jeff Sharkey
d545b872f3 Merge "Update XML template to reflect null device." into main 2023-11-14 18:06:54 +00:00
Florian Mayer
beb5bed41f Increase scudo MTE buffer for fullmte devices 
Bug: 309446692
Change-Id: Idfb7956a1f7031d908f026d120fe8e253976ff4f
 2023-11-14 02:51:14 -08:00
Justin Yun
6dc5924d72 Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e am: df2645967d am: d7d7e5c61e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990

Change-Id: Ifcd1e9f0cd26c72f57652e9eed424ec92e7977f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 01:09:39 +00:00
Justin Yun
d7d7e5c61e Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e am: df2645967d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990

Change-Id: Iebeabebf8a98dd93e5c2d9380e1d81fbc47e4ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 00:37:31 +00:00
Justin Yun
df2645967d Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990

Change-Id: I83bb0eaa6e9cb8bb87c46ac1977d1200675f5579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 00:07:25 +00:00
Justin Yun
0379fe98ee Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990

Change-Id: Ie2c6ea2b8897810ab5504b3d88cf775e358ec34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-14 00:07:02 +00:00
Justin Yun
136fa83d4e Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main 2023-11-13 23:40:06 +00:00
Jeff Sharkey
987ae3d2ec Update XML template to reflect null device. 
Ravenwood doesn't need a device, so add a "null" filter so that
atest doesn't hang waiting for one.

Bug: 292141694
Test: atest-dev CtsOsTestCasesRavenwood CtsOsTestCases
Change-Id: I10ceeae92c7622ea44ecbc315e23babe8b36516a
 2023-11-13 14:02:15 -07:00
Alyssa Ketpreechasawat
ba231d2084 Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled. 
framework-pdf is newly added framework jar which is not yet included in
the actual prebuilt apex. Thus, we add it PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY. The APEX_BOOT_JARS_EXCLUDED will be created based on PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY and will be removed from ApexBootJars.

Bug: 304719212
Test: lunch cf_x86_phone-next-userdebug & m
Test: lunch cf_x86_phone-trunk-userdebug & m
Change-Id: I9902131629900fbd629b8560a422ed8c2b06073c
 2023-11-13 13:22:32 +00:00
Colin Cross
17ebb51536 Merge "Escape sbom lines" into main am: 70ed34cc72 am: 7523abc4e1 am: 8736c21a1f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: I536899e5c803f02659057d4fc88a0d8593287936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-11 05:11:47 +00:00
Colin Cross
8736c21a1f Merge "Escape sbom lines" into main am: 70ed34cc72 am: 7523abc4e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: I69e63159ffb7c4ccc9e6db874108140c95a19a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-11 04:40:00 +00:00
Colin Cross
7523abc4e1 Merge "Escape sbom lines" into main am: 70ed34cc72 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: I752a0a0e5ac53dd24a797259529aa66d72c13e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-11 03:52:29 +00:00
Colin Cross
4bd43459ea Merge "Escape sbom lines" into main am: 70ed34cc72 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: If4f0acc2ce978a83e6c2527080de24584dbc3b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-11 03:52:28 +00:00
Colin Cross
70ed34cc72 Merge "Escape sbom lines" into main 2023-11-11 03:22:11 +00:00
Colin Cross
92f8043874 Escape sbom lines 
Go 1.21 changes the names of some factory functions to include
characters that need shell escaping.  Wrap everything written to
the sbom file with single quotes.

Bug: 309895579
Test: m out/target/product/vsoc_x86_64/sbom-metadata.csv
Change-Id: Ia61f02d8b02dd9f92ce144307087423c592a1833
 2023-11-10 15:06:21 -08:00
Treehugger Robot
66d40dbecf Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 am: 84d00a4ff6 am: 6bb3bee4ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: I62bddbdf9f3ae0b075824b3db7acb69e7f325d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 21:13:00 +00:00
Treehugger Robot
6bb3bee4ba Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 am: 84d00a4ff6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: I1a18cc6b08879b0beab6527940b2c353a42821b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 19:52:08 +00:00
Treehugger Robot
4f0489ae6e Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: Idf689b6c79faddf383f905049c57aee5e548771a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 19:20:13 +00:00
Treehugger Robot
84d00a4ff6 Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: I3d4007a6aea280118df9cb0073478a497d01590e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 19:18:23 +00:00
Treehugger Robot
fc9ebd2684 Merge changes from topic "disable-dexpreopt-dexopt" into main 
* changes:
  Add a Make variable to disable all dexpreopt and dexopt activities.
  Update dexopt system properties.
 2023-11-10 18:47:19 +00:00
Colin Cross
dde924d793 Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c am: d8be2bfeef am: 3f818b17e0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: I3b9d3f7d6963ab158216887f2d04c89ba12e1f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 08:34:17 +00:00
Colin Cross
3f818b17e0 Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c am: d8be2bfeef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: I8b82a223b41e2f37add238edcc51a7fd8ae28807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 07:44:46 +00:00
Justin Yun
23d52435f3 Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN 
BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN are set by the release
flags.
BOARD_API_LEVEL sets ro.board.api_level that shows the API level of
the vendor API surface.
BOARD_API_LEVEL_FROZEN sets ro.board.api_frozen that shows if the
ro.board.api_level is finalized.

Bug: 295269182
Test: getprop ro.board.api_level
Change-Id: Ie57c57b6c9f1fc0c98968195843059a48da8e512
 2023-11-10 16:31:04 +09:00
Colin Cross
d7f59ea0c9 Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: Iebaf6e894b8131cc7ef9f5ba091b3e974f5407de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 07:13:56 +00:00
Colin Cross
d8be2bfeef Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: I91ee4c153dd76c4d66ba3e14eb769610233cf129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 07:13:51 +00:00
Colin Cross
481b02106c Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main 2023-11-10 06:15:45 +00:00
Juan Yescas
1ed28d0a07 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492 am: 1b51f6ec38 am: 3675aaf529 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861

Change-Id: I50ddf4ac601625bf71cb7df4b1f0fd20f78c965f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 00:47:13 +00:00
Juan Yescas
3675aaf529 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492 am: 1b51f6ec38 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861

Change-Id: I2925660bae1ab5568048fea13c2511c3b8078e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 23:59:59 +00:00
Juan Yescas
f476e19d72 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861

Change-Id: Ib4b97c0989ca1a4a8340549f988d56ad720c32a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 23:27:57 +00:00
Treehugger Robot
20114d077f Merge "Remove _kwmarker" into main am: c50601abc4 am: 1d1abfeded am: 222a155d27 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864

Change-Id: I6a5228cc803777aebb95b16ff5bf8b042c55bedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 23:26:14 +00:00
Juan Yescas
1b51f6ec38 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861

Change-Id: Iaaa88ab3fa7c6302008b04c5400dbdf099697ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 23:25:59 +00:00
Juan Yescas
06b7b6c492 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main 2023-11-09 23:07:09 +00:00
Treehugger Robot
222a155d27 Merge "Remove _kwmarker" into main am: c50601abc4 am: 1d1abfeded 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864

Change-Id: Ia46dbc36f8606ffa7ed727e7b15faf6f3ac85086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 22:38:54 +00:00
Treehugger Robot
62b0a71882 Merge "Remove _kwmarker" into main am: c50601abc4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864

Change-Id: Id2eb08dcc0bab817294353485302526a52b146dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 22:08:37 +00:00
Treehugger Robot
1d1abfeded Merge "Remove _kwmarker" into main am: c50601abc4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864

Change-Id: I668458272c7a0bc5a522c273fce9050824d1730e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 22:05:10 +00:00
Juan Yescas
ebadc969a8 16k: Support max-page-size alignment greater than 4096 for x86-64 
To simulate 16k page size in x86-64 cuttefish, it is necessary
to compile the shared libraries and binaries with max-page-size greater
than 4096.

Bug: 309816695
Test: source build/envsetup.sh
      lunch aosp_cf_x86_64_phone_pgagnostic-trunk-userdebug
      m
Change-Id: Id8e142a5a3556f5fd30ce90eaac236dcbc1b0881
 2023-11-09 12:51:30 -08:00
Cole Faust
b9b54396d4 Remove _kwmarker 
python and starlark already have syntax for this.

Test: Presubmits
Change-Id: I9082c1cc62837840f091cd5856b1b4cc39064274
 2023-11-09 12:40:38 -08:00
Greg Kaiser
0229ecfae5 Reland: Require TARGET_RELEASE for builds 
Relanding because we've fixed a number of the broken build
setups this change exposed.  We will push to fix forward broken
build setups instead of reverting this change again.


Rather than use an unsupported flag setting that the user likely
doesn't even realize is being used, we immediately stop the build.

This error message is more verbose, mentioning 'lunch', because
it's anticipated a lot more users will hit this issue when first
switching to trunk stable, and more details will hopefully help
them out.

We have some complication in that some internal commands set
TARGET_RELEASE to an empty string.  We put in logic to allow
that path.

Since $(error) immediately stops the build, we also get rid of
some 'else' logic and indentation, to hopefully offset some of
the complication we've added.

Bug: 307946156
Change-Id: I0fa4a1c876e607401f4c7f945b9971cfb8db71a0
Test: 'lunch' (still) works; A build attempt without `TARGET_RELEASE` set (now) fails
 2023-11-09 20:28:55 +00:00
Jiakai Zhang
bf0c0e6856 Add a Make variable to disable all dexpreopt and dexopt activities. 
This change adds a Make variable "OVERRIDE_DISABLE_DEXOPT_ALL", which
disables all dexpreopt and dexopt activities.

This is for faster iteration during development and should never be
enabled for production.

Bug: 309011617
Test: See no dex2oat invocation during build.
Test: Boot and see no dex2oat invocation during boot, except for the
  in-memory boot image for JIT Zygote.
Change-Id: I0193b57fdb18e1fb717f44af81d1cf525f1609ee
 2023-11-09 16:50:18 +00:00
Robin Lee
be0ebbe91f Merge "Revert "Require TARGET_RELEASE for builds"" into main am: 092c6b68b8 am: d9bd4a88c9 am: a7be16d19b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2821997

Change-Id: I8c3d9624d11fe0ea68ce39e0929bf05dfc94b3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 10:27:45 +00:00
Robin Lee
a7be16d19b Merge "Revert "Require TARGET_RELEASE for builds"" into main am: 092c6b68b8 am: d9bd4a88c9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2821997

Change-Id: Id5e521405c931a0a2a8a61f0437b41645ccb83f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 09:41:10 +00:00
Robin Lee
1286a56891 Merge "Revert "Require TARGET_RELEASE for builds"" into main am: 092c6b68b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2821997

Change-Id: I5283eeaf1d01f6d54d733d6094d2400344b7b84f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 09:11:41 +00:00