Commit Graph

80478 Commits

Author SHA1 Message Date
Colin Cross
1778342af2 Add sync to m help
Add sync to the list of targets documented by m help.

Change-Id: Id6cdb9d6e332b85068d895120aa7d344cf287f37
2022-09-22 02:26:10 +00:00
Bob Badour
9a76135e44 Merge "Policy change: GPL+CE is permissive." 2022-09-21 23:33:30 +00:00
Treehugger Robot
ae0ba167d4 Merge "Finalization script, step 1." 2022-09-21 22:10:17 +00:00
Alix Espino
358fe88bf1 Merge "Revert "Revert "Default BuildBrokenClangCFlags & BuildBrokenCla..."" 2022-09-21 19:28:11 +00:00
Treehugger Robot
6829da941d Merge "temporarily disable roboleaf_tests.sh" 2022-09-21 17:41:19 +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
Sam Delmerico
3e5fcd8a61 temporarily disable roboleaf_tests.sh
When I enabled the envsetup_tests target on CI, this script was failing.
Rather than break the build again by enabling CI on a potentially
failing script, let's just disable this for now, enable the CI target,
and then this script can be enabled and tested in presubmits before
submitting.

Bug: 244771601
Test: build/make/tests/roboleaf_tests.sh
Change-Id: I7c3469b49258e37c0ff9b49dd8805031216a7570
2022-09-21 10:56:49 -04: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
Alex Buynytskyy
0842d212b9 Finalization script, step 1.
- cleanup
- revert previous commits
- vndk + resources + sdk finalization + test
- create cls
- send to Gerrit
- (tbd) submit

Bug: 243966946
Test: run scripts locally

Change-Id: Icd4f07c64c2ef93831dc5fc7de2d5e832604e88d
2022-09-20 20:31:04 -07:00
Treehugger Robot
0da3dc63af Merge "Remove fs-verity build manifest for vendor/odm/product" 2022-09-21 00:33:52 +00: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
Treehugger Robot
994c4a2583 Merge "[Bugfix] Fix compilation problems" 2022-09-20 19:28:17 +00: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
Yike Zhang
d8b3c2901d Merge "Export the target_required property to module-info" 2022-09-20 00:34:28 +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
jiangxu5
2d8a4cbf84 [Bugfix] Fix compilation problems
vbmeta_system does not need to be rebuilt with vendor side

Signed-off-by: jiangxu5 <jiangxu5@xiaomi.com>
Change-Id: Ieb2076055aa3342a6071ec2ed5c976e22f59acd1
2022-09-18 12:38:51 +00:00
Victor Hsieh
90195c958d Merge "Reland: Generate fs-verity build manifst APK for other partitions" 2022-09-15 21:49:43 +00:00
Treehugger Robot
e98964339e Merge "Fix incorrect input for path and entry" 2022-09-15 01:54:29 +00: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
Treehugger Robot
ef425ee163 Merge "Increase javac heap to 4096M" 2022-09-14 17:55: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
Sorin Basca
05085835ea Increase javac heap to 4096M
Bug: 246361502
Test: TH
Change-Id: Ic2d6f991ad65d13a83319af07944069d1f511783
2022-09-14 11:33:22 +01:00
Zhou Xuezan
d0d49f5b42 Fix incorrect input for path and entry
Change-Id: Idff184d8fb8b328f42fc4f96cdde2663f6581864
2022-09-14 16:26:55 +08: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
Sam Delmerico
a036fdb1f0 Merge "add test suite for b command" 2022-09-13 13:23:40 +00:00
Jingwen Chen
57b1cc4589 Merge "Fix b with zsh (again), remove shwordsplit use." 2022-09-13 00:37:12 +00: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
Jingwen Chen
6f4963b99f Fix b with zsh (again), remove shwordsplit use.
Context: zsh doesn't do string splitting like bash, so it passes the
post-processed bazel args to bazel as a single arg. So this CL adds a
conditional to split explicitly with zsh using the {=<arg>} flag
syntax.

Reference: https://zsh.sourceforge.io/FAQ/zshfaq03.html (for shwordsplit)
Reference: https://zsh.sourceforge.io/Guide/zshguide05.html (Section 5.4.4)

For bash, this uses array[@] to split the list into separate
shell words.

Test: zsh; source build/envsetup.sh && b test
//system/logging/logd:logd-unit-tests --config=linux_x86_64
Test: bash; source build/envsetup.sh && b test
//system/logging/logd:logd-unit-tests --config=linux_x86_64

Change-Id: Id92462661bbe1799a6de8dd3393799d91e3044e8
2022-09-12 14:31:37 +00:00
Treehugger Robot
4f9a6abf59 Merge "move lunch specific tests to separate file" 2022-09-10 00:09:27 +00:00
Sam Delmerico
4ee8508854 add test suite for b command
Ensuring that the b command works properly cross-terminal has been a
little tricky, so some test commands would help in testing changes.

Test: build/make/tests/roboleaf_tests.sh
Change-Id: Iecff678fbba6e81c211aadd3665839c1c21acc8c
2022-09-09 17:29:35 -04:00
Sam Delmerico
4f4d069efa move lunch specific tests to separate file
This is in preparation to add some more tests to this file.

Test: build/make/tests/envsetup_tests.sh
Change-Id: Ic32115d2a6073f3265b84846f489f3acb8bfad88
2022-09-09 17:27:22 -04:00
Treehugger Robot
eac1c8c616 Merge "core: Drop support for BOARD_PREBUILT_PVMFWIMAGE" 2022-09-09 20:52:07 +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