Commit graph

76179 commits

Author SHA1 Message Date
Cole Faust
eda7420e0e Enable sandboxing for pigweed gnerules
go/roboleaf-busy-beavers-sandboxing

Ignore-AOSP-First: these modules only exist on internal
Bug: 307824623
Test: m pw_log_log_proto_pwpb_h pw_log_log_raw_rpc_h pw_log_log_rpc_pwpb_h pw_tokenizer_proto_options_pwpb_h
Change-Id: I5f4c68657a9440a3db339e7a51a4714c3bc5df55
(cherry picked from commit 50005b08c2)
2023-11-22 19:30:18 +00:00
Inseob Kim
fb1d783e07 Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836495

Change-Id: I02084dd3d6c5e9039ce9b9f53942c21422c84d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 07:55:30 +00:00
Inseob Kim
6a4bb378df Merge "Allow apex to use generated file_contexts" into main 2023-11-22 07:45:53 +00:00
Yi Kong
817aea043a Merge "Remove unneeded MLGO cflag" into main am: 78a456e771
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839803

Change-Id: I60df6de321df974fb7277141ca6919ea4abd9f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 06:19:00 +00:00
Yi Kong
78a456e771 Merge "Remove unneeded MLGO cflag" into main 2023-11-22 06:06:47 +00:00
Yi Kong
8fb0b498db Remove unneeded MLGO cflag
For LTO compilation, we do not need MLGO flags in cflags, since codegen
happens during link only.

Fixes compiler warnings for unused command line argument.

Test: presubmit
Change-Id: I361e4292b10a3582fd5c69fa7b5678c654b44a0f
2023-11-22 06:06:36 +00:00
Treehugger Robot
6653229186 Merge "Sandbox MultiDexLegacyTestApp_genrule and android-cts-verifier" into main am: 917ea12077
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841997

Change-Id: Iad8288b4e1971926f5532a9caa8159f6db4b3810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 06:04:46 +00:00
Treehugger Robot
917ea12077 Merge "Sandbox MultiDexLegacyTestApp_genrule and android-cts-verifier" into main 2023-11-22 05:56:46 +00:00
Treehugger Robot
baed9d5a57 Merge "Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test" into main am: 9be9a126d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841420

Change-Id: I5b7d56846f7bac5b4a77745e8638ce2412aaa935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 02:06:49 +00:00
Cole Faust
4a0be5cc17 Sandbox MultiDexLegacyTestApp_genrule and android-cts-verifier
These both work with sandboxing already, I'm not sure why they
were added to this list.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py android-cts-verifier MultiDexLegacyTestApp_genrule
Change-Id: Ie5a194fbe202b84a30eb3738d07ffb4ec9061bca
2023-11-21 17:04:24 -08:00
Treehugger Robot
9be9a126d1 Merge "Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test" into main 2023-11-22 00:44:03 +00:00
Cole Faust
d4ca3aaf20 Merge "Sandbox vndk_abi_dump_zip" into main am: 852b82e5c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842057

Change-Id: Ic6be6b6e8982c7ce1a99386b9fdec5e8e22efc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 23:57:45 +00:00
Pirama Arumuga Nainar
d6165f813c Merge "Revert "Remove flags rejected by RBE input processor"" into main am: d03958d457
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841994

Change-Id: I8054abc5235be6aaa6d573ec816e38a5486ef22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 23:57:33 +00:00
Cole Faust
42a737da5c Merge "Sandbox awkgram.tab.h" into main am: 1f6fb9b419
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841996

Change-Id: I1f6a86649070ffef63ec3c9118c16ac088a43f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 23:57:05 +00:00
Cole Faust
852b82e5c2 Merge "Sandbox vndk_abi_dump_zip" into main 2023-11-21 23:53:56 +00:00
Pirama Arumuga Nainar
d03958d457 Merge "Revert "Remove flags rejected by RBE input processor"" into main 2023-11-21 23:45:12 +00:00
Cole Faust
1f6fb9b419 Merge "Sandbox awkgram.tab.h" into main 2023-11-21 23:36:42 +00:00
Treehugger Robot
eb9ea4ba54 Merge "Sandbox emp_ematch genrules" into main am: 964a084264
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842055

