Commit Graph

83514 Commits

Author SHA1 Message Date
Joe Onorato
88042fa0ad fix soongdbg missing args
Change-Id: I06226f2aee0e7f73e0fb55bd90a31577e6cf0092
2024-07-26 16:59:50 -07:00
Treehugger Robot
9aa84c6110 Merge "Do not rename prebuilt apexes for product packaging" into main 2024-07-26 21:08:31 +00:00
Spandan Das
a8e2d6173d Do not rename prebuilt apexes for product packaging
https://r.android.com/2901309 added support for handling installation
rules for multiple prebuilts. One of the implementation details there
was to change LOCAL_MODULE name to the source apex name in the generated
.mk files.

This causes issues in partner builds where the google singed apex
com.google.android.foo gets renamed to com.android.foo in
out/soong/Android-$PRODUCT.mk. If the partner builds does not include
the aosp apex in its PRODUCT_PACAKGES, then the google signed apex gets
elided from packaging.

This CL undoes that change. After this CL, the name of the module as it
appears in Android.bp will match the LOCAL_MODULE name emitted for
product packaging.

Test: in build/soong, go test ./apex
Bug: 355682304
Change-Id: Icadbb75609174cff5326f52baf7d53e901f9f1c0
2024-07-26 19:24:27 +00:00
Christopher Ferris
cdd872a5be Merge "Update tests to expect RBE not supported on linux." into main 2024-07-26 17:58:26 +00:00
Andrea Marchini
49ce87ef75 Soong cc proto fix for grpc plugin
- Update output file names when using grpc plugin (grpc.pb instead of pb)

Change-Id: I702553713d1a667f90a5502291bd15b7cedd7eb7
Signed-off-by: Andrea Marchini <amarchini@google.com>
2024-07-26 06:00:30 +00:00
Treehugger Robot
cce2ca725d Merge "Enable select syntax support for phony_deps in phony_rule" into main 2024-07-26 02:08:09 +00:00
Wei Li
9f13555225 Merge "Generate SBOM of products in Soong." into main 2024-07-26 00:45:43 +00:00
Treehugger Robot
a2f2e80c08 Merge "Fix mistake made when moving installmod from shell function standalone script" into main 2024-07-26 00:15:44 +00:00
Christopher Ferris
1db36e3888 Update tests to expect RBE not supported on linux.
Bug: 354280127

Test: Passes on linux
Test: Treehugger for the rest.
Change-Id: Ic1546a153e7e761a2132409743650cbf0a0b1ba6
2024-07-25 16:52:31 -07:00
Joe Onorato
8726dcd228 Fix mistake made when moving installmod from shell function standalone script
Bug: 355509078
Test: run installmod
Change-Id: I6ac58e8b2d58463f50eef54c6c29ce3bd399d0da
2024-07-25 16:21:28 -07:00
Makoto Onuki
7c52907acf Merge "Support resource APKs" into main 2024-07-25 22:18:19 +00:00
Treehugger Robot
38f97d7a08 Merge changes from topic "fix-presigned-apk-validation" into main
* changes:
  Fix presigned apk check for privileged apps
  Convert TestAndroidAppImport_Preprocessed to test fixtures
2024-07-25 21:17:25 +00:00
Taylor Santiago
dd65d3e672 Merge "Add ABFS (Android Build Filesystem) configuration option to Soong" into main 2024-07-25 21:04:06 +00:00
Makoto Onuki
3380f6deb3 Support resource APKs
- android_ravenwood_test can now have `resource_apk: "ANDROID_APP_MODULE"`.
This will copy the APK to the test directory as "ravenwood-res.apk".

- android_ravenwood_libgroup can now have `data: ["MODULE"]`.
We use this to add framework-res.apk (as `data:["framework-res"]`)
to the ravenwood runtime path.

Bug: 339614874
Test: m nothing --no-skip-soong-tests
Test: ATEST="atest --no-bazel-mode" $ANDROID_BUILD_TOP/frameworks/base/ravenwood/run-ravenwood-tests.sh
   Do it on both aosp/main and goog/main

