StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,647 Commits 1 Branch 0 Tags
ae970ba4108e133738c11aa5ad73f6fa86d3a2e8
Commit Graph

34542 Commits

Author SHA1 Message Date
LaMont Jones
53ddfdb0f2 Merge changes from topic "mod-info-foreach" into main am: e75c063d1f am: 4bbf7a86af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522

Change-Id: If6d6a995bcb3496f65b0378e98afe2ecaed34758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 01:22:53 +00:00
Treehugger Robot
89537698fc [conflict] Merge "Update BUILD_ID" into aosp-main-future am: 33e1da8114 am: fbd3468d1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24045736

Change-Id: I07e0288cd11ad3500746f0ffdf620a5e4b93c0b4
Merged-In: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 23:14:58 +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
fbd3468d1e Merge "Update BUILD_ID" into aosp-main-future am: 33e1da8114 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24045736

Change-Id: I5a21ee61ed1ef3fc426b6fea649362356026e9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 19:06:39 +00:00
Treehugger Robot
33e1da8114 Merge "Update BUILD_ID" into aosp-main-future 2023-07-13 19:03:54 +00:00
Bassem Khalife
b25cf7d09e Merge "Update Security String to 2023-09-05" into udc-dev am: 4aa1623c9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24026314

Change-Id: Iee7192d2c7703f168e2bf296f01d434df828e003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 17:33:43 +00:00
Treehugger Robot
442e8719b9 Merge "Update BUILD_ID" into main 2023-07-13 17:02:31 +00:00
Bassem Khalife
4aa1623c9b Merge "Update Security String to 2023-09-05" into udc-dev 2023-07-13 16:43:43 +00:00
Jooyung Han
9894a2b449 Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e am: 18485d30c4 am: 11f325c716 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667

Change-Id: I157fc86cdf370391f84d3bb8f32bc5d4ab95e675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:49:48 +00:00
Jooyung Han
11f325c716 Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e am: 18485d30c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667

Change-Id: I79dc3b44c7d7281697e3b363ec96a0473e11364a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:05:36 +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
Wei Li
3d92e99aed Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev 
* changes:
  Support SBOM generation of m build unbundled APEXs.
  Include static libraries information in Android SBOM.
 2023-07-12 23:41:13 +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
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
Bassem Khalife
838fbc4dd7 Update Security String to 2023-09-05 
Bug: 289414927
Ignore-AOSP-First: Future release prep (Internal first)

Change-Id: Ia5208702fc02d0e1ab53d1affc664363fba74a67
 2023-07-12 22:48:52 +00:00
Tiffany Yang
20dbd142b6 Merge "Make common signature system property definitions optional" into main am: b8306086d3 am: e728051f12 am: 13ba580f9f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: I5014024fae5b0c896aa0898d2c71faea453677e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 20:23:18 +00:00
Tiffany Yang
13ba580f9f Merge "Make common signature system property definitions optional" into main am: b8306086d3 am: e728051f12 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609473

Change-Id: Ife1860b73bc83d32a61817d5a9fe25c2deb1e37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 19:40:41 +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
Tiffany Yang
b8306086d3 Merge "Make common signature system property definitions optional" into main 2023-07-12 18:35:37 +00:00
Treehugger Robot
59349a5ad3 Merge "Remove metalava --no-banner argument" into main am: 12e453bb55 am: b0cb7ed80a am: e726af3cab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655204

Change-Id: Id6a6efe50dfb7436fc4ed4bee46b386b01f5afa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:26:13 +00:00
Colin Cross
e0d8de9068 Dist kernel_version.txt 
Fixes: 290361803
Test: treehugger
(cherry picked from https://android-review.googlesource.com/q/commit:27f36d1bc80a4092f157845f86faf02d36517c18)
Merged-In: I146817c9cf256f086404c880a0215cb8e688c544
Change-Id: I146817c9cf256f086404c880a0215cb8e688c544
 2023-07-12 18:19:56 +00:00
Treehugger Robot
e726af3cab Merge "Remove metalava --no-banner argument" into main am: 12e453bb55 am: b0cb7ed80a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655204

Change-Id: I53a6846f51e47e4fb30232a1b07674249b443de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:43:50 +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
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
Cole Faust
ef48661524 Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main am: f5350e965b am: 735fe49732 am: 9aa95a1fb0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654584

Change-Id: Idf53f15a27c874b1a3f628a6213da5f37a15ebbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 03:41:38 +00:00
Cole Faust
9aa95a1fb0 Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main am: f5350e965b am: 735fe49732 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654584

Change-Id: I2846618a70f12850ced045002b9e19bca1ef1553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 03:02:22 +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
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
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
Wei Li
9b22820150 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)
Merged-In: I7abadbc083ef66b0e8ace28de69a1a219670ec37
Change-Id: I7abadbc083ef66b0e8ace28de69a1a219670ec37
 2023-07-11 22:20:25 +00:00
