Commit Graph

87306 Commits

Author SHA1 Message Date
Treehugger Robot
e80e8b4c5c Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a am: 7613afc5ae am: 1b805513cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I4dad5a6ab484b68f53f1636634a7d98ea6073963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 00:47:10 +00:00
Treehugger Robot
ecc527eb52 Merge "fixup! Allow ota_from_target_file to work entirely on directories" am: d60dbf9773 am: 980458ae17 am: 08fc8461a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2617616

Change-Id: I77011348d3b32a35217b804feb9f4ea38fcffea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 00:46:53 +00:00
Treehugger Robot
1b805513cc Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a am: 7613afc5ae
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I61572beef64f4d4b7be08f392f15dc639708d250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 23:55:10 +00:00
Treehugger Robot
08fc8461a1 Merge "fixup! Allow ota_from_target_file to work entirely on directories" am: d60dbf9773 am: 980458ae17
Original change: https://android-review.googlesource.com/c/platform/build/+/2617616

Change-Id: I08bf30954723b0da0e4171157be8afd0a94e1d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 23:54:54 +00:00
Treehugger Robot
7613afc5ae Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I62ffc6c79b1b472e3a25c3b80f88ef26f3507ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 23:32:09 +00:00
Treehugger Robot
a85c8a863a Merge "BOARD_VNDK_VERSION must be set first pass" 2023-06-08 23:19:34 +00:00
Treehugger Robot
980458ae17 Merge "fixup! Allow ota_from_target_file to work entirely on directories" am: d60dbf9773
Original change: https://android-review.googlesource.com/c/platform/build/+/2617616

Change-Id: I093dccc54174e68f282d9a0f79e6a5ba7f2555ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 23:08:30 +00:00
Treehugger Robot
d60dbf9773 Merge "fixup! Allow ota_from_target_file to work entirely on directories" 2023-06-08 22:20:30 +00:00
Florian Mayer
4c2f81bba9 Merge "Fix bug when memtag_heap in diag but not sanitizers" am: a0c6f31ef7 am: 9fa9bee104 am: ebfb0e4e42
Original change: https://android-review.googlesource.com/c/platform/build/+/2617517

Change-Id: I2bc27623660a5db03fbb96e8adbbb6dcdcb79430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 17:40:11 +00:00
Mårten Kongstad
35f8c6b0a1 Merge changes from topic "aconfig-rename-namespace-to-package" am: ec5da68dbd am: 5c4398ba52 am: 7446093e9b
Original change: https://android-review.googlesource.com/c/platform/build/+/2617393

Change-Id: Ia6cc72cf50115bac6c5816cd786dde5156e7ba43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 17:39:13 +00:00
Florian Mayer
ebfb0e4e42 Merge "Fix bug when memtag_heap in diag but not sanitizers" am: a0c6f31ef7 am: 9fa9bee104
Original change: https://android-review.googlesource.com/c/platform/build/+/2617517

Change-Id: I229cc2681ceca236561a44723d2f5f0d3880717a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 16:53:27 +00:00
Mårten Kongstad
7446093e9b Merge changes from topic "aconfig-rename-namespace-to-package" am: ec5da68dbd am: 5c4398ba52
Original change: https://android-review.googlesource.com/c/platform/build/+/2617393

Change-Id: I811556793b595e1ad11f0741ca4635615fc60ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 16:53:12 +00:00
Florian Mayer
9fa9bee104 Merge "Fix bug when memtag_heap in diag but not sanitizers" am: a0c6f31ef7
Original change: https://android-review.googlesource.com/c/platform/build/+/2617517

Change-Id: I4f3bc6070ac1aeced4abdb523d7438cf00cb68a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 16:14:15 +00:00
Mårten Kongstad
5c4398ba52 Merge changes from topic "aconfig-rename-namespace-to-package" am: ec5da68dbd
Original change: https://android-review.googlesource.com/c/platform/build/+/2617393

Change-Id: Ia24fee81a09ad3dd8bbecabfab38359b1d6cceb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 16:13:24 +00:00
Florian Mayer
a0c6f31ef7 Merge "Fix bug when memtag_heap in diag but not sanitizers" 2023-06-08 16:04:08 +00:00
Mårten Kongstad
ec5da68dbd Merge changes from topic "aconfig-rename-namespace-to-package"
* changes:
  aconfig: include namespace in create-device-config-defaults
  aconfig: improve code diffs in tests
  aconfig: add namespace field to flag_declaration and parsed_flag
  aconfig: allow dots in package fields
  aconfig: rename namespace -> package
2023-06-08 15:12:10 +00:00
Håkan Kvist
b8982fc538 fixup! Allow ota_from_target_file to work entirely on directories
The following log message would always be shown:
WARNING : Cannot find care map file in target_file package

Break out of the care map copying loop as soon a file has been
copied. This ensures that else statement is only executed if no
care map file exists.

Test: Manual. Run ota_from_target_files with target-zip with and
    without care map files.