Flag: EXEMPT: Host side change only

Change-Id: I36516fec068a6359688a1dbedcb10a49c4631441
2024-07-25 12:41:07 -07:00
Rashid Zaman
3bd28705f4 Fix presigned apk check for privileged apps
The validation checks that run for presigned apps currently expect that
privileged apps have uncompressed dex files but if
DONT_UNCOMPRESS_PRIV_APPS_DEXS is true (UncompressPrivAppDex false) this
doesn't have to be the case so make the validation consistent with this.
Also make TestAndroidAppImport_Preprocessed verify that extra arguments
to 'check_prebuilt_presigned_apk.py' are correct for both privileged and
non-privileged apps.

Test: m nothing --no-skip-soong-tests
Test: Add presigned, privileged android_app_import module with
compressed dex to PRODUCT_PACKAGES for aosp_cf_x86_64_phone,
lunch aosp_cf_x86_64_phone-trunk_staging-userdebug &&
m DONT_UNCOMPRESS_PRIV_APPS_DEXS=true no longer fails due to validation
error.

Change-Id: I7e22cf525cd9d99d1ecb24e4e2e99c3f9de48146
2024-07-25 12:04:26 -07:00
Rashid Zaman
5800d421c3 Convert TestAndroidAppImport_Preprocessed to test fixtures
In preparation for a subsequent CL convert the test to use test
fixtures.

Test: m nothing --no-skip-soong-tests
Change-Id: I12f3802419105c7ffc8e00e95a069432c6b99d53
2024-07-25 11:27:58 -07:00
Pechetty Sravani (xWF)
13c6231218 Revert "Set output for build_prop even on Soong only build"
Revert submission 3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR

Reason for revert: Droidmonitor created revert due to b/355379515. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR

Change-Id: Iedc3434401d358ca4e716cdc056ff403eb3c5194
2024-07-25 09:21:09 +00:00
Pechetty Sravani (xWF)
072c0e4fcb Revert^3 "Add TARGET_SYSTEM_PROP to system build.prop"
ff506d1af2

Change-Id: I5659e93d4c45fdca20357b4fc61f936cfd0e748d
2024-07-25 09:21:09 +00:00
Pechetty Sravani (xWF)
c13856eb1d Revert^3 "Sync gen_build_prop.py to sysprop.mk"
e176dc9ee2

Change-Id: I8cf265281ff16ad65d1fe8d6084a6fd49adc294c
2024-07-25 09:21:09 +00:00
Pechetty Sravani (xWF)
ea04e564c2 Revert^3 "Use Soong-built system/build.prop"
625f66136d

Change-Id: I69b09646fb3286dcc5df638f87625f4eb8dcfcb2
2024-07-25 09:21:09 +00:00
Inseob Kim
b302108252 Merge "Set output for build_prop even on Soong only build" into main 2024-07-25 07:27:59 +00:00
Inseob Kim
625f66136d Revert^2 "Use Soong-built system/build.prop"
3ef9ed9848

Change-Id: I132ea8c2feabedc8b5e9bb8c0adb8f0995b9a2ec
2024-07-25 03:27:49 +00:00
Inseob Kim
e176dc9ee2 Revert^2 "Sync gen_build_prop.py to sysprop.mk"
0e7cde59c8

Change-Id: If8b60802c8bdc62689d8939d5efa9007ad814d85
2024-07-25 03:27:49 +00:00
Inseob Kim
ff506d1af2 Revert^2 "Add TARGET_SYSTEM_PROP to system build.prop"
027f50246f

Change-Id: I3e2e8d90029f897f1dbf76a829518cb7fe4a47b1
2024-07-25 03:27:49 +00:00
Inseob Kim
3a69282271 Set output for build_prop even on Soong only build
Without this change, Soong only build may break unexpectedly if some
modules refer to the build_prop module.

