StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,485 Commits 1 Branch 0 Tags
c63a2b36d74dadb51a9cdcc71ad470111ebe3f02
Commit Graph

33811 Commits

Author SHA1 Message Date
Colin Cross
ffda9a5093 Merge changes Id8b48c8c,I3b66304c 
* changes:
  Build the whole platform for aosp_riscv64
  Disable dexpreopt for aosp_riscv64
 2023-03-24 15:48:32 +00:00
Colin Cross
01475b41fb Don't read test mapping list in Make 
Reading the test mapping list in Make causes Kati to regenerate
any time a TEST_MAPPING file is added or removed.  Pass the file
to the rule and read it during ninja instead.

Bug: 274987114
Test: m test_mapping
Change-Id: I68a76646d70c85b2cb992e4da52a7854acd370b9
 2023-03-24 04:33:07 +00:00
Sijie Chen
d33ef7391f Merge "Clean additional Robolectric variable" am: 539fbc287e am: 5a678d06ee am: 74aebc8e55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494869

Change-Id: I5333141e7effa06f75bdda0f7b13d1c275020147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 00:24:21 +00:00
Sijie Chen
74aebc8e55 Merge "Clean additional Robolectric variable" am: 539fbc287e am: 5a678d06ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494869

Change-Id: I9e3fdfb1071c065c39f118ceedf17d80457a1909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 23:54:21 +00:00
Colin Cross
ae7f543b7c Disable dexpreopt for aosp_riscv64 
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I3b66304cedf55f734f8aa1d3ad3ed594a7b9a122
 2023-03-23 16:29:28 -07:00
Sijie Chen
539fbc287e Merge "Clean additional Robolectric variable" 2023-03-23 22:51:42 +00:00
Spandan Das
8a02633b56 Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c am: b9a6afe05a am: 11fbf45243 
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I62e58698f9a9fd511b1f69df5ae019f16976a1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 22:51:11 +00:00
Spandan Das
11fbf45243 Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c am: b9a6afe05a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I7f050b963936c74b6a6a3469bad084b04de7479d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 22:20:28 +00:00
Spandan Das
0326e64c3c Merge "Update hardcoded references to android_*stubs_current" 2023-03-23 21:32:03 +00:00
Sunil Ravi
4e19fe52ff Merge "Add config to skip state toggle off/on for Wi-Fi NAN" am: 691c92f567 am: b25981143f am: 40167b0380 
Original change: https://android-review.googlesource.com/c/platform/build/+/2503002

Change-Id: Ib68ba885763bf62ead5604e3605b58ed66337d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 21:29:44 +00:00
Sunil Ravi
40167b0380 Merge "Add config to skip state toggle off/on for Wi-Fi NAN" am: 691c92f567 am: b25981143f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2503002

Change-Id: I4007ed1a4c988f28f58dc7bd2899b9aa32b65b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 20:55:45 +00:00
Steven Moreland
aa81ee2a6e remove reference to old VTS config 
No longer exists, no longer used.

Bug: 274790216
Test: N/A
Change-Id: Id11921707cd5141235850d88a6d2397e85726532
 2023-03-22 21:11:42 +00:00
Ye Jiao
0786af077c Add config to skip state toggle off/on for Wi-Fi NAN 
If STA and NAN share the same iface wlan0, Wi-Fi vendor HAL service
sends eventDisabled to NAN framework when STA setMacAddress to wlan0.
This disables NAN when STA is turned on.

Since NAN always uses its own random MAC instead of using MAC of STA,
this action is not necessary and gets NAN kicked off for no benefits.

We add a build time configuration to optionally disable this behavior.

Bug: 273426515
Test: manually test

Change-Id: If0d84b3898387b75392c8012640bc728126f2cff
 2023-03-22 20:05:41 +00:00
