Commit Graph

83344 Commits

Author SHA1 Message Date
Zi Wang
256772f02c Merge "Use OutputFilesProvider on java modules" into main 2024-07-11 01:24:10 +00:00
Aditya Kumar
05f3927c09 Merge "Enable -Wfortify-source" into main 2024-07-10 21:07:26 +00:00
Colin Cross
06c0a03bbe Merge "Support defaults for gensrcs modules" into main 2024-07-10 20:42:54 +00:00
LaMont Jones
1ff11b5159 Merge "Allow n2 as a replacement for ninja in builds" into main 2024-07-10 19:39:23 +00:00
Cole Faust
bee030d36b Allow n2 as a replacement for ninja in builds
If `SOONG_USE_N2=true` is set in the environment, then n2 is used in
place of ninja.  Some ninja features are not available in n2 at this
time, but this enables bringup efforts to happen in parallel.

Bug: 352368206
Test: manual
Change-Id: I8455cb24eb640a4651782ee76e48a7d3a9932b93
2024-07-10 12:35:32 -07:00
Colin Cross
9e47dcc597 Merge "Add oryon to arm64 cpu variants" into main 2024-07-10 19:26:24 +00:00
mrziwang
9f7b9f4a9a Use OutputFilesProvider on java modules
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: I3c9f0b766325dd490bc903dc65259c3953d34606
2024-07-10 12:18:06 -07:00
Roopesh Nataraja
826912e7d4 Add oryon to arm64 cpu variants
Bug: 350058746
Test: builds
Change-Id: I717e035165a7529629061cbfcb076b168dc031d6
2024-07-10 10:24:04 -07:00
Treehugger Robot
9ed8aff5e3 Merge "Support for prebuilt_avb in Soong" into main 2024-07-10 01:54:31 +00:00
Nelson Li
1fb94b2245 Support for prebuilt_avb in Soong
Generally, the `root` directories for `prebuilt_etc` and
`prebuilt_root` are <partitions>. And <partitions> default to false
for InstallInRoot(), they always create a "system" subdirectory.
(See android/paths.go:modulePartition())

However, avb keys like `q-developer-gsi.avbpubkey` are installed by
default in the `avb` subdirectory under the `root directory` of the
<partition>. Therefore, it is necessary to create `prebuilt_avb` in
Soong and force the installation directory to be the `avb` subdirectory
under the `root directory` of the <partition> to meet the requirements.

Bug: 347636127
Test: go test -run TestPrebuiltAvbInstallDirPath
Change-Id: I0ee08492da9a96a567700a7285c527b280dcd5db
2024-07-10 08:43:53 +08:00
Treehugger Robot
60cb3a6dce Merge "Properly package JNI libs in Robo tests" into main 2024-07-09 23:10:30 +00:00
Zi Wang
8dfc2bf163 Merge "Use OutputFilesProvider on Import, AARImport and AndroidAppImport" into main 2024-07-09 21:28:55 +00:00
Zi Wang
e020ba9ce0 Merge "Use OutputFilesProvider on droidstubs" into main 2024-07-09 20:38:54 +00:00
Zi Wang
aee299e9f3 Merge "Remove OutputFiles method from llndk_libraries_txt and sanitizer_libraries_txt" into main 2024-07-09 19:30:39 +00:00
mrziwang
39e68fff47 Use OutputFilesProvider on droidstubs
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: I8ea7463cfc3881d800255aa99147897eeba85b04
2024-07-09 10:57:54 -07:00
mrziwang
68786d81de Use OutputFilesProvider on Import, AARImport and AndroidAppImport
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: I51ccf59f97cb8a790642cb4463c479feaf18058a
2024-07-09 10:41:55 -07:00
Ivan Lozano
dc554b218d Merge "Disable dsymutil usage on Darwin host" into main 2024-07-09 17:35:14 +00:00
LaMont Jones
ad111586a7 Merge "Avoid C++ naming error" into main 2024-07-09 12:49:29 +00:00
Jamie Garside
56f2b7000c Properly package JNI libs in Robo tests
Previously, the jni_libs property was ignored when packaging
robolectric-tests.zip, meaning that tests sometimes couldn't find native
libraries. This change causes any native libs that tests use to be
written alongside the .jar/.apk for Robolectric tests.

99% of this code is just stolen from the Ravenwood tests, as they work
in this area. In short though, any native libs will be built for the
host arch and put in the correct place.

Tests are a little lacking (just testing the new functionality), but I'm
not 100% sure how to test the rest of the Robolectric file.

