Commit Graph

82773 Commits

Author SHA1 Message Date
Cole Faust
ccaf26ae32 Merge "Move the --config flag in the b command earlier" am: f376161d5a am: 88419d2c4f
Original change: https://android-review.googlesource.com/c/platform/build/+/2190222

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

Change-Id: Iabc5386d3969b010859eac20a4b630e638319250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 01:42:47 +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
Melisa Carranza Zuniga
7ef1379927 Adding output_path arg to sign_sepolicy_path call
Bug: b/217570541
Test: mma and call sign_apex or sign_target_files_apks
Change-Id: I0fcab6e8a40739406a158a687acea448fd205f5d
2022-08-23 19:09:12 +02:00
Treehugger Robot
c1fc1539f5 Merge "Move some OTA signing functions to a separte file" am: 9261a656ca am: 884e8f021b am: 2b85d0bd06 am: fd2501631d am: 738c75e791
Original change: https://android-review.googlesource.com/c/platform/build/+/2185087

Change-Id: I50ad31e38e4d515db4a25874971942106de7b8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 05:15:30 +00:00
Treehugger Robot
738c75e791 Merge "Move some OTA signing functions to a separte file" am: 9261a656ca am: 884e8f021b am: 2b85d0bd06 am: fd2501631d
Original change: https://android-review.googlesource.com/c/platform/build/+/2185087

Change-Id: Ie66c9a03394cf61c7054b60fc76f0d310f31237e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 04:44:28 +00:00
Treehugger Robot
fd2501631d Merge "Move some OTA signing functions to a separte file" am: 9261a656ca am: 884e8f021b am: 2b85d0bd06
Original change: https://android-review.googlesource.com/c/platform/build/+/2185087

Change-Id: Id43acf59e89ea012b7b53f755acd67931482efe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 04:17:59 +00:00
Treehugger Robot
2b85d0bd06 Merge "Move some OTA signing functions to a separte file" am: 9261a656ca am: 884e8f021b
Original change: https://android-review.googlesource.com/c/platform/build/+/2185087

Change-Id: I76ef41c0c620adb6b8e0775f3e257e86d07b73c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 03:59:41 +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
Steve Berbary
87cae0791c Update Security String to 2022-10-01
Bug: 242323332
Change-Id: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db
Merged-In: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db
2022-08-22 20:30:22 +00:00
Kelvin Zhang
6a38629092 Merge "set up the salt for partitions without build.prop" am: 15b12d099a am: 22fed0105f am: 8101dbbe96 am: 3359f8b4a1 am: 994152da51
Original change: https://android-review.googlesource.com/c/platform/build/+/2185143

Change-Id: Ia245be8a66655d16336d9554a4746e7638b5dfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 19:28:01 +00:00
Kelvin Zhang
994152da51 Merge "set up the salt for partitions without build.prop" am: 15b12d099a am: 22fed0105f am: 8101dbbe96 am: 3359f8b4a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2185143

Change-Id: Ic9957426cc7c332dc6b95abb402f05066560b551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 18:40:04 +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
3359f8b4a1 Merge "set up the salt for partitions without build.prop" am: 15b12d099a am: 22fed0105f am: 8101dbbe96
Original change: https://android-review.googlesource.com/c/platform/build/+/2185143

Change-Id: Ie5bd15427bf2fb799aea2b1ae7e234f08b8adb06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 18:14:30 +00:00
Kelvin Zhang
8101dbbe96 Merge "set up the salt for partitions without build.prop" am: 15b12d099a am: 22fed0105f
Original change: https://android-review.googlesource.com/c/platform/build/+/2185143

Change-Id: Iba74409a55a1b3cb274e8c0f1428a3889001fe42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 17:48:41 +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
ed1d0bfa51 Merge "Remove VB related code" am: 8dec280fec am: 8ba226a69c am: 665bfe387b am: 2e95391a95 am: ebe1f51b69
Original change: https://android-review.googlesource.com/c/platform/build/+/2188695

Change-Id: I26d915ba99f6ceecbb0603f86e0c7b26835d58b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 07:29:36 +00:00
Hung-Wei Chen
ebe1f51b69 Merge "Remove VB related code" am: 8dec280fec am: 8ba226a69c am: 665bfe387b am: 2e95391a95
Original change: https://android-review.googlesource.com/c/platform/build/+/2188695

Change-Id: Ib6ff456340977933e16ff4eb922fba680e55d811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 07:00:25 +00:00
Hung-Wei Chen
2e95391a95 Merge "Remove VB related code" am: 8dec280fec am: 8ba226a69c am: 665bfe387b
Original change: https://android-review.googlesource.com/c/platform/build/+/2188695