Wei Li
ccf5023a1e 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)
Merged-In: Ie2365d79ba24910b7ace132b578589be10a17d78
Change-Id: Ie2365d79ba24910b7ace132b578589be10a17d78
 2023-07-11 22:20:13 +00:00
Colin Cross
85270110d8 Merge "Dist kernel_version.txt" into main am: b177e347aa am: 7ea1cb5152 am: 107d88e6ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652360

Change-Id: Ic1f8f33fdda0ba6634b93fe6451d08cbc6c713bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 18:26:06 +00:00
Elliott Hughes
7a75419a51 Merge "Switch from minigzip to gzip." into main am: c1577ff58b am: f94ff9146d am: d9cdcba928 
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: I9e0fe8aff864b5423a0a9c066838e76c1cea98a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 18:25:43 +00:00
Colin Cross
107d88e6ab Merge "Dist kernel_version.txt" into main am: b177e347aa am: 7ea1cb5152 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652360

Change-Id: Ia257da8668cb11715de39c4b73ed1349b131f278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 17:31:53 +00:00
Elliott Hughes
d9cdcba928 Merge "Switch from minigzip to gzip." into main am: c1577ff58b am: f94ff9146d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: Ieb4de103e7be0dd217c22d5ff7a44ee4041c834c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 17:31:17 +00:00
Colin Cross
7ea1cb5152 Merge "Dist kernel_version.txt" into main am: b177e347aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652360

Change-Id: I8d952d05b10390796d73b69681d99e5e4d85be8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 16:42:58 +00:00
Elliott Hughes
f94ff9146d Merge "Switch from minigzip to gzip." into main am: c1577ff58b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: Ib6eeccad98122d2ad26a89fe44897ecabc610e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 16:42:34 +00:00
Colin Cross
b177e347aa Merge "Dist kernel_version.txt" into main 2023-07-11 16:25:13 +00:00
Elliott Hughes
c1577ff58b Merge "Switch from minigzip to gzip." into main 2023-07-11 15:52:27 +00:00
Jooyung Han
2ecded04a6 Do not install required modules from order-only deps 
When a vintf_fragments or init_rc file is shared by two modules,
unintended modules are installed due to the shared file.

This was caused by add-all-target-to-target-required-modules-deps.

With the following definitions:

cc_binary {
  name: "foo",
  vintf_fragments: ["shared.xml"],
  required: ["foo-req"],
}

cc_binary {
  name: "bar",
  vintf_fragments: ["shared.xml"],
}

When installing "bar", surprisingly, "foo-req" is installed due to the
link between "shared.xml" and "foo-req" added by
add-all-target-to-target-required-modules-deps.

To fix that, in this change, vintf_fragments and init_rc files are
marked as "order-only" deps. In
add-all-target-to-target-required-modules-deps, order-only deps are not
used to add links to "required" modules.

Now, with the same definitions, installing "bar" won't installs
"foo-req".

Bug: 198818343
Test: (see above)
Change-Id: I16be0dcb84564c559cb2f4223e2812321ee14729
 2023-07-11 22:26:15 +09:00
Jooyung Han
b14b4cd6a5 Install vintf_fragments/init_rc along with targets 
Even though `m foo` installs vintf_fragments and init_rc files. There
was no direct dependency from the installed target to
vintf_fragments/init_rc files.

With the following:

cc_binary {
  name: "foo",
  vintf_fragments: ["foo.xml"]
}

`m out/target/product/vsoc_x86_64/system/bin/foo` didn't install
foo.xml.

This change adds the order-only deps from the target install to
vintf_fragments/init_fc files.

Bug: 198818343
Test: (see above)
Change-Id: I4656d43d15407a85fea7c95b22e4bbe19fb86aee
 2023-07-11 22:26:12 +09:00
Treehugger Robot
1610101e46 Merge "core: Add script to check for possible shared library duplication" into main am: ebd2d0043b am: 4204e8b135 am: 7fab985e23 
Original change: https://android-review.googlesource.com/c/platform/build/+/2467321

Change-Id: I0595e0958dc47578ae35908fec1a1e01820f19f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 07:53:40 +00:00