Change-Id: I7a8dbca8ca4bd920bfbb7df630af3827a5de52f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 23:36:33 +00:00
Treehugger Robot
964a084264 Merge "Sandbox emp_ematch genrules" into main 2023-11-21 23:22:03 +00:00
Aditya Choudhary
356296240e Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test
Bug: 312536783
Bug: 312536905
Test: m nothing --no-skip-soong-tests -j96

Change-Id: I1e12281927269d42ae796348b223030acfd6ecfa
2023-11-21 23:14:01 +00:00
Treehugger Robot
df89d0cd92 Merge "Sandbox angle_commit_id" into main am: 024adceb24
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842056

Change-Id: Ib85a8e20260c4517965d88c126038f251aaac0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 22:49:36 +00:00
Cole Faust
2826870306 Merge "Sandbox c2hal_test_genc++[_headers]" into main am: b12a98651d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842054

Change-Id: Ieb966eedb7f872dc28bf2a2d1f971ce0fb902a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 22:49:25 +00:00
Treehugger Robot
68e5138235 Merge "Sandbox libchrome genrules" into main am: 23abfe7291
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841995

Change-Id: I912a9278500887f290e531d1ec6828b5f6b8bb80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 22:47:33 +00:00
Treehugger Robot
024adceb24 Merge "Sandbox angle_commit_id" into main 2023-11-21 22:47:23 +00:00
Cole Faust
ae36d6b964 Sandbox awkgram.tab.h
Sandboxing it generates this diff:

  38,39c38,39
  < #ifndef YY_YY_OUT_SOONG_TEMP_SBOX_794A09CEE4E110D9FF38139A8943928FFD7288A5_OUT_AWKGRAM_TAB_H_INCLUDED
  < # define YY_YY_OUT_SOONG_TEMP_SBOX_794A09CEE4E110D9FF38139A8943928FFD7288A5_OUT_AWKGRAM_TAB_H_INCLUDED
  ---
  > #ifndef YY_YY_OUT_AWKGRAM_TAB_H_INCLUDED
  > # define YY_YY_OUT_AWKGRAM_TAB_H_INCLUDED
  280c280
  < #endif /* !YY_YY_OUT_SOONG_TEMP_SBOX_794A09CEE4E110D9FF38139A8943928FFD7288A5_OUT_AWKGRAM_TAB_H_INCLUDED  */
  ---
  > #endif /* !YY_YY_OUT_AWKGRAM_TAB_H_INCLUDED  */

Which is acceptable, the ifdef is based on the path to the file and
just there to prevent duplicate imports.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py awkgram.tab.h
Change-Id: I85c5e0f65e97d18f1aa8b36fa6b19402d2da6c8c
2023-11-21 14:18:27 -08:00
Cole Faust
b12a98651d Merge "Sandbox c2hal_test_genc++[_headers]" into main 2023-11-21 22:08:31 +00:00
Cole Faust
763710ca78 Sandbox vndk_abi_dump_zip
Sandboxing it generates this diff in it's output zip file:

  1,4c1,2
  < Archive:  out_not_sandboxed/soong/.intermediates/prebuilts/abi-dumps/vndk/vndk_abi_dump_zip/gen/vndk_abi_dump.zip
  < Zip file size: 319522663 bytes, number of entries: 7462
  < -rw-r--r--  2.0 unx     1055 bl      612 defN 08-Jan-01 00:00 Android.bp
  < -rw-r--r--  2.0 unx      143 bl       99 defN 08-Jan-01 00:00 OWNERS
  ---
  > Archive:  out/soong/.intermediates/prebuilts/abi-dumps/vndk/vndk_abi_dump_zip/gen/vndk_abi_dump.zip
  > Zip file size: 319519888 bytes, number of entries: 7454
  6810d6807
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/arm/source-based/config.json
  6926d6922
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/arm64/source-based/config.json
  7042d7037
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/arm_arm64/source-based/config.json
  7158d7152
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/x86/source-based/config.json
  7274d7267
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/x86_64/source-based/config.json
  7390d7382
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/x86_x86_64/source-based/config.json
  7465c7457
  < 7462 files, 5412913325 bytes uncompressed, 317891705 bytes compressed:  94.1%
  ---
  > 7454 files, 5412907795 bytes uncompressed, 317890142 bytes compressed:  94.1%