Change-Id: Ieccd709146388aba7206412e27903bf3526181cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 06:34:33 +00:00
Hung-Wei Chen
665bfe387b Merge "Remove VB related code" am: 8dec280fec am: 8ba226a69c
Original change: https://android-review.googlesource.com/c/platform/build/+/2188695

Change-Id: I13a370191981ec768ae6c8d73afa5ab5d5554fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 06:06:38 +00: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
f25f0852a6 Merge "Add project specific definitions.mk files" am: a0827dcb0e am: 4b3d38658a am: e59fce2005 am: 251b5098c6 am: 93533f0374
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578

Change-Id: Ia5f2e6aa6aedb98baa25c14e42206202fb618942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 18:38:06 +00:00
Treehugger Robot
93533f0374 Merge "Add project specific definitions.mk files" am: a0827dcb0e am: 4b3d38658a am: e59fce2005 am: 251b5098c6
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578

Change-Id: I35817a3fe01af723708bfbd2fb096fd10b91d01a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 18:10:05 +00:00
Treehugger Robot
251b5098c6 Merge "Add project specific definitions.mk files" am: a0827dcb0e am: 4b3d38658a am: e59fce2005
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578

Change-Id: I1c82351d8cf3815e204a9bb40e0475c3b5ad70ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 17:51:00 +00:00
Treehugger Robot
e59fce2005 Merge "Add project specific definitions.mk files" am: a0827dcb0e am: 4b3d38658a
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578

Change-Id: I9385e4a44777e45163cb52626effc2d09d92c618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 17:30:13 +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
hungweichen
49447913f6 Remove unused args from common.py
We are removing support of VB from release tools. This change aims to
remove args that no longer be used.

Bug: 242672222
Test: atest under build/make
Change-Id: I347447ebf1e589f8d3c4c8254f2940911c0be7f1
2022-08-19 06:04:06 +00:00
hungweichen
17c064d1e2 Clean up unused code for VB in verity_utils.py
We are removeing support of VB from release tools. This change aims to
remove code that are unreachable after removeing Version1ImageBuilder.

Bug: 242672222
Test: atest under build/make
Change-Id: Iaae39e4c49045f6c34351140cd43087dabd63e9c
2022-08-19 06:00:30 +00:00
hungweichen
65ba375a8e Remove verity related props from build_image.py
We are removing VB related functionalities from release tools. This
change remove the verity related props in build_image.py, and also
remove VB1.0 bootimage builder, which will be unreachable without these
props.

Bug: 241044073
Test: atest under build/make
Change-Id: Ib3f1c100c2c6c9e63a64f49269619b76074a27fd
2022-08-19 05:57:56 +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
Josh Gao
8d0b576af6 Set default recovery USB vendor/product IDs.
Add system properties to let vendors customize the recovery/fastbootd
USB IDs.

Test: `adb reboot fastboot && fastboot wait-for-device && lsusb -d 18d1:`
Change-Id: I70881f27d579dd54371f59a6a76f9b1f80ce9b47
2022-08-17 15:00:48 -07:00
Steven Moreland
410e5f35d1 Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4 am: 731d649089 am: 5e882374d2 am: 9f9829dad8 am: b6ca460eb9
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603

Change-Id: I801167e01f88a03868be2ece295f98189d8b1bea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 20:55:34 +00:00
Steven Moreland
b6ca460eb9 Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4 am: 731d649089 am: 5e882374d2 am: 9f9829dad8
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603

Change-Id: Ica8f3e1f373e4fab8e466d5cb4bb81218930ecbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 20:36:59 +00:00
Steven Moreland
9f9829dad8 Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4 am: 731d649089 am: 5e882374d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603

Change-Id: I66a33fa2839d5eaa75d7a2b9b8b0cb4cad917f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 20:11:14 +00:00
Steven Moreland
5e882374d2 Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4 am: 731d649089
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603

Change-Id: I3449c41d09be835526094ed0d0f3fbff335ad1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 19:45:03 +00: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
5b1e76cf63 Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8 am: 4b1f38076d am: fda78d0287 am: 1ed186aa16 am: 045525b3b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723

Change-Id: I08932e6acc727bed521bfa43717b573050b28b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 16:55:22 +00:00
Hung-Wei Chen
d194b86fd1 Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1 am: cb7c04f783 am: f44646461d am: 653425238b am: 1a2b5f7b91
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952

Change-Id: I9be6e54fdcfb684dc11585f4aecc1aff67feeedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 16:50:16 +00:00