Bug: 340801983
Test: Manually verified, `go test` in java/
Change-Id: I4ef28b1cbc4675fc329dc8fcab06d055d6538e60
2024-07-09 11:04:29 +00:00
Alyssa Ketpreechasawat
40ca9c933b Merge "Add option to override defaultManifestVersion for app." into main 2024-07-09 09:33:48 +00:00
Alyssa Ketpreechasawat
ee8b44e72a Add option to override defaultManifestVersion for app.
Add an option to override defaultManifestVersion using environment
variable. With this environment variable, the mainline developer will be able to locally customize the app version to higher version and install it to target devices. This is also helpful as a workaround to adjust app/apex version for coverage build (e.g. 3520 to 3500) and allow the installation of app/apex from mainline release branch (e.g. 3508) onto it. This functionality already existed for apex, so we are extending to the app.

Test: 347735412
Bug: 350986287
Bug: 347735412
Test: OVERRIDE_APEX_MANIFEST_DEFAULT_VERSION=990090000 m
Test: adb shell pm list packages --show-versioncode
Change-Id: I58259fe781ca121ba4067f308f1744d80c1c2d48
2024-07-09 09:32:48 +00:00
Treehugger Robot
72be248e10 Merge "cc_cmake_snapshot: drop Modules field" into main 2024-07-09 01:01:44 +00:00
Treehugger Robot
88af056544 Merge "LLNDK libraries can also provide libraries" into main 2024-07-09 00:51:45 +00:00
Nathan Egge
c41630c249 Merge "Add LEX to the list of env variables to unset." into main 2024-07-09 00:15:53 +00:00
Treehugger Robot
8359e6e0c3 Merge "Relax cflag checks for -Xclang and -target*" into main 2024-07-09 00:05:44 +00:00
Nathan Egge
978c934dd9 Add LEX to the list of env variables to unset.
Some linux environments export LEX and this variable must be unset to
 ensure Soong and Make LEX values match.

Change-Id: I8ff2b62a49e0108575ff88b1a88a83d650fc3768
2024-07-08 20:53:46 +00:00
Alyssa Ketpreechasawat
07bceec1fd Merge "Add "strip: {none: true}" for cc_prebuilt_library_shared in sdk snapshot." into main 2024-07-08 20:39:59 +00:00
LaMont Jones
69763a549d Avoid C++ naming error
C++ hates it when there is a field with the same name as a message.

Bug: 351826222
Test: manual, TH
Change-Id: I45355baacce57309c72d1658a095b328841a8d9a
2024-07-08 13:29:49 -07:00
Alan Viverette
ee95ef8e9e Merge "Don't write allowlisted androidx.* libraries to allowed_deps.txt" into main 2024-07-08 18:03:31 +00:00
Liana Kazanova
e680d1b381 Merge "Revert^3 "Make Lint FlaggedApi violations errors"" into main 2024-07-08 17:56:06 +00:00
Colin Cross
7c4a40a2f6 Relax cflag checks for -Xclang and -target*
Allow flags in cflags that start with "-target".

Allow "-Xclang <arg>" in cflags.

Bug: 350058746
Test: builds
Flag: EXEMPT bugfix
Change-Id: I1bf64268047949d747f53d8b111fc26298aee958
2024-07-08 10:50:16 -07:00
Tomasz Wasilczyk
bd83c74485 cc_cmake_snapshot: drop Modules field
Use Modules_host, Modules_system or Modules_vendor instead

Also, fix test by adding libc++demangle to the ignored list.

Bug: 285204695
Test: m binder_sdk
Test: cd build/soong/cc && go test
Change-Id: I6c3eda83584bc910f8b73ffa0f36c3d7fce5f10b
2024-07-08 10:22:24 -07:00
Alan Viverette
1e35232951 Don't write allowlisted androidx.* libraries to allowed_deps.txt
Bug: 333398044
Flag: EXEMPT refactor
Test: croot && packages/modules/common/build/update-apex-allowed-deps.sh
Merged-In: I350ee64bafcd51f69110d880e0de12ae22558fc9
Change-Id: I350ee64bafcd51f69110d880e0de12ae22558fc9
2024-07-08 16:50:45 +00:00
Ivan Lozano
b31d8e8067 Disable dsymutil usage on Darwin host
dsymutil is not available during builds. This is disabled by turning off
split-debuginfo.

Bug: 349612831
Bug: 351760165
Test: Pre/post submit
Change-Id: Idd6f00519e303fe02b35ec8c18682afa799f4df4
2024-07-08 14:56:44 +00:00
ELIYAZ MOMIN
8609726c15 Revert^3 "Make Lint FlaggedApi violations errors"
This reverts commit 373024d012.

Reason for revert: <Potential culprit for b/351156674 and b/351161963 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
>

