StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,516 Commits 1 Branch 0 Tags
b51cfc63a5c2f6b9f58873241d7a79efa6e5c10c
Commit Graph

89516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shaju Mathew
9c777ce8a5 Merge "Use command instead of which to locate/run adb" into main 2023-07-14 02:21:28 +00:00
Android Build Coastguard Worker
10b14ff0c0 Version bump to UP1A.230623.015 [core/build_id.mk] 
Change-Id: I65e005b249bc875a9615ea6b109f65600c33cac7
 2023-07-14 02:00:11 +00:00
Android Build Coastguard Worker
02bce42940 Make change and version bump to UP1A.230623.014 
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24042245', 'googleplex-android-review.googlesource.com/24029569', 'googleplex-android-review.googlesource.com/24029570'] into udc-release.

Change-Id: I3748f8bfbf5779ae188899fbb551f75a60a9e3b0
 2023-07-14 01:32:41 +00:00
Wei Li
8f93cf447d Support SBOM generation of m build unbundled APEXs. 
Bug: 266726655
Test: banchan com.android.adbd arm64 userdebug && m dist
Test: build/soong/tests/sbom_test.sh
(cherry picked from https://android-review.googlesource.com/q/commit:7c4f064a2bfd17db3129dae64baab510da64eca8)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9b228201502154285197e97a30d646feb312112d)
Merged-In: I7abadbc083ef66b0e8ace28de69a1a219670ec37
Change-Id: I7abadbc083ef66b0e8ace28de69a1a219670ec37
 2023-07-14 01:23:55 +00:00
Wei Li
42cfcfe288 Include static libraries information in Android SBOM. 
Bug: 280852724
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m sbom
(cherry picked from https://android-review.googlesource.com/q/commit:d263695cd4dea0f9e4db71691c57ebb63621c09a)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ccf5023a1edcf6c8569ac97b35880eaf129ed0ce)
Merged-In: Ie2365d79ba24910b7ace132b578589be10a17d78
Change-Id: Ie2365d79ba24910b7ace132b578589be10a17d78
 2023-07-14 01:23:48 +00:00
Colin Cross
a035e7cb55 Dist kernel_version.txt 
Fixes: 290361803
Test: treehugger
(cherry picked from https://android-review.googlesource.com/q/commit:27f36d1bc80a4092f157845f86faf02d36517c18)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e0d8de9068516b458fb308b63eab3a78669a34bc)
Merged-In: I146817c9cf256f086404c880a0215cb8e688c544
Change-Id: I146817c9cf256f086404c880a0215cb8e688c544
 2023-07-14 01:23:41 +00:00
Kiyoung Kim
f019601670 Add a new variable for deprecating VNDK 
Add a new flag variable for deprecating VNDK. This variable should be
passed to Soong, so it can change behavior based on the flag.

Bug: 290157355
Test: build succeeded with KEEP_VNDK=false
Change-Id: I3a9d1041411ad24ff42f76506a8f929e364b868d
 2023-07-14 01:18:19 +00:00
Cole Faust
7a114c5313 Minify the sdk targets 
Previously, the "sdk" target was a minimal lunch target that only
included enough to build the sdk. But the "sdk_<arch>" targets
redirected to the "sdk_phone_<arch>" targets, which are much bigger
and capable of building a whole emulator.

Building the sdk on products that can build a whole device complicates
the rest of the build system (for example, it starts enforcing dexpropt
works)

Bug: 290798660
Test: Presubmits
Change-Id: I0ec5110318c43a7feee0b88edbed1cab0b590a47
 2023-07-13 16:40:30 -07:00
Saagar Jha
11f188c09a Use command instead of which to locate/run adb 
If adb is not found on PATH, which will silently fail and evaluate to
the empty string. This will cause the remaining arguments to be
interpreted as a command to run in the shell, which is generally
undesirable. (Consider, for example, "adb reboot" -> "reboot".)

Bug: 24473359
Test: Just run adb before lunch so it's not on PATH

Change-Id: I6b20722add6c67d1d2627f963dc66095502ab816
Signed-off-by: Saagar Jha <saagarjha@google.com>
 2023-07-13 23:36:29 +00:00
LaMont Jones
4bbf7a86af Merge changes from topic "mod-info-foreach" into main am: e75c063d1f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522

Change-Id: I9bc44b061f568b44aa72a13d6e6c2883178156cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 20:09:14 +00:00
LaMont Jones
e75c063d1f Merge changes from topic "mod-info-foreach" into main 
* changes:
  Reduce spaces in module-info.json
  use KATI_foreach_sep in module-info.json rules
 2023-07-13 19:36:02 +00:00
Treehugger Robot
33e1da8114 Merge "Update BUILD_ID" into aosp-main-future 2023-07-13 19:03:54 +00:00
Treehugger Robot
a562d4abb7 [automerger skipped] Merge "Update BUILD_ID" into main am: 442e8719b9 -s ours 
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2650370

Change-Id: I00fc15c3bf0202d8d3aa765873825264685cb9ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 17:54:46 +00:00
Amith Dsouza
9901306f4a [automerger skipped] Update BUILD_ID am: cab8fc9658 -s ours 
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2650370

Change-Id: I57ff03d8df41c28b1b61abba7b452858d87c25b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 17:54:43 +00:00
Treehugger Robot
442e8719b9 Merge "Update BUILD_ID" into main 2023-07-13 17:02:31 +00:00
Dennis Shen
24ecb48d89 Merge "aconfig: add c codegen" into main am: afd8b2d75b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700

Change-Id: Id128c68dfa1b48bcc0a15d85423cd04bc31b42ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 14:35:04 +00:00
Dennis Shen
afd8b2d75b Merge "aconfig: add c codegen" into main 2023-07-13 13:55:10 +00:00
Dennis Shen
7321f4f6f1 aconfig: add c codegen 
c codegen can be done at the same time with cpp codegen, the idea is to
create a c compatible header that defines the flag apis, including flag
override apis for test. then in the corresponding cpp file, the
implementation simply calls into cpp api.

c header supports static method interface, and unit test override, but
it does not support injection pattern compared to cpp header

Bug: b/279483801
Test: atest aconfig.test
Change-Id: Ie62b76d6524e443de5d3c2f9000f7f66623ab571
 2023-07-13 13:55:06 +00:00
Jiakai Zhang
7bdb2b3c32 Add a Make variable to determine ART boot image jars for testing. 
Bug: 290583827
Test: m nothing
Change-Id: Ibd0dd99593e4efb357e674c6a89804ea9cd47a84
 2023-07-13 14:24:18 +01:00
Jiakai Zhang
17c6af46df Add a Make variable that overrides configured jar locations. 
Bug: 290583827
Test: m nothing
Change-Id: I9a23d6a033d50d2a8c5d9e8dd79d00033efa1f53
 2023-07-13 14:24:16 +01:00
Kangping Dong
a1a7046533 add service-threadnetwork to system_server jars 
Instructions: go/mainline-java-lib#classpath-configuration

Bug: 262683651
Test: run `m -j16`
Change-Id: I3f2a8603669b16a7e3a7aeb06ac850add0df8c5d
 2023-07-13 06:04:58 +00:00
Android Build Coastguard Worker
b0db9525c5 Version bump to UP1A.230623.013 [core/build_id.mk] 
Change-Id: Iff5c2367e87c4803d53d346136d49bb23d7c030a
 2023-07-13 03:12:21 +00:00
Jooyung Han
18485d30c4 Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667

Change-Id: I92d6a88a456315fb2f715b6e69c75976450245dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:02:52 +00:00
Jooyung Han
b51bc1c77e Merge changes I16be0dcb,I4656d43d,I52b831df into main 
* changes:
  Do not install required modules from order-only deps
  Install vintf_fragments/init_rc along with targets
  Install vintf_fragments even when they are shared
 2023-07-13 01:29:47 +00:00
Neha Jain
dffb22be1e Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: I6f426bafe7ad8b1bdc0f30b52ad5126d855f4067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:18:50 +00:00
Neha Jain
3505f2b3a4 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main 2023-07-13 00:24:18 +00:00
Amith Dsouza
526dda4354 Update BUILD_ID 
Master branch has been renamed to main, the build id needs to reflect
this change.

Ignore-AOSP-First: Merge conflict resolutions
Bug: 290400015
Change-Id: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
(cherry picked from commit f0898eae07)
Merged-In: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
 2023-07-12 23:17:55 +00:00
LaMont Jones
3a9ce1d6ea Reduce spaces in module-info.json 
Test: manual, presubmit
Change-Id: I79b94206d636b3ac1f4e88eca514057e4613cbfa
 2023-07-12 23:17:05 +00:00
LaMont Jones
edc62e8ffe use KATI_foreach_sep in module-info.json rules 
Test: manual, presubmit
Change-Id: I0be472cd5c35eeb8f44c7b9184d961d975f6137a
 2023-07-12 23:17:05 +00:00
Neha Jain
9926178660 Revert "Enable CFI for the whole Bluetooth repo and not just system" 
This reverts commit d759b3517a.

Reason for revert: b/289779264

Change-Id: If7bdba6a420f2a310ad86b7b3b44eba5111c5d69
 2023-07-12 23:16:25 +00:00
Amith Dsouza
cab8fc9658 Update BUILD_ID 
Master branch has been renamed to main, the build id needs to reflect
this change.

Ignore-AOSP-First: Merge conflict resolutions
Bug: 290400015
Change-Id: I77884da7587fecae362f9c82fee9f45ff9878cc0
Merged-In: Ieb8b84d340f2308255ad2f23e5ac23635fb680de
Merged-In: Ife1860b73bc83d32a61817d5a9fe25c2deb1e37d
Merged-In: I132433a625848a210603a2e0ad102c12435b3ba4
Merged-In: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
 2023-07-12 23:12:35 +00:00
Tiffany Yang
e728051f12 Merge "Make common signature system property definitions optional" into main am: b8306086d3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: Ieb8b84d340f2308255ad2f23e5ac23635fb680de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:50:28 +00:00
Treehugger Robot
11eef9ca28 Merge "Updating build/config setup to refresh adb path name after a rebuild." into main am: 51ec7172a8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650304

Change-Id: I23957bf5bfe70e8a89e574063a32dba851fc9c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:50:14 +00:00
Tiffany Yang
b8306086d3 Merge "Make common signature system property definitions optional" into main 2023-07-12 18:35:37 +00:00
Treehugger Robot
51ec7172a8 Merge "Updating build/config setup to refresh adb path name after a rebuild." into main 2023-07-12 18:03:51 +00:00
Treehugger Robot
b0cb7ed80a Merge "Remove metalava --no-banner argument" into main am: 12e453bb55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655204

Change-Id: I6048c660df0de9e71bf24a28bc64b1e596166345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:21:23 +00:00
Treehugger Robot
12e453bb55 Merge "Remove metalava --no-banner argument" into main 2023-07-12 17:08:42 +00:00
Bill Yi
034689bc97 [automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: 7a3ff6b30c -s ours 
am skip reason: Merged-In Ib0eee7237c81e43fe55da0c8569752e956891730 with SHA-1 1e6e7a03ab is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2654585

Change-Id: Ida55346f28d26ab18f0b6b1a9c2543c36fcd9d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 14:10:39 +00:00
Bill Yi
d7e8603916 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 49e6f615a6 -s ours 
am skip reason: Merged-In Ib0eee7237c81e43fe55da0c8569752e956891730 with SHA-1 1e6e7a03ab is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2654585

Change-Id: Ie210eaf219d515c6d80d4029a72abe5088e932a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 14:10:25 +00:00
Bill Yi
7a3ff6b30c Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main 2023-07-12 13:38:41 +00:00
Mårten Kongstad
beb2bfded0 Remove metalava --no-banner argument 
metalava no longer prints an ASCII banner, and has removed its
--no-banner argument. Update all call sites accordingly.

Test: presubmit
Bug: 286023667
Change-Id: I0159cad6571c62d672da5aeb3ff422abb97c7ac9
 2023-07-12 14:07:22 +02:00
Roman Kiryanov
f1fc68b180 Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583

Change-Id: Id32c7ef76b06e9bec14cfca3468fccd133a48883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 03:44:38 +00:00
Roman Kiryanov
76d1e380a6 Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main 2023-07-12 02:51:56 +00:00
Cole Faust
735fe49732 Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main am: f5350e965b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654584

Change-Id: I3f2a8a87108d0949f3e9ab8e6d8beb2ea351270a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 02:18:11 +00:00
Android Build Coastguard Worker
453b007c4a Version bump to UP1A.230623.012 [core/build_id.mk] 
Change-Id: I9696910a9e23e3785b091f845dc485fbeecf6b31
 2023-07-12 02:08:20 +00:00
Cole Faust
f5350e965b Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main 2023-07-12 01:26:51 +00:00
Cole Faust
4f3dc8759f Remove BOARD_BPT* variables and the bpt parition table image 
These variables appear to never be set.

Test: Presubmits
Change-Id: If4b89376f73204ad5780dff421f1216da255c3eb
 2023-07-11 16:58:06 -07:00
Treehugger Robot
712109c1f2 Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582

Change-Id: I15c19c87e9fa6dd4bf13a09bf2fee36579d22115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 22:42:26 +00:00
Tiffany Yang
19450e3a0b Make common signature system property definitions optional 
This change allows ARC to define ARC-specific system properties in
Android build without changing these property definitions for other
Android builds. Please see go/arc-sigprop-changes and
go/arc-android-sigprop-sync for additional details.

Bug: 195609932
Test: built bertha_x86_64 with forward declarations
Change-Id: I22bd9d60c2491506fe5c633dbbb9e7516f529b35
 2023-07-11 22:40:19 +00:00
Bill Yi
49e6f615a6 Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE 
Merged-In: Ib0eee7237c81e43fe55da0c8569752e956891730
Merged-In: I1e276e220afe3c0c174a9822b0dce2a923be7b5c
Merged-In: I8c8a4079974ee9e1009483350ab24f790471da9e
Change-Id: I3b31eb8f5c003cb3fc7766e0a8d3378747304943
 2023-07-11 15:35:47 -07:00