Bug: 322090587
Test: soong only build
Change-Id: I7571bdf0aa6c08ade8f130842c84c02bb0233acb
2024-07-25 11:54:28 +09:00
Inseob Kim
7d7baf7220 Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main
* changes:
  Revert "Add TARGET_SYSTEM_PROP to system build.prop"
  Revert "Sync gen_build_prop.py to sysprop.mk"
  Revert "Use Soong-built system/build.prop"
2024-07-25 02:48:23 +00:00
Inseob Kim
027f50246f Revert "Add TARGET_SYSTEM_PROP to system build.prop"
Revert submission 3184480-system_build_prop_soong

Reason for revert: breaks ndk and mainline build 

Reverted changes: /q/submissionid:3184480-system_build_prop_soong

Change-Id: Ic089dc3dfcbf2083d1bcf2413be432dcb61ce525
2024-07-25 02:45:53 +00:00
Inseob Kim
0e7cde59c8 Revert "Sync gen_build_prop.py to sysprop.mk"
Revert submission 3184480-system_build_prop_soong

Reason for revert: breaks ndk and mainline build 

Reverted changes: /q/submissionid:3184480-system_build_prop_soong

Change-Id: I833aacf23bbe7cd16b6aad0b7d94a9b46a8192e4
2024-07-25 02:45:53 +00:00
Inseob Kim
3ef9ed9848 Revert "Use Soong-built system/build.prop"
Revert submission 3184480-system_build_prop_soong

Reason for revert: breaks ndk and mainline build 

Reverted changes: /q/submissionid:3184480-system_build_prop_soong

Change-Id: I1738cc0a85428d3fd0a0ee196fa6d54270e6f1ec
2024-07-25 02:45:53 +00:00
Inseob Kim
b93b9f0b3a Merge changes from topic "system_build_prop_soong" into main
* changes:
  Use Soong-built system/build.prop
  Sync gen_build_prop.py to sysprop.mk
  Add TARGET_SYSTEM_PROP to system build.prop
2024-07-25 02:07:00 +00:00
Treehugger Robot
6899b7ed22 Merge changes from topic "avf_apex_android_bp_select" into main
* changes:
  Make more apex properties configurable
  Make genrule's srcs property configurable
  Make some apex properties configurable
  Make the vintf_fragments property configurable
  Make the defaults property configurable
2024-07-25 01:52:54 +00:00
Wei Li
b85a178b07 Generate SBOM of products in Soong.
Bug: 324465531
Test: CIs
Test: m soong-sbom
Change-Id: If76776851d49282829a79bfb1c33f05b8f57de31
2024-07-24 18:23:13 -07:00
Treehugger Robot
bd0b157c1f Merge "Allow C symbol file to be arch variant" into main 2024-07-25 01:11:33 +00:00
Inseob Kim
d23e0d3244 Make more apex properties configurable
This allows using select statements with these.

* apps
* binaries
* prebuilts

Bug: 354824866
Test: m --no-skip-soong-tests
Change-Id: I8e28937d2fa6514b41bd189f56f9f584a60d2c80
2024-07-25 00:55:38 +00:00
Inseob Kim
2f73062d47 Make genrule's srcs property configurable
This allows using select statements with it.

Bug: 354824866
Test: m
Change-Id: If1d71ac177618ad3eb628cdec57469886ee27c88
2024-07-25 00:55:21 +00:00
Inseob Kim
b114234f6b Make some apex properties configurable
This allows using select statements with these.

* androidManifest
* canned_fs_config
* systemserverclasspath_fragments

Bug: 354824866
Test: m
Change-Id: I4c2182944ec14d99332f437c39a19ba0dc6b7731
2024-07-25 00:55:05 +00:00
Treehugger Robot
0cdc351829 Merge "Add android.car.builtin to the Code Coverage instrumented list." into main 2024-07-24 22:26:00 +00:00
Aditya Kumar
e97cded50d Merge "Enable -Wfortify-source" into main 2024-07-24 19:56:11 +00:00
Treehugger Robot
f2e5340072 Merge "Ingore CC prebuilts from cmake snapshots" into main 2024-07-24 18:06:58 +00:00
Inseob Kim
361baadba6 Use Soong-built system/build.prop
buildinfo.prop is also removed since it's now obsolete.