Julien Desprez
1c6aa54306 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 am: 660e9fa2e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I3981b8677b91900aa1785c09faf35dc09cfdc638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 03:48:26 +00:00
Julien Desprez
660e9fa2e3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I4b9328b17a82fdbad4b3bd97de40f256c3e9f6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 03:11:39 +00:00
Julien Desprez
f4c157e4cf Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 6bc1b2deed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I63a0d26d524d005f5d3fa91d8d457950bef86c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:48:06 +00:00
Julien Desprez
63c3099dc8 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: Ia8228324a2ef9ad69aaefc6352e22113dd24ce58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:13:57 +00:00
Julien Desprez
6bc1b2deed Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I1fd20f11bb37a544fb19558d4cbf77571a0bd899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:13:17 +00:00
Julien Desprez
50d29f770b Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I660d33b843ad09e5bf51ee326e6dd2250f782148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 01:33:44 +00:00
Julien Desprez
cd608825a3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I7082e28688912f848f0be54fbd445319029d80fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 00:58:49 +00:00
Julien Desprez
48c10589c6 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev 
* changes:
  [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
  Remove tradefed-no-fwk from suites
 2023-03-22 00:32:22 +00:00
Treehugger Robot
0db017be76 Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6 am: 8925166fff am: c02e0f7ad8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535

Change-Id: I17e60bc7c1afcff45c03059fcdc054422d5c56b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 18:25:25 +00:00
Nicolas Geoffray
02844ff77b Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36 am: 22d145424a am: 5325cd5cdf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995

Change-Id: I8580a642c577b1f4c0f012ec967f5f60e19d178c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 18:23:29 +00:00
Treehugger Robot
c02e0f7ad8 Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6 am: 8925166fff 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535

Change-Id: I38ee795422205a79eec93a6f55fbb6570e38811f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 16:49:21 +00:00
Nicolas Geoffray
5325cd5cdf Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36 am: 22d145424a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995

Change-Id: Icac6f47314a704c0836e17a20109da1e72b248a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 16:48:18 +00:00
Treehugger Robot
d7600be9a6 Merge "Disable system_server.zip generation for ART prebuilts" 2023-03-21 15:19:58 +00:00
Nicolas Geoffray
3a6ebaac36 Merge "Use the boot image mainline extension when dexpreopting in Make." 2023-03-21 14:51:20 +00:00
Pranav Gupta
1da7219ed1 Disable system_server.zip generation for ART prebuilts 
system_server.zip does not need to be generated when using the prebuilt mainline modules or if ART_MODULE_BUILD_FROM_SOURCE is false or if MODULE_BUILD_FROM_SOURCE is false

Bug: 274051753
Change-Id: Ifc638eb4e14ed9ea078125d1780a02b9de6b9ccc
 2023-03-21 07:30:37 +00:00
Treehugger Robot
c39ca1406d Merge "Remove vtsc host tool" am: 896e7c715e am: d0362d7b16 am: 75c71733ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778

Change-Id: I2de4252e46022157e44773294fca721747307e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 04:57:11 +00:00
Treehugger Robot
75c71733ef Merge "Remove vtsc host tool" am: 896e7c715e am: d0362d7b16 
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778

Change-Id: Ic52c0427a575f1c37f8f5b89c0209ac16b736012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 03:57:38 +00:00
Treehugger Robot
896e7c715e Merge "Remove vtsc host tool" 2023-03-21 02:14:34 +00:00
Spandan Das
0c01c90544 Update hardcoded references to android_*stubs_current 
The hardcoded references should be updated to variables exported by
Soong. This enables the stub selection logic to exist in a single place.

Test: TH
Test: No change in out/build-<lunch_product>.ninja

Change-Id: I153f1c6ffc6c93d8a64c3edfef3e8d52c84207a3
 2023-03-20 21:59:18 +00:00
Cole Faust
e08325fb55 Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57 am: 299878fb17 am: bfbb7718c7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212

Change-Id: I66d57643ba132b420edf9725d9b4bd36457f692f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:52:52 +00:00
Treehugger Robot
3c79e80233 Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41 am: 708b70a554 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575

Change-Id: I9479b1cc06bcd4d2abd5ac4009bfa92b4f24acfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:16:00 +00:00
Cole Faust
bfbb7718c7 Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57 am: 299878fb17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212

Change-Id: Ie773663bd3cd5770af0e754ee29c9f411d574244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:14:47 +00:00
Treehugger Robot
5f3ddd4f41 Merge "Add rkpd to the list of individually toggleable modules" 2023-03-20 20:41:51 +00:00
Cole Faust
14108b6a57 Merge "Create image apexes by default instead of flattened apexes" 2023-03-20 19:54:49 +00:00
Treehugger Robot
76394be62a Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f am: d90bc8e5ee am: 96a1cfe673 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355

Change-Id: If650e824bbf7f7446e3c4b922dd8a471d3a8e543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 19:47:23 +00:00
Treehugger Robot
96a1cfe673 Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f am: d90bc8e5ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355

Change-Id: Ia41fb01d563745f2b13a95875273a5c0347ab7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 19:02:32 +00:00
Jiakai Zhang
fb2734e36b Use the boot image mainline extension when dexpreopting in Make. 
aosp/2470961 introduces a boot image mainline extension. We need to use
it when dexpreopting apps in Make.

Bug: 274059172
Bug: 269230245
Test: See "boot-framework-adservices.art" in
  out/target/product/vsoc_x86_64/obj/APPS/PrebuiltGmail_intermediates/oat/x86_64/package.invocation
  on internal master.
Change-Id: Ic0b1753a0066bd16a31de028743f1ad908e9bdfc
 2023-03-20 18:42:13 +00:00
Cole Faust
5e2491eff2 Create image apexes by default instead of flattened apexes 
This is a list of all the internal master products that
use flattened apexes before and after this commit:
https://diff.googleplex.com/#key=AcyUcqOwqpXZ

Apexes can still be flattened by setting `TARGET_FLATTEN_APEX := true`
or `OVERRIDE_TARGET_FLATTEN_APEX := true` in their product config.

Bug: 254205429
Test: presubmits
Change-Id: I5b15f0fc9e149730fd33722632a8ac14432ab757
 2023-03-20 18:39:22 +00:00
Treehugger Robot
6dcf429d8f Merge "[config] Boards can supply custom super image script" 2023-03-20 17:52:41 +00:00
Paul Duffin
a537224b3a Add rkpd to the list of individually toggleable modules 
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.

Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
      m MODULE_BUILD_FROM_SOURCE=true droid
      m MODULE_BUILD_FROM_SOURCE=false droid
      # Make sure that they build from sources and prebuilts respectively.
Merged-In: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
(cherry picked from commit 95b546475f)
 2023-03-20 16:21:23 +00:00
Paul Duffin
d82796bbf8 Merge "Add rkpd to the list of individually toggleable modules" into udc-dev 2023-03-20 16:13:18 +00:00
Ziwei Zhang
34a9f9c13e Merge "Add python mobly test template xml." am: 0a25e67404 am: 863bf01391 am: 31337205d6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502

Change-Id: I8a7a54ca25114c61782aac8e7c4f6ea8597ff925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 04:08:05 +00:00
Ziwei Zhang
31337205d6 Merge "Add python mobly test template xml." am: 0a25e67404 am: 863bf01391 
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502

Change-Id: I15452245b1a59125d5e40b6fa1d3bd81090da4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 03:28:46 +00:00
Ziwei Zhang
0a25e67404 Merge "Add python mobly test template xml." 2023-03-20 02:16:04 +00:00
Ludvig Hansson
6d11991f1d Clean additional Robolectric variable 
Add LOCAL_INSTRUMENT_SRCJARS to list of variables
to reset when calling CLEAR_VARS from a makefile.

This fixes an issue when generating JaCoCo coverage
reports for Robolectric tests.
The value from another module would bleed into the current
one causing the wrong source directory to be used during
report creation, which in turn resulted in an empty report.

This would only happen for modules still using 'Android.mk';
when using Android.bp files the value for LOCAL_INSTRUMENT_SRCJARS
is always set from 'robolectric.go'.

Bug: 214588476
Test: m clockwork-frameworks-robotests-jacoco
Change-Id: I7b527c82bdbe4db06acd1a1fa1a2443e64ed703d
(cherry picked from commit cc799bdf9161dc3c0f6eb437ed064f9712bbfd6b)
 2023-03-17 23:55:29 +00:00
Paul Duffin
95b546475f Add rkpd to the list of individually toggleable modules 
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.

Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
      m MODULE_BUILD_FROM_SOURCE=true droid
      m MODULE_BUILD_FROM_SOURCE=false droid
      # Make sure that they build from sources and prebuilts respectively.
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
 2023-03-17 22:26:54 +00:00
Aidan Wolter
fbf53522cf [config] Boards can supply custom super image script 
Some boards may need to customize the format of the super image. We will
now provide the variable BOARD_CUSTOM_BUILD_SUPER_IMAGE so that boards
can provide their own script for constructing the super image. This
mimics similar code in the same file for allowing boards to supply a
custom VBMeta (BOARD_CUSTOM_AVBTOOL) or boot image
(BOARD_CUSTOM_MKBOOTIMG).

Bug: None
Change-Id: I461caeb6dfb705fd5c671228fc35561ed403a1cb
 2023-03-17 20:17:35 +00:00