Commit graph

31925 commits

Author SHA1 Message Date
Bob Badour
9a76135e44 Merge "Policy change: GPL+CE is permissive." 2022-09-21 23:33:30 +00:00
Alix Espino
358fe88bf1 Merge "Revert "Revert "Default BuildBrokenClangCFlags & BuildBrokenCla..."" 2022-09-21 19:28:11 +00:00
Alix Espino
38e07f1baf Revert "Revert "Default BuildBrokenClangCFlags & BuildBrokenCla..."
Revert^2 "deletion of clang_cflags & clang_asflags from Soong"

e9a6865bc7c51028ed348f6d1c6b975ee8b98837

Test: Treehugger
Change-Id: Ibda75c075d0d88f2c11fd10722c9a74481ee965a
2022-09-21 16:45:00 +00:00
Treehugger Robot
c017139559 Merge "Simplify PLATFORM_BASE_SDK_EXTENSION_VERSION" 2022-09-21 14:09:20 +00:00
Bob Badour
10f5c48b23 Policy change: GPL+CE is permissive.
Bug: 210546823

Test: m cts compliance_checkshare compliancenotice_bom \
    compliancenotice_shippedlibs compliance_listshare \
    compliance_dumpgraph compliance_dumpresolutions htmlnotice \
    compliance_rtrace textnotice xmlnotice

Change-Id: I7da36972ffbb1494e33fd63db8e5ec851d47704c
2022-09-20 21:50:08 -07:00
Victor Hsieh
adc94a151a Remove fs-verity build manifest for vendor/odm/product
The build manifest APKs are recently added because we thought it's nicer
for ART to support beyond system_ext for potential partner
customizations.  Jiyong pointed out that having system server JARs
outside of system and system_ext may be a Treble violation. As a result,
delete some of those files.

Bug: 246000387
Bug: 245957815
Test: m; no longer seeing the files under out/
Change-Id: I4c5b118bd2277b5f3265ac4d3c2343cf929822c5
2022-09-20 14:53:51 -07:00
Edward Liaw
cfb5fb5227 Merge "vts: split kselftests and ltp" 2022-09-20 15:00:58 +00:00
Mårten Kongstad
26ed749f14 Simplify PLATFORM_BASE_SDK_EXTENSION_VERSION
Make PLATFORM_BASE_SDK_EXTENSION_VERSION default to
PLATFORM_SDK_EXTENSION_VERSION: they only need to be different on the
SDK extension branches.

Bug: 247413701
Test: manual install of modules
Change-Id: Iedcd9d6bce4e7346d24146b871d489255a17466c
Merged-In: Iedcd9d6bce4e7346d24146b871d489255a17466c
2022-09-20 15:42:11 +02:00
Treehugger Robot
b2bf9efa32 Merge "Only keep Parcelables if used" 2022-09-20 03:47:31 +00:00
Jared Duke
9d27a928f2 Only keep Parcelables if used
Use `-keepclassmembers` instead of `-keep` for Parcelable types
and their CREATOR members. This allows shrinking of Parcelable types
that aren't referenced while still preserving the necessary CREATOR
member when the classes are kept. This saves ~3MB across various
platform targets.

Bug: 238670321
Test: m + presubmit
Change-Id: I13508073dbc07e28aa93bb6604c8f838bcf72646
2022-09-19 16:26:44 -07:00
Yike
450197e265 Export the target_required property to module-info
Some host test modules such as `python_test_host` use the
`target_required` attribute to declare target dependencies that will
be pushed to device. For example, `aidl_integration_test` references
several target dependencies in the `target_required` attribute since
those output files will be searched and pushed to device at runtime.
Besides, those target dependencies can't be declared in the `data`
attribute instead, since some modules' `data` attribute doesn't
support multi-arch.

So that, this information needs to present in module_info.json and
exported to properly generate Bazel targets that include these
dependencies.