So sandboxing removes some files from the zip. It appears that the
intention of this zip file was to include a bunch of .lsdump files,
and these files that were removed were extraneous.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py vndk_abi_dump_zip
Change-Id: I15df4a4b54df362c30e2b231f6fed586cf0a267f
2023-11-21 14:04:52 -08:00
Treehugger Robot
23abfe7291 Merge "Sandbox libchrome genrules" into main 2023-11-21 22:04:03 +00:00
Cole Faust
babb750cdf Sandbox angle_commit_id
Sandboxing it generates this diff:

  1c1
  < #define ANGLE_COMMIT_HASH "1f7a2ce0bf57"
  ---
  > #define ANGLE_COMMIT_HASH "unknown hash"
  3,4c3,4
  < #define ANGLE_COMMIT_DATE "2023-11-17 17:33:59 +0000"
  < #define ANGLE_COMMIT_POSITION 26027
  ---
  > #define ANGLE_COMMIT_DATE "unknown date"
  > #define ANGLE_COMMIT_POSITION 0

These constants appear to be unused, and we don't really want the build
to inspect the git history, so just let them be unkown.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py angle_commit_id
Change-Id: I3e35af14d13142927ded9477e975576d7324c6b7
2023-11-21 13:56:27 -08:00
Cole Faust
8d99fa4d9d Sandbox emp_ematch genrules
These genrules already work with sandboxing, but bison emits #line
directives that reference filepaths. These paths differ between
sandboxed and non-sandboxed builds, which caused
genrule_sandboxing_test.py to think that they didn't work with
sandboxing.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py emp_ematch.yacc.c emp_ematch.yacc.h
Change-Id: I85ed0f80dee7997af6b08a37b12e9c0ad0bd8386
2023-11-21 13:28:42 -08:00
Cole Faust
e5d9c8d5f7 Sandbox c2hal_test_genc++[_headers]
These genrules already work with sandboxing, I'm not sure why they
were added to the list.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py c2hal_test_genc++_headers c2hal_test_genc++
Change-Id: I697c9cff1db0bf71b3608684fde73535a72f71b2
2023-11-21 12:50:57 -08:00
Cole Faust
6753118f49 Sandbox libchrome genrules
These genrules already work with sandboxing, but they write the path
to a tool into a comment in their outputs, which differs between
sandboxing and non-sandboxing builds. This made genrule_sandbox_test.py
think that they didn't work with sandboxing.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py libchrome-include libchrome-crypto-include
Change-Id: Ibcad839e9d374a2f992d051805548c58303cf7ef
2023-11-21 12:40:34 -08:00
Aditya Choudhary
e5d9515fe3 Merge "Set testModule to true in cc.NewTest()." into main am: c400022f0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841416

Change-Id: I30dbb9fddbc140b78bfd8bd5bd6086507be6d0f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 20:01:41 +00:00
Pirama Arumuga Nainar
6c771e7d29 Revert "Remove flags rejected by RBE input processor"
This reverts commit a4724a0c4e.

Reason for revert: reclient has an updated deps scanner now.
Bug: http://b/248371171
Test: enable RBE; RBE_CLANG_TIDY_EXEC_STRATEGY=remote; make tidy-soong_subset