Change-Id: Ia196aa182ed81f21424317a7005f5634866b4b99
2023-06-08 15:17:57 +02:00
Mårten Kongstad
202102f7be aconfig: include namespace in create-device-config-defaults
Update the output format of create-device-config-defaults to include the
flag's namespace. Also change the delimiters. The new format is

  <namespace>:<package>.<flag-name>=[enabled|disabled|

Bug: 285468565
Test: atest aconfig.test
Change-Id: I9b4ca1611cca8528dc341fc12812b614c86f6c08
2023-06-08 11:28:09 +02:00
Mårten Kongstad
b025507857 aconfig: improve code diffs in tests
Implement a helper function to make it easier for unit tests to diff
(and find the first difference) generated code and expected code.

Bug: 283910447
Test: atest aconfig.test
Change-Id: I460e8fbf05e8f33e8a62ecef67b2d9d77051e876
2023-06-08 11:27:59 +02:00
Mårten Kongstad
066575b95f aconfig: add namespace field to flag_declaration and parsed_flag
Add a new field to the proto messages flag_declaration and parsed_flag.

The new field will be used verbatim as a parameter when calling
DeviceConfig.getBoolean to read the value of a READ_WRITE flag. See the
DeviceConfig API for more info.

Note: not to be confused with the old namespace field, which has been
renamed to package.

Bug: 285211724
Test: atest aconfig.test
Change-Id: I2181be7b5e98fc334e5277fb5f7e386f1fe0b550
2023-06-08 11:27:57 +02:00
Mårten Kongstad
fbd71e2773 aconfig: allow dots in package fields
Allow package fields to include dots.

Update the generated code based on the package name: if the package name
is com.android.example:

  - java: package com.android.example; ...
  - C++: namespace com::android::example { ... }
  - Rust: mod com { mod android { mod example { ... } } }

Also, update examples to use dots in the package fields.

Also, remove unnecessary #include from the auto-generated C++ code: the
header should not include itself.

Bug: 285000854
Test: atest aconfig.test
Change-Id: I8a5352e25c64c34dee0725202a1b7c9957819de8
2023-06-08 11:25:43 +02:00
Nikita Ioffe
ec608119c4 Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" am: fe22cc38da am: b459a56564 am: 124c1536b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2617272

Change-Id: I5161fe7b5e50e45f0d83de154f0ec074fe3618a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:37:56 +00:00
Nikita Ioffe
124c1536b6 Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" am: fe22cc38da am: b459a56564
Original change: https://android-review.googlesource.com/c/platform/build/+/2617272

Change-Id: I1773f5b9f12809b71979249f481ac01c09029a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:50:46 +00:00
Nikita Ioffe
b459a56564 Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" am: fe22cc38da
Original change: https://android-review.googlesource.com/c/platform/build/+/2617272

Change-Id: I472a3ffc66c23ae7b69c5babd6e7ae414c8efffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:07:43 +00:00
Nikita Ioffe
fe22cc38da Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" 2023-06-07 23:36:20 +00:00
Florian Mayer
2a67626055 Fix bug when memtag_heap in diag but not sanitizers
Without this we get:
unsupported argument 'memtag_heap' to option '-fno-sanitize-trap='

Change-Id: Iaeb23d0f4962bb3d788036fadc14b9420221a38e
2023-06-07 16:13:22 -07:00
Devin Moore
d10e1e46b7 Merge "Add new script to analyze static/shared library usage" am: 9bf17fd9dd am: 0d3d349885 am: df53f92fd6
Original change: https://android-review.googlesource.com/c/platform/build/+/2590128

Change-Id: Ic48dc344b6c31db45bd3f72d1d2716c86bbe9921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 22:20:47 +00:00
Devin Moore
df53f92fd6 Merge "Add new script to analyze static/shared library usage" am: 9bf17fd9dd am: 0d3d349885
Original change: https://android-review.googlesource.com/c/platform/build/+/2590128

Change-Id: I0fe55699b4d886b5d15f1d4928c0d19dac8c036a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 21:37:37 +00:00
Steven Moreland
78549acb47 BOARD_VNDK_VERSION must be set first pass
Removing all places that consider that this might not be
set.

Bug: 122954981
Test: build
Change-Id: I62107d041410f4ee1d3652e394ed5e7688c12f25
2023-06-07 20:57:38 +00:00
Devin Moore
0d3d349885 Merge "Add new script to analyze static/shared library usage" am: 9bf17fd9dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2590128

Change-Id: I6fced63d717ea4b5cfff7fff0a4e00e0e3a6deba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:55:17 +00:00
Devin Moore
9bf17fd9dd Merge "Add new script to analyze static/shared library usage" 2023-06-07 20:18:09 +00:00
Treehugger Robot
39113c0584 Merge "Resolve test crash in build/make/tools/compliance." am: 69227ff9ae am: 295a2df7cd am: 9c1ac01d12
Original change: https://android-review.googlesource.com/c/platform/build/+/2619070

Change-Id: I391d522aad017d1d72b5274cd643062d00ef84b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:07:44 +00:00
Treehugger Robot
9c1ac01d12 Merge "Resolve test crash in build/make/tools/compliance." am: 69227ff9ae am: 295a2df7cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2619070

Change-Id: I8bbdcc87fb3c108528227aefda4fed125ca977de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 19:02:20 +00:00
Treehugger Robot
295a2df7cd Merge "Resolve test crash in build/make/tools/compliance." am: 69227ff9ae
Original change: https://android-review.googlesource.com/c/platform/build/+/2619070

Change-Id: I28a58137fe08032a88da937a8bb412eeb0766dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 18:19:52 +00:00
Treehugger Robot
69227ff9ae Merge "Resolve test crash in build/make/tools/compliance." 2023-06-07 17:41:04 +00:00
Nikita Ioffe
cae3ef96c6 Add PRODUCT_AVF_KERNEL_MODULES_ENABLED
This flag controls whether com.android.virt APEX should include an
additional kernel image that supports modules loading.

Bug: 283822676
Bug: 278008256
Test: m
Change-Id: I296c57308e130ee6d5d185dcb4b690d11d2b04ac
2023-06-07 16:33:55 +01:00
Jingwen Chen
376b6b6378 Resolve test crash in build/make/tools/compliance.
Test: m compliance_sbom
Test: go test ./...
Fixes: 285157766
BUG: 282746032
Change-Id: I5cc39f45f7ac3d9c574e2ebaa7fdfda864cb109d
2023-06-07 13:06:13 +00:00
Mårten Kongstad
9fb58965af aconfig: rename namespace -> package
What used to be referred to as a namespace is now called a package.

This CL is a semantic change only.

Bug: 285000854
Test: m nothing
Test: atest aconfig.test
Change-Id: If3fca67c415af75b44f316e16666b97089407069
2023-06-07 14:53:04 +02:00
Treehugger Robot
161b0fab75 Merge changes from topic "aconfig-gen-device-config-files" am: 2bb714ed2b am: 2960cffd7b am: 167b26de05
Original change: https://android-review.googlesource.com/c/platform/build/+/2613433

Change-Id: I22dd2fddc3f0e5ecdc8ac8c8ffb01289d2103f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 11:58:12 +00:00
Treehugger Robot
167b26de05 Merge changes from topic "aconfig-gen-device-config-files" am: 2bb714ed2b am: 2960cffd7b
Original change: https://android-review.googlesource.com/c/platform/build/+/2613433

Change-Id: Ie446bd1e9ec13190c96fcaf2f88d2fb1a304190b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 11:14:24 +00:00
Treehugger Robot
2960cffd7b Merge changes from topic "aconfig-gen-device-config-files" am: 2bb714ed2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2613433

Change-Id: I06f9c490eea3026808db32a80b3f2f2e2909050f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:35:09 +00:00
Treehugger Robot
2bb714ed2b Merge changes from topic "aconfig-gen-device-config-files"
* changes:
  aconfig: add create-device-config-sysprops command
  aconfig: add create-device-config-defaults command
  aconfig: add test utilities
  aconfig: cache.rs: remove unnecessary use statements
  aconfig: give commands ownership of all arguments
2023-06-07 09:50:23 +00:00
Seigo Nonaka
c874637cfa Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51 am: 7017c9a918 am: c6b25f39d9
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: I9364f24d5e246f957506fec88ed6cd699987adf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 04:39:47 +00:00
Seigo Nonaka
c6b25f39d9 Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51 am: 7017c9a918
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: Id58f7a16f1f117e8b0ac53f58132a91d48c65399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 03:32:23 +00:00
Seigo Nonaka
7017c9a918 Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: I0274fbe39d7b6f19c486e22a62f79f203187052a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:52:15 +00:00
Seigo Nonaka
52b65fef51 Merge "Include RobotoFlex into AOSP system image" 2023-06-07 02:14:27 +00:00
Treehugger Robot
54eca11796 Merge "Use python based unzip function for portability" am: 3cda7834aa am: 976a36fb8e am: 60b74959a8
Original change: https://android-review.googlesource.com/c/platform/build/+/2615433

Change-Id: I73b5e85885ee22eaa5eb98623715abcaea17489e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 20:29:33 +00:00
Treehugger Robot
e7ae241f2e Merge "Always set a avb salt for hermetic build" am: fff48d788f am: 4c357806a3 am: f9fb104f9e
Original change: https://android-review.googlesource.com/c/platform/build/+/2613794

Change-Id: Ie529f3b071ba7def82cb963ea1a99eb4ead0f334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 20:27:20 +00:00
Treehugger Robot
60b74959a8 Merge "Use python based unzip function for portability" am: 3cda7834aa am: 976a36fb8e
Original change: https://android-review.googlesource.com/c/platform/build/+/2615433

Change-Id: I5a2eac6217fdc05bcf57fccf399d61c9fc8bf1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 19:41:10 +00:00
Treehugger Robot
f9fb104f9e Merge "Always set a avb salt for hermetic build" am: fff48d788f am: 4c357806a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2613794

Change-Id: I0d1dccbe6576676bf22153ff191c9520ec60c9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 19:40:04 +00:00