Test: m out/target/product/coral/module-info.json
Bug: 222438068
Change-Id: Ia5ee103be1e7a811e1fdbd2b39252912b1a35c18
2022-09-19 16:42:04 +08:00
Edward Liaw
f867471865 vts: split kselftests and ltp
Split the location of ltp and kselftest files so that they are not
uploaded together if running individually.  Should improve the
performance of kselftest.

Bug: 190800715
Test: atest vts_ltp_test_x86_64
Test: atest vts_linux_kselftest_x86_64
Signed-off-by: Edward Liaw <edliaw@google.com>
Change-Id: I121e6d5bab8edd185c8d73ad7849dff9e8b5f118
2022-09-14 22:59:11 +00:00
Victor Hsieh
89415a8ea9 Reland: Generate fs-verity build manifst APK for other partitions
* Expand the allowlist to include {system_ext, vendor, odm,
   product}/framework/*. Generate .fsv_meta for them.
 * Add BuildManifest.apk for those partitions.
 * Rename PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA to remove "SYSTEM".
 * (new in reland): add apkcerts

Bug: 245957815
Test: m
Test: ls -l $ANDROID_PRODUCT_OUT/*/etc/security/fsverity/BuildManifest.apk
Test: extract assets/build_manifest.pb from apk, inpsect
Test: run asit/ota/signing
Change-Id: I48a5e473aa5eedb24edab54357a9141fc8d78759
2022-09-14 13:19:26 -07:00
Treehugger Robot
1acd7b0438 Merge "Normalize target path for license dependencies." 2022-09-14 18:48:30 +00:00
Treehugger Robot
ebb4bfe9c9 Merge "Put host license metadata in OUT_DIR." 2022-09-14 18:45:51 +00:00
Victor Hsieh
7942ba9a1e Merge "Revert "Generate fs-verity build manifst APK for other partitions"" 2022-09-14 17:50:59 +00:00
Victor Hsieh
8c54b9a54b Revert "Generate fs-verity build manifst APK for other partitions"
Revert submission 2212483-fsverity-manifest-apk-per-partition

Reason for revert: b/246781147
Reverted Changes:
I503672571:Generate fs-verity build manifst APK for other par...
Iebc54ea44:Rename to PRODUCT_FSVERITY_GENERATE_METADATA

Change-Id: I8335b3016a52e474418fb28139c37e35e3468170
2022-09-14 17:27:40 +00:00
Treehugger Robot
e986ab2038 Merge "core: Introduce a pvmfwimage phony target" 2022-09-14 16:51:55 +00:00
Victor Hsieh
494297893f Merge "Generate fs-verity build manifst APK for other partitions" 2022-09-14 15:42:31 +00:00
Treehugger Robot
21554ab3fc Merge "Use same toolchain for RBE as non-RBE" 2022-09-14 01:06:27 +00:00
Victor Hsieh
c80519cc02 Generate fs-verity build manifst APK for other partitions
* Expand the allowlist to include {system_ext, vendor, odm,
   product}/framework/*. Generate .fsv_meta for them.
 * Add BuildManifest.apk for those partitions.
 * Rename PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA to remove "SYSTEM".

Bug: 245957815
Test: m
Test: ls -l $ANDROID_PRODUCT_OUT/*/etc/security/fsverity/BuildManifest.apk
Test: extract assets/build_manifest.pb from apk, inpsect
Change-Id: I503672571741d47ba15add048c0a2f00b6b2a86d
2022-09-13 10:33:31 -07:00
Bob Badour
54b325df14 Normalize target path for license dependencies.
If not normalized the same as declare-license-metadata, two rules get
generated instead of one rule with both license text and deps.

Test: m droid dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo

Change-Id: I3a8f2d3825c8c0183049fa12b14ace9b54066a01
Merged-in: I3a8f2d3825c8c0183049fa12b14ace9b54066a01
2022-09-13 17:21:40 +00:00
Bob Badour
28078172fe Put host license metadata in OUT_DIR.
Test: m droid dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo

Change-Id: I9f5d9c1b70eb8469031d49818c32770dcf34fad2
Merged-in: I9f5d9c1b70eb8469031d49818c32770dcf34fad2
2022-09-13 17:20:20 +00:00
Sorin Basca
0b4d07dc51 Use same toolchain for RBE as non-RBE
Bug: 233029164
Fixes: 246271065
Test: m
Test: EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true m
Test: EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true EXPERIMENTAL_TARGET_JAVA_VERSION_17=true m
Change-Id: I7962068938b16dde52e68abb3baff212deb287be
2022-09-13 14:56:32 +01:00
Treehugger Robot
fef5ca53fa Merge "Revert "Default BuildBrokenClangCFlags & BuildBrokenClangAsFlag..."" 2022-09-12 21:06:12 +00:00
Alix Espino
65f28793ab Revert "Default BuildBrokenClangCFlags & BuildBrokenClangAsFlag..."
Revert "deletion of clang_cflags & clang_asflags from Soong"

Revert submission 2154033-delete clang_cflags clang_asflags

Reason for revert: Broke build on git_tm-dev-plus-aosp and downstream branches

Reverted Changes:
I5c499a37e:Default BuildBrokenClangCFlags &  BuildBrokenClang...
Ic1d90b72d:deletion of clang_cflags & clang_asflags from Soon...

Change-Id: I62480972e5cd6cfe01782068b25893222a8edf79
2022-09-12 18:51:23 +00:00
Bill Yi
f07d5210bc Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" 2022-09-12 17:59:03 +00:00
Alix Espino
2227e61a04 Merge "Default BuildBrokenClangCFlags & BuildBrokenClangAsFlags to empty (false)" 2022-09-12 15:11:20 +00:00
Pierre-Clément Tosi
adbf4daee3 core: Introduce a pvmfwimage phony target
Similarly to other images, introduce a Ximage phony target for building
the pvmfw.img partition image.

Bug: 237371962
Test: m pvmfwimage
Change-Id: I2c17ec93c1e00d4d4df6f5196333ccb73a7c56d2
2022-09-09 19:15:30 +01:00
Pierre-Clément Tosi
cb1d31c43b core: Drop support for BOARD_PREBUILT_PVMFWIMAGE
Remove the variable as it was only used when the prebuilt was
device-specific but pvmfw is now part of AOSP.

Bug: 237371962
Test: m $(realpath --relative-to=. $ANDROID_PRODUCT_OUT/pvmfw.img)
Change-Id: I5b4c1ffd563e3dccf22ee485cb12866355f5bfe0
2022-09-09 19:15:30 +01:00
Yihan Dong
46ee66c098 Merge "Assign each xts test package a copy license metadata" 2022-09-09 00:56:42 +00:00
Bill Yi
f5b2125970 Merge TP1A.220905.004 to aosp-master - DO NOT MERGE
Merged-In: I01b00f2284583d775dc81a91e20410c1d37cc91c
Merged-In: I40dc7e8c108c4d2398c95ddb6f2acafc2362efee
Change-Id: I457aa1030049007f881b31fa84e9d049b27eaed3
2022-09-08 14:27:58 -07:00
Bob Badour
a60beeefc3 Add kernel license text.
Bug: 244521066

Test: m droid dist

Change-Id: Ie7052d97cbe11df8f6a184663903e66ae5cd5752
2022-09-08 10:31:21 -07:00
Yike Zhang
6ba1c7b6c3 Merge "Export Java libraries into module-info" 2022-09-08 10:46:59 +00:00
Yike
82f0a2d751 Export Java libraries into module-info
Some Java modules are defined in Android.mk and they declare
dependencies in eigther LOCAL_STATIC_JAVA_LIBRARIES or
LOCAL_JAVA_LIBRARIES. This information needs to present in
module_info.json and be exported to properly generate Bazel targets
that include these dependencies.

