StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,354 Commits 1 Branch 0 Tags
adfe90de1f3cfc30dc7255914182cc6b51a09fb6
Commit Graph

80354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhenhuang Wang
adfe90de1f Merge "Export test_options.tags to module-info" am: aa6a6a4f36 
Original change: https://android-review.googlesource.com/c/platform/build/+/2176502

Change-Id: I7492836488072a64968bce504c17be9497d521e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 03:51:42 +00:00
Zhenhuang Wang
aa6a6a4f36 Merge "Export test_options.tags to module-info" 2022-08-24 02:14:02 +00:00
Cole Faust
88419d2c4f Merge "Move the --config flag in the b command earlier" am: f376161d5a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2190222

Change-Id: I40276c5c5abfaca9bd9dd439061c4903c164638f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 01:14:18 +00:00
Frederick Mayle
e5ee7281e9 Merge "envsetup.sh: partly fix syswrite" am: fe9de6798b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2192201

Change-Id: Idda73649f9a832a888c0bc614570ae5c8b6c9720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 01:14:07 +00:00
Cole Faust
f376161d5a Merge "Move the --config flag in the b command earlier" 2022-08-24 00:31:52 +00:00
Frederick Mayle
fe9de6798b Merge "envsetup.sh: partly fix syswrite" 2022-08-24 00:00:32 +00:00
Treehugger Robot
884e8f021b Merge "Move some OTA signing functions to a separte file" am: 9261a656ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2185087

Change-Id: I6467a22132f16205226f06342b449db2ab17222e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 03:04:21 +00:00
Treehugger Robot
9261a656ca Merge "Move some OTA signing functions to a separte file" 2022-08-23 02:25:59 +00:00
Frederick Mayle
e59a87946f envsetup.sh: partly fix syswrite 
The grep doesn't work because "Reboot" is capitalized in the
enable-verity output. Now, syswrite gets farther, but fails before the
final remount.

    $ syswrite
    adbd is already running as root
    Successfully disabled verity
    Enabled overlayfs
    rebooting
    restarting adbd as root
    error: closed

Test: ran syswrite on freshly flashed device
Change-Id: I26aaa6278d76dcab56fd4bde3d70ac7841ae2a3b
 2022-08-22 22:40:23 +00:00
Kelvin Zhang
059bf6e50d Move some OTA signing functions to a separte file 
This makes it easier for other otatools to re-use these logic without
having to pull in lots of dependencies.

Test: th
Bug: 227848550

Change-Id: I81ed01c5cea4b934a074650731b6f89752221de9
 2022-08-22 18:20:14 +00:00
Kelvin Zhang
22fed0105f Merge "set up the salt for partitions without build.prop" am: 15b12d099a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2185143

Change-Id: I5f477ad4f2e3226efff9ecceff90d4ff33620d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:28:47 +00:00
Kelvin Zhang
15b12d099a Merge "set up the salt for partitions without build.prop" 2022-08-22 17:10:12 +00:00
Zhenhuang Wang
415ee12c76 Export test_options.tags to module-info 
The test_options.tags attribute modifies execution behavior when running
tests in ATest Bazel mode. Exporting the value to module-info enables
ATest to add them to the corresponding Bazel target.

Bug: 240928948
Test: manually add `test_options.tags` attribute and run:
    $ refreshmod && \
      cat out/target/product/generic/module-info.json |\
      grep <tags>
Change-Id: I1a70d5c66703ed6a5a250459a80e8bca71d659b6
 2022-08-22 20:59:54 +08:00
Hung-Wei Chen
8ba226a69c Merge "Remove VB related code" am: 8dec280fec 
Original change: https://android-review.googlesource.com/c/platform/build/+/2188695

Change-Id: I3f1389e1d81ffeebd6894be1033ea6c7d9e5a644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 05:48:15 +00:00
Hung-Wei Chen
8dec280fec Merge "Remove VB related code" 2022-08-22 05:25:07 +00:00
Treehugger Robot
4b3d38658a Merge "Add project specific definitions.mk files" am: a0827dcb0e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578

