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

34562 Commits

Author SHA1 Message Date
David Fu
f7cccf6722 Merge "Added haiku-presubmit phony rule to makefile" into main am: 4c1bc5b9b7 am: efaab29fe3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652359

Change-Id: Ia12b24f295b8af654752f6ee0244fd3d9e28266a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 18:28:22 +00:00
David Fu
efaab29fe3 Merge "Added haiku-presubmit phony rule to makefile" into main am: 4c1bc5b9b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2652359

Change-Id: Id57d4bd4de3363e42637122c3d05900f28639a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 17:41:42 +00:00
David Fu
4c1bc5b9b7 Merge "Added haiku-presubmit phony rule to makefile" into main 2023-07-20 17:00:05 +00:00
Daniel Zheng
cfa62e366c Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559f9 am: 2ad23ca508 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646274

Change-Id: I0c900faed64028540fede0b2c1f963ab9ca88ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 17:41:33 +00:00
Daniel Zheng
2ad23ca508 Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559f9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646274

Change-Id: Icaf55a978175f82f98684ee929a2153e9cc8e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 16:39:24 +00:00
Daniel Zheng
0ee11559f9 Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main 2023-07-19 15:57:45 +00:00
Treehugger Robot
888580e57d Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b286e am: 87f21f19f6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2648185

Change-Id: I24a52822c4ace63dc4a9795c4bdc5a2247cc050f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 06:12:41 +00:00
Treehugger Robot
87f21f19f6 Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b286e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2648185

Change-Id: I65c40754728abf4dd91dfe0cb530011c4944dde7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 05:30:53 +00:00
Treehugger Robot
3ca44b286e Merge "Add a new variable for deprecating VNDK" into main 2023-07-19 04:44:51 +00:00
Treehugger Robot
ba0228c9c0 Merge "Disable copying images for target_files.zip" into main am: f1f3e38b64 am: ddd017226a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2658156

Change-Id: Ibf02cdf1da9866a4a159e3a0bf05ad5a204973f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 01:05:04 +00:00
Treehugger Robot
ddd017226a Merge "Disable copying images for target_files.zip" into main am: f1f3e38b64 
Original change: https://android-review.googlesource.com/c/platform/build/+/2658156

Change-Id: I39391decb1dfa02255847222facfce46d2edf798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 00:18:05 +00:00
Justin Yun
22ce9479be Disable copying images for target_files.zip 
For the OTA build, target_files.zip requires setting fixed timestamp
for images. However, it caused regression on 'adb sync'.
Restoring image build process for target_files.zip instead of copying
them from the PRODUCT_OUT, only the images in target_files.zip set the
fixed timestamp.
By setting COPY_IMAGES_FOR_TARGET_FILES_ZIP flag, we still may copy
the images for target_files.zip for future use.

Bug: 287534409
Test: m; flashall; adb sync
Test: m dist; flash images from target_files.zip and check the timestamp
Change-Id: I4135eb721c33581f191621847e6595833263d707
 2023-07-17 07:46:48 +09:00
Jiakai Zhang
9395ae7176 Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main am: f2cc1324c1 am: 735385ff9f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655206

Change-Id: Ic7e73ee2612434022836142abc4d7dc0663ce5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 13:56:41 +00:00
Jiakai Zhang
735385ff9f Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main am: f2cc1324c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655206

Change-Id: Iabcbe7aabbd4522dccad833ed5c059a037617b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 12:26:03 +00:00
Jiakai Zhang
f2cc1324c1 Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main 
* changes:
  Add a Make variable to determine ART boot image jars for testing.
  Add a Make variable that overrides configured jar locations.
 2023-07-14 11:47:59 +00:00
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
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
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
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
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