(cherry picked from https://android-review.googlesource.com/q/commit:2c36e5efceae94424b513878cf6dc4e9640651ab)
Merged-In: Id876bd7eee1e5606f8dc05903f77f135b47da360
Change-Id: Id876bd7eee1e5606f8dc05903f77f135b47da360
2023-11-21 19:54:27 +00:00
Aditya Choudhary
c400022f0a Merge "Set testModule to true in cc.NewTest()." into main 2023-11-21 19:53:53 +00:00
Aditya Choudhary
64b6c645e8 Add test for soong/testing/test_spec. am: b7b3de8307
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836072

Change-Id: Iec9eeceadbd2e86055a4f2e6eecd77443f7eb05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 19:44:34 +00:00
Aditya Choudhary
b7b3de8307 Add test for soong/testing/test_spec.
This CL adds test for test_spec.go and all_test_specs.go (singleton).

Bug: 296873595
Test: m nothing --no-skip-soong-tests -j96

Change-Id: I5010c68512e75d1b9a337c02da86faac15e376fe
2023-11-21 17:31:07 +00:00
Aditya Choudhary
eb7cc75c5f Merge "Add Singleton class to collect and validate test spec metadata." into main am: 29766f4d98
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2824671

Change-Id: I6be5016e838c899b46de6931459487bca0acc651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 16:43:49 +00:00
Aditya Choudhary
29766f4d98 Merge "Add Singleton class to collect and validate test spec metadata." into main 2023-11-21 16:08:40 +00:00
Aditya Choudhary
4b6eaf4bd1 Set testModule to true in cc.NewTest().
This Cl sets testModule field to True in cc.NewTest(). This will cover "cc_test", "cc_test_host" and "art_cc_test".

Change-Id: I4a8db86835b195db34fd9f86560e7bf9321fbd7d
2023-11-21 15:49:19 +00:00
Aditya Choudhary
2368e9ea9e Add Singleton class to collect and validate test spec metadata.
Bug: 296873595
Test: Manual testing (Will add unit test case in the next change.)
Change-Id: Ic4177c5f76602088d52a31ca8d9fbaa703855837
2023-11-21 14:06:57 +00:00
Aditya Choudhary
0c6c5f5431 Merge "Add test spec provider to test modules." into main am: bc34d495c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836758

Change-Id: I98d9c51c8ffab2ec0e9a6451e0637eea07e23727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 09:48:37 +00:00
Aditya Choudhary
bc34d495c9 Merge "Add test spec provider to test modules." into main 2023-11-21 09:17:11 +00:00
David Srbecky
918285adce Merge "resourceshrinker: Add dexContainerExperiment flag" into main am: 3f7d0f6797
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828314

Change-Id: I18e530107a0fe3c9185f86f7c69d37b49dd4e64f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 08:43:33 +00:00
David Srbecky
3f7d0f6797 Merge "resourceshrinker: Add dexContainerExperiment flag" into main 2023-11-21 08:30:23 +00:00
Treehugger Robot
6311d7b475 Merge "Remove multidex version genrules" into main am: c9affafb72
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839046

Change-Id: Id93d0616f0bb010dc9c5558d6f71c3dbb4719329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 08:27:02 +00:00
Treehugger Robot
c9affafb72 Merge "Remove multidex version genrules" into main 2023-11-21 08:00:40 +00:00
Treehugger Robot
ab3d3c8109 Merge "Sandbox fdt genrules" into main am: ff99c2b957
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839045

Change-Id: Id75e340408f9e1db4a407d67cea86d6a7d050770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 07:38:58 +00:00
Treehugger Robot
ff99c2b957 Merge "Sandbox fdt genrules" into main 2023-11-21 07:04:39 +00:00
Cole Faust
bfff3ee343 Enable sandboxing for exercise_type_data_type_config-pb
go/roboleaf-busy-beavers-sandboxing

Ignore-AOSP-First: exercise_type_data_type_config-pb only exists on internal
Bug: 307824623
Test: m exercise_type_data_type_config-pb
Change-Id: I2fb6e8254c124c4c0382b294a2e5a86a50be02b9
(cherry picked from commit 90498937ed)
2023-11-21 00:48:37 +00:00