Change-Id: Icdf70fab69033d28b8ddbd98d3e64f8dba64a160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 16:49:14 +00:00
Treehugger Robot
a0827dcb0e Merge "Add project specific definitions.mk files" 2022-08-19 16:06:55 +00:00
Cole Faust
a68f5166fa Move the --config flag in the b command earlier 
Having the --config flag at the end of a bazel command
will make it get passed to the command you're running
with b run instead of bazel.

Fixes: 242759256
Test: Manually
Change-Id: I6d23a0b022fdee5f822a873c1578674d1eab39c0
 2022-08-18 19:41:43 -07:00
Yong Ma
253b106f95 set up the salt for partitions without build.prop 
BUG:242954151

Test: make target-files-package, then check the two sha1 are same:
      1. sha1 of IMAGES/boot.img
      2. expected sha1 of boot in VENDOR/bin/install-recovery.sh

Test: make target-files-package; unzip target_files.zip IMAGES/\*`;
      `zip -d arget_files.zip IMAGES/\*`
      `add_img_to_target_files -a target_files.zip`.
      Verify that the rebuilt images are identical to the deleted ones.

Change-Id: I5906ac1696b6403674fd8330b1569aed53510945
 2022-08-19 02:10:01 +00:00
Greg Kaiser
85518aceab Add project specific definitions.mk files 
Just like we do with build/tasks/*.mk, we also look for project
specific definitions.mk files.

Test: TreeHugger
Bug: 243024627
Change-Id: I7f07546582eb02bba245a1f927a11efc1ddc3c6f
 2022-08-18 12:22:15 -07:00
Steven Moreland
731d649089 Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603

Change-Id: Idbe1186f31bccb590c195ea2525896308fe34173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:25:09 +00:00
Steven Moreland
34570d33f4 Merge "BOARD_VNDK_VERSION always by default" 2022-08-17 18:43:37 +00:00
Alix Espino
4b1f38076d Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723

Change-Id: Ib95ca998b32dbac61f2f7d3814dca22db716a279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 14:21:13 +00:00
Alix Espino
065afd42e8 Merge "Updated Changes.md on deletion of clang property" 2022-08-17 13:42:28 +00:00
hungweichen
f1f5dd3011 Remove VB related code 
Cleaning up the related references of VB in Makefile

Bug: 241044073
Change-Id: I9e0ec9d433f2e76951c4390f716cf77674174930
 2022-08-17 08:52:17 +00:00
Hung-Wei Chen
cb7c04f783 Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952

Change-Id: Ibb11fab6513c726a03e6053f70caac0ddc3b6404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 03:42:07 +00:00
Hung-Wei Chen
a7dfb456a1 Merge changes Ifbcde7da,Icee659ff,I267da2d5 
* changes:
  Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
  Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
  Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
 2022-08-17 03:09:20 +00:00
Treehugger Robot
8c90005ff0 Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775

Change-Id: I46af002f47f8a638cc3e31601de2a922ab2a212d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:49:11 +00:00
Treehugger Robot
2dca04c64d Merge "Suppress R8 warnings for support library annotations" 2022-08-17 00:07:51 +00:00
Automerger Merge Worker
4cb470ffd3 Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master 
* changes:
  [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours
  [automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours
 2022-08-16 23:43:03 +00:00
Xin Li
17296cdcf9 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours 
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history

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

Change-Id: I29a77bd44d43658a4eaaa1fb2f34146d3541c29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:40:11 +00:00
Xin Li
b083f6aac0 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours 
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history

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

Change-Id: I5df27d30d7bedada9707b11a1514872e5f320ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:39:44 +00:00
Xin Li
4ce7e8cc2b [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803 -s ours 
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history

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

Change-Id: If424953ab758e45ae82863842a9746fb0036a494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:37:48 +00:00
Xin Li
fe66e04bd5 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b -s ours 
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08 is already in history

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

Change-Id: Ib2048aa84fc3dc4509cd5ae0c67aa956773040b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:37:18 +00:00
Trevor Radcliffe
7b47295468 Merge "Add note to Changes.md about sysprop changes" am: 061479c528 
Original change: https://android-review.googlesource.com/c/platform/build/+/2185179

Change-Id: I91ae2a3b16cecfde30cf6ce2f3537c775da4e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 22:32:27 +00:00
Xin Li
c0ec8b6803 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:26 +00:00
Trevor Radcliffe
061479c528 Merge "Add note to Changes.md about sysprop changes" 2022-08-16 18:26:32 +00:00
Jared Duke
3ca564b047 Suppress R8 warnings for support library annotations 
Most of these annotations are stripped at dex compile-time, and are not
necessarily present in the generated dex library's classpath. As the
classpath is used to inform R8 about `libraryjars`, this can cause
reference failures during R8 execution when warnings are enabled.

For now, suppress the reference warnings. Unrecognized runtime-visible
annotations will still be kept, and this should unblock efforts to
re-enable R8 warnings for many platform targets. A proper solution will
be to ensure the appropriate annotation libs are fed as `-libraryjars`
to R8.

Bug: 242088131
Test: m + `optimize { ignore_warnings: false }`
Change-Id: Ie92db2a9725ff520b311c6b66a50feae79463925
 2022-08-16 08:49:36 -07:00
Xin Li
789597a58b DO NOT MERGE - Merge Android 13 
Bug: 242648940
Merged-In: Id4aaefbc53b4250b7308701493d151f9408f47f1
Change-Id: Ibbf423b395e45fb552c9d0b993378afac28b4a25
 2022-08-15 21:59:09 -07:00
Treehugger Robot
81994f0b27 Merge "Fix a bug in unsigned OTA generation" am: 2abfe5f3a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2185088

Change-Id: Id6180edf4f57ccabe4ffb072a7eebaa4d6f07ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 02:55:33 +00:00
Treehugger Robot
2abfe5f3a3 Merge "Fix a bug in unsigned OTA generation" 2022-08-16 02:27:34 +00:00
Trevor Radcliffe
c9e72668a0 Add note to Changes.md about sysprop changes 
Since it's no longer allowed to depend directly on a sysprop_library
module from a cc module, we should make this known to other
engineers.

Bug: 226199990
Test: N/A
Change-Id: I3a66984abc3ab7b369870c8041a08d788d66b15f
 2022-08-15 21:46:07 +00:00
Yifan Hong
f19cd6f89f Merge "Support GKI with non-A/B recovery" am: e6f92d1411 
Original change: https://android-review.googlesource.com/c/platform/build/+/2183837

Change-Id: Ieb4ea09d84477f3f14f02a04eac44f3cef7c2ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 21:30:31 +00:00
Yifan Hong
e6f92d1411 Merge "Support GKI with non-A/B recovery" 2022-08-15 20:34:10 +00:00
Alix
a9324f04b8 Updated Changes.md on deletion of clang property 
Bug: 208980553
Test: None, updating documentation
Change-Id: I1acc4a5055cdc6477224fc852cb882dcd5909fa6
 2022-08-15 17:18:06 +00:00
Treehugger Robot
78ca053052 Merge "Add mainline dev certificate dir to config" am: 22907b7777 
Original change: https://android-review.googlesource.com/c/platform/build/+/2185338

Change-Id: I1cfbe21e29145e2e8e0d5d70db921147467b3684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:25:19 +00:00
Treehugger Robot
22907b7777 Merge "Add mainline dev certificate dir to config" 2022-08-15 11:04:14 +00:00
Xin Li
5bd7543b98 DO NOT MERGE - Skip TP1A.220624.021.A1 
Merged-In: I7c8493c902491dd966825f86f50a98e94119501e
Change-Id: I6314a9f5089b194d7c6f8af43b0b792ab7e3c02f
 2022-08-12 14:11:27 -07:00
Kelvin Zhang
b9fdf2dc08 Fix a bug in unsigned OTA generation 
Caller expects output_file to contain the final OTA, so we must copy
data into that location. Modifying loca variables isn't enough.

Test: make ota with --no_signing
Change-Id: Id4aaefbc53b4250b7308701493d151f9408f47f1
 2022-08-12 14:07:31 -07:00
Inseob Kim
7b4d76700d Add mainline dev certificate dir to config 
Bug: 33691272
Test: build
Change-Id: Iea4d96ab9c58a1be6d25aff4c0cf91cfc097470e
 2022-08-12 21:35:45 +09:00