Bug: 322090587
Test: boot
Test: compare build.prop before and after
Change-Id: Ida7bab82add6e86e1076061a5fcdb572cedd1578
2024-07-24 17:20:22 +09:00
Inseob Kim
19fd1316b7 Sync gen_build_prop.py to sysprop.mk
Also fixes a bug on an if clause.

Bug: 322090587
Test: build and compare both build.prop files
Change-Id: Id0dfba98f5cd67c939594554b470e7fad9cfd518
2024-07-24 15:53:54 +09:00
Inseob Kim
bcc00559c6 Add TARGET_SYSTEM_PROP to system build.prop
System partition's build_prop output now contains TARGET_SYSTEM_PROP.
Soong needs to know paths to add them to ninja build dependency graph.

Bug: 322090587
Test: build and compare both build.prop files
Change-Id: Ide73e876d28eda0cced2ec08bd3c680115025ad8
2024-07-24 15:53:54 +09:00
Filip Zakrzewski
c9f487b0e8 Add android.car.builtin to the Code Coverage instrumented list.
BUG=339901608

TEST=no

Change-Id: I3457dd843f3ebcefda4253b128ed142a7fa13e82
2024-07-24 04:27:45 +00:00
Kiyoung Kim
e51cb36a48 Merge "Remove VSDK related code from build" into main 2024-07-24 03:31:43 +00:00
Spandan Das
02be101893 Allow C symbol file to be arch variant
The libclang_rt.* prebuilt libraries have an autogenerated map.txt for
each arch. e.g.
```
$ ls prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan*map.txt
prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-aarch64-android.map.txt  prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-riscv64-android.map.txt
prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-arm-android.map.txt      prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-x86_64-android.map.txt
prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-i686-android.map.txt
```

These map.txt files are currently a noop, but will be used to compile
stub srcs. In preparation for that, make stubs.symbol_file and
llndk.symbol_file arch variant

Test: m nothing # no diff in ninja file
Bug: 220898484
Change-Id: I7316546905c1327c764ee67a48c77a2a68465d77
2024-07-24 01:21:53 +00:00
Treehugger Robot
562eaab091 Merge "Add C symbol file to module sdk snapshot" into main 2024-07-23 23:23:00 +00:00
Spandan Das
1f22939d81 Ingore CC prebuilts from cmake snapshots
The cmake snapshot scripts currently looks at the `cc.Module.compiler`
property to determine whether a cc_* module is a prebuilt. As part of
b/275273834. some cc_* prebuilt modules which provide APIs will have a
non-nil `compiler` to convert the API .txt file to stub .c files.

This CL updates the cmake generation script to ignore prebuilts using
the `IsPrebuilt` function rather than `cc.Module.compiler`

Bug: 275273834
Test: m nothing --no-skip-soong-tests
Change-Id: Id8ba22b1c5ad13fb31e75a407a25e97a8040d0b1
2024-07-23 22:36:10 +00:00
Spandan Das
e20c56cdf0 Add C symbol file to module sdk snapshot
cc_prebuilt_library_shared does not currently support generating stubs
from API symbol_files, and therefore the symbol file was removed from
the module sdk snapshots in https://ag.corp.google.com/11394495

As part of b/275273834, the stubs will be generated from the API files
for cc_prebuilt_library_shared, so add the symbol file back to the
module sdk

Bug: 275273834
Test: m nothing --no-skip-soong-tests
Test: m art-module-sdk and verified the map.txt is copied to the zip
next to the Android.bp file

Change-Id: I9551e7b8a76ceb9db3ed0434d315b6839f5e3d54
2024-07-23 22:18:00 +00:00
Jared Duke
8f1340eb8a Merge "Support symbolized odex preopt output" into main 2024-07-23 22:10:26 +00:00
Treehugger Robot
b137e55a39 Merge "Specify Is_stubs_module property in top level sdk library" into main 2024-07-23 19:42:06 +00:00