Change-Id: I54b011d88b521a81918574d174c208fab0047adb
2024-07-08 13:32:42 +00:00
Kiyoung Kim
e8d8a477df LLNDK libraries can also provide libraries
Current linker.config.pb puts libraries into the provide library list
only if the library is stub (or defines stub). However, there are some
LLNDK libraries which does not define stub, thus would be ignored from
the providing libs list. This change adds libraries into the providing
libs list if the library is LLNDK.

Bug: 351227576
Test: linker.config.pb from aosp_cf_system_x86_64 contains LLNDK
libraries as providing libs

Change-Id: I23c02c9d05a5176dab34fe792029d6236790be56
2024-07-08 09:53:11 +09:00
Treehugger Robot
ef2388e99f Merge "Add afind command." into main 2024-07-06 07:08:46 +00:00
Joe Onorato
b3eb9e58e0 Add afind command.
Wrapper for find that skips the .repo, .git and out directories.

Test: manual
Change-Id: I7f3b0f4e228060e2edb932f14d0ec5894a9e1240
2024-07-05 11:21:08 -07:00
Alyssa Ketpreechasawat
59ec0fac0a Add "strip: {none: true}" for cc_prebuilt_library_shared in sdk snapshot.
Prebuilt cannot be stripped in older platform. Therefore, we set
stripper to none to skip the call to strip.sh.

Bug: 350050115
Test: SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE=Tiramisu m art-module-sdk
Test: Create module sdk from this and drop into tm-dev
Change-Id: I911ce24ca18435f95395c43fc5e73110a50b3067
2024-07-05 16:12:17 +00:00
Treehugger Robot
2fb3964e21 Merge "Define otacerts_zip module in soong" into main 2024-07-04 23:00:05 +00:00
Mårten Kongstad
95561d23b3 Merge "Revert^2 "Make Lint FlaggedApi violations errors"" into main 2024-07-04 13:02:19 +00:00
Mårten Kongstad
373024d012 Revert^2 "Make Lint FlaggedApi violations errors"
This reverts commit 38813efb53.

Reason for revert: all known Lint violations baselined.

Change-Id: Ic6bf778df563ef6a592427442a9cc6a3d9ef8b51
2024-07-04 11:39:55 +00:00
Justin Yun
635e788274 Define otacerts_zip module in soong
To move the otacerts module from make to soong, define a new module
type otacerts_zip module. This module collects key files from
PRODUCT_DEFAULT_DEV_CERTIFICATE and PRODUCT_EXTRA_OTA_KEYS
(PRODUCT_EXTRA_RECOVERY_KEYS for recovery) to install the zipped file
in etc.
otacerts_zip module is available to recovery to install the
otacerts.zip file in the recovery partition.

Bug: 335364209
Test: Define "PRODUCT_DEFAULT_DEV_CERTIFICATE := \
                 build/make/target/product/security/testkey" and
      m aosp_cf_system_x86_64
Change-Id: Ib5b671e9caef0403c6d9d69bfab29be248d7086c
2024-07-04 15:56:36 +09:00
Treehugger Robot
b6c0bd1ace Merge "Fix build error for gen_build_prop.py" into main 2024-07-04 00:33:15 +00:00
Priyanka Advani
58d4898b12 Merge "Revert "Make Lint FlaggedApi violations errors"" into main 2024-07-04 00:17:28 +00:00
Priyanka Advani
38813efb53 Revert "Make Lint FlaggedApi violations errors"
Revert submission 3156916-flagged-api-lint-baseline

Reason for revert: Droidmonitor created revert due to build breakages in b/350976857.

Reverted changes: /q/submissionid:3156916-flagged-api-lint-baseline

Change-Id: I625226c2d2a4b68094a6566d7a9459bd36d935c5
2024-07-03 19:53:55 +00:00
Treehugger Robot
b48f55eed5 Merge "Install dexpreopt artifacts of SpeedApps in system_other" into main 2024-07-03 16:13:34 +00:00
Treehugger Robot
013e72c8e5 Merge "Make Lint FlaggedApi violations errors" into main 2024-07-03 15:38:18 +00:00
Treehugger Robot
87244ee93e Merge "Generate file list installed from a filesystem" into main 2024-07-03 04:48:21 +00:00
Justin Yun
ac4a727793 Fix build error for gen_build_prop.py
Provided undefined constants and imports.

Bug: 346214958
Test: Define "PRODUCT_DEFAULT_DEV_CERTIFICATE := \
                 build/make/target/product/security/testkey" and
      m aosp_cf_system_x86_64
Change-Id: Ic65f059fe87a997a9be695ebf13dfde2d2c6f82c
2024-07-03 13:34:29 +09:00