Test: m out/target/product/coral/module-info.json
Bug: 245686435
Change-Id: I77bc8de59f1d46bb098463066e1f52b98ebae955
2022-09-08 07:59:20 +00:00
Treehugger Robot
3cb8cbd4ab Merge "Clear out old license package name, if any." 2022-09-08 00:44:06 +00:00
Bob Badour
b18d9852c8 Clear out old license package name, if any.
Bug: 244574519

Test: m droid dist
Change-Id: I4daa18dc9bdbea30cff3098eca5fc0eb7e5739af
2022-09-07 11:58:53 -07:00
Alix
8b7da27e22 Default BuildBrokenClangCFlags & BuildBrokenClangAsFlags to empty (false)
Set up BUILD_BROKEN flags so partners can bypass errors
from using them

Bug: 226636335
Test: m nothing & treehugger
Change-Id: I5c499a37e206bdf89c5c9f84c6ecfe1cdc9a1803
2022-09-07 15:30:01 +00:00
Yihan Dong
9b75c9ee1a Assign each xts test package a copy license metadata
Use a copy license metadata instead of module_license_metadata to make each xts test package names shown in the final xts notice file.

Test: m gts reportmissinglicenses
Bug: 245474938
Change-Id: Ic5e28763bc4e8448d3e04a80e89db147387164a6
2022-09-07 08:12:37 +00:00
Kiyoung Kim
12d4cbf027 Merge "Replace dependencies from the Makefile to API imported modules" 2022-09-07 00:48:15 +00:00
Cole Faust
b000208877 Rename mkf2fsuserimg.sh and mksquashfsimage.sh
See other cl in this topic for more information.

Bug: 198619163
Test: Presubmits
Change-Id: Ib39e8513a303a12e8bb6464a114ec39aa087d58a
2022-09-05 18:34:56 -07:00
Kiyoung Kim
ad0d7710fe Replace dependencies from the Makefile to API imported modules
There are some module definitions in the Makefile, which needs to be
built with API imported module. This change replaces existing
dependencies from the Makefile, to append suffix on the reference, so it
can be linked to API imported modules.

Bug: 243736650
Test: 'ALLOW_MISSING_DEPENDENCIES=true m halutil' succeeded.
Change-Id: I12baa36e41c0c69228be5f0d08fb4c18eb8a22b1
2022-09-02 13:15:05 +09:00
Florian Mayer
548a2adaf7 Revert "Revert "[make] Add memtag-stack sanitizer, switch to linker-generated notes.""
This reverts commit fe3e537192.

Reason for revert: reland with fix

Change-Id: I199e0e0d0bbb7e74292c6406b7d9fe4db7449d59
2022-08-31 15:27:07 -07:00
Florian Mayer
a2159cd341 Merge "Revert "[make] Add memtag-stack sanitizer, switch to linker-generated notes."" 2022-08-31 18:38:31 +00:00
Florian Mayer
fe3e537192 Revert "[make] Add memtag-stack sanitizer, switch to linker-generated notes."
This reverts commit 1264fcc95a.

Reason for revert: b/244454542

Change-Id: Ic12481fe99d989dabd52431290c78a17cec911ec
2022-08-31 18:37:51 +00:00
Florian Mayer
739ff268d5 Merge "[make] Add memtag-stack sanitizer, switch to linker-generated notes." 2022-08-31 17:54:05 +00:00
Florian Mayer
1264fcc95a [make] Add memtag-stack sanitizer, switch to linker-generated notes.
This change depends on the following toolchain commit:
https://reviews.llvm.org/D118948

Bug: b/174878242

Change-Id: Id67503a5c0983c9ae6fc29f158f4d20bca778e9f
2022-08-29 15:18:05 -07:00
Alix
7a4d539e75 Default BuildBrokenClangProperty to empty (false)
Clang property is deprecated. Set up a BUILD_BROKEN_CLANG_PROPERTY
flag so partners can bypass errors from using clang.

Change-Id: I7ec19c3d11086046031108ecccba5065c38fa338
Test: m nothing & Treehugger
2022-08-26 20:05:42 +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
8dec280fec Merge "Remove VB related code" 2022-08-22 05:25:07 +00:00