StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,172 Commits 1 Branch 0 Tags
e8f7f90496e3cdfd1b01b42ba30588dd6f7e11a4
Commit Graph

23172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
e8f7f90496 Merge changes from topics "soong-inclusive-language", "soong_inclusive_language2" into rvc-dev am: f4a5492ec9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11859399

Change-Id: I1b009faacad99fcbfbf6cd06193f033ea37f6040
 2020-06-16 03:43:15 +00:00
Colin Cross
3c76d01110 [automerger skipped] Use inclusive language in build/soong am: 95f7b34e8e -s ours 
am skip reason: Change-Id Id07890b7cbc2397291a658ca00e86b43c743aafc with SHA-1 440e0d0542 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11857227

Change-Id: I2b8cf377c18e6487ebf10b114f8781364c15fde5
 2020-06-16 03:43:12 +00:00
Colin Cross
651454cff2 [automerger skipped] Merge changes from topics "soong-dist", "tests-PathForSource" into rvc-dev am: c8697f6ae5 -s ours 
am skip reason: Change-Id Ia5ddb31afe29329f2df0ae1297ed963c8c28e590 with SHA-1 3cda0d8df9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11857310

Change-Id: I3db86914ee97f81a26f5182d371ae3350cbe3e54
 2020-06-16 03:42:51 +00:00
Colin Cross
f4a5492ec9 Merge changes from topics "soong-inclusive-language", "soong_inclusive_language2" into rvc-dev 
* changes:
  Use inclusive language in Android.bp files
  Use inclusive language in build/soong
 2020-06-16 03:28:15 +00:00
Colin Cross
c8697f6ae5 Merge changes from topics "soong-dist", "tests-PathForSource" into rvc-dev 
* changes:
  Add DistForGoal to MakeVarsContext
  Define Soong phony rules in Make
  Remove paths from cc.TestConfig
  Remove most paths from java.TestConfig
  Allow tests to bypass PathForSource existence checks
 2020-06-16 03:27:32 +00:00
Treehugger Robot
2e754d5365 Merge "Run the metrics uploader in the background." am: c9d83d25bb am: 7990af404f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1329396

Change-Id: Ib800866656c06ead7d3da094c8905ff9bdb53d32
 2020-06-15 19:44:58 +00:00
Treehugger Robot
7990af404f Merge "Run the metrics uploader in the background." am: c9d83d25bb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1329396

Change-Id: I540be6e221e236ca9739a0adc8777b4666900806
 2020-06-15 19:37:28 +00:00
Treehugger Robot
c9d83d25bb Merge "Run the metrics uploader in the background." 2020-06-15 19:28:10 +00:00
Roland Levillain
23db998b8a Merge "Introduce product variables to select Java code coverage paths in Soong." am: d38ab21c6e am: f76e10aa2b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326321

Change-Id: I3f66962252aac710d66f3f26908a7b5f530fa712
 2020-06-15 19:07:06 +00:00
Roland Levillain
f76e10aa2b Merge "Introduce product variables to select Java code coverage paths in Soong." am: d38ab21c6e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326321

Change-Id: I1bf7f242f628c71eb5451057259868e76da4e66c
 2020-06-15 18:50:24 +00:00
Roland Levillain
d38ab21c6e Merge "Introduce product variables to select Java code coverage paths in Soong." 2020-06-15 18:41:03 +00:00
Treehugger Robot
0878af7585 [automerger skipped] Merge "Remove libnativehelper modules from whitelist" am: c41c1a9d13 am: 5e8c0cf3ec -s ours 
am skip reason: Change-Id I6a43511fee3feeb164e07d5620eea0564fbee302 with SHA-1 494c63b20e is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331121

Change-Id: I70380c0399d0e58b316b2d656a818994f6aeb0e6
 2020-06-15 17:19:04 +00:00
Chris Gross
ca7a598d67 Merge "Use EMMA_INSTRUMENT_FRAMEWORK for apex framework libs." am: a7a36e22fb am: efa623c7e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1320475

Change-Id: I2b9bca7a7d7107353541a36d5feeea492fc5ed87
 2020-06-15 17:18:39 +00:00
Sophie Zheng
ea3fdcd596 Merge "Fix build breakage b/158783867" am: 83b1296457 am: d4b69d31c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1332082

Change-Id: I643fae908517db5e77dbec076fa33714269bced5
 2020-06-15 17:17:32 +00:00
Treehugger Robot
5e8c0cf3ec Merge "Remove libnativehelper modules from whitelist" am: c41c1a9d13 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331121

Change-Id: I1e93f528ba9a85d3ad36e058cec036802990b3bf
 2020-06-15 17:05:31 +00:00
Treehugger Robot
c41c1a9d13 Merge "Remove libnativehelper modules from whitelist" 2020-06-15 17:00:35 +00:00
Colin Cross
f563a0194d [automerger skipped] Fix using generated test configs for sh_test, python_test and rust_test modules am: 287638be7e -s ours 
am skip reason: Change-Id I1c020e642f83d994d63c9e9cb56e686086d5acaa with SHA-1 a6384821f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11857311

Change-Id: I338f24b59808b7c80f0cd32c2f6bc1e2d503f200
 2020-06-15 16:59:36 +00:00
Colin Cross
fdb2d11df4 [automerger skipped] Merge "Add eakammer and patricearruda to OWNERS" into rvc-dev am: 03aa290b52 -s ours 
am skip reason: Change-Id I4209fc5149dcce6bf75aef130afc69c4600c7f3b with SHA-1 b83929c944 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11857305

Change-Id: Iee5c19b3a31ab2b847392735a609ee4626cbeb4b
 2020-06-15 16:59:24 +00:00
Chris Gross
efa623c7e4 Merge "Use EMMA_INSTRUMENT_FRAMEWORK for apex framework libs." am: a7a36e22fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1320475

Change-Id: I6521c532272e83c17547e505c0a12172cf8293a6
 2020-06-15 16:59:05 +00:00
TreeHugger Robot
3cae0cac69 [automerger skipped] Merge "Implement test config auto-gen for sh_test." into rvc-dev am: b1522d9990 -s ours 
am skip reason: Change-Id I63d60a153a6abda4ce30b74d3eb915fbf6389cb8 with SHA-1 c5b8749853 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11833659

Change-Id: Ice39b8e78a6fc1a5b021789f3f87f30d6dc3aab3
 2020-06-15 16:58:45 +00:00
Sophie Zheng
d4b69d31c4 Merge "Fix build breakage b/158783867" am: 83b1296457 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1332082

Change-Id: Iecd2f6bec6b99e367d5b10f8962411abea23e5f8
 2020-06-15 16:58:36 +00:00
Chris Gross
a7a36e22fb Merge "Use EMMA_INSTRUMENT_FRAMEWORK for apex framework libs." 2020-06-15 16:50:59 +00:00
Colin Cross
287638be7e Fix using generated test configs for sh_test, python_test and rust_test modules 
Annotate the test config properties with android:"path", and always
use LOCAL_FULL_TEST_CONFIG to pass the path to Make.

Bug: 157621988
Test: manual
Change-Id: I1c020e642f83d994d63c9e9cb56e686086d5acaa
Merged-In: I1c020e642f83d994d63c9e9cb56e686086d5acaa
 2020-06-15 16:46:47 +00:00
Colin Cross
a44a6b27f9 Use inclusive language in Android.bp files 
Bug: 158889297
Test: m checkbuild
Change-Id: Id9efbd99be54b191193eae1c5672230ca54cf1d2
 2020-06-15 09:46:32 -07:00
Colin Cross
95f7b34e8e Use inclusive language in build/soong 
Bug: 158889297
Test: m checkbuild
Change-Id: Id07890b7cbc2397291a658ca00e86b43c743aafc
Merged-In: Id07890b7cbc2397291a658ca00e86b43c743aafc
(cherry picked from commit 440e0d0542)
 2020-06-15 09:46:31 -07:00
Colin Cross
871b80fb77 Add DistForGoal to MakeVarsContext 
Add methods to MakeVarsContext to allow Singletons to dist
artifacts without manually adding $(dist-for-goals) in Make.

Bug: 153485543
Test: m checkbuild
Change-Id: Ia5ddb31afe29329f2df0ae1297ed963c8c28e590
Merged-In: Ia5ddb31afe29329f2df0ae1297ed963c8c28e590
(cherry picked from commit 3cda0d8df9)
 2020-06-15 09:46:31 -07:00
Colin Cross
9855207d0e Define Soong phony rules in Make 
To support dist-for-goals in Soong, we need to define all phony rules
in Make so that dist-for-goals can insert additional dependencies on
them.  Collect all the phony rules in phonySingleton and write them
out as Make rules when Soong is embedded in Make, or as blueprint.Phony
rules when Soong is run standalone.

Bug: 153485543
Test: m checkbuild
Change-Id: I68201eff30744b0f487fc4f11f033767b53a627d
Merged-In: I68201eff30744b0f487fc4f11f033767b53a627d
(cherry picked from commit c3d87d3112)
 2020-06-15 09:46:31 -07:00
Colin Cross
5a3458ddc0 Remove paths from cc.TestConfig 
Now that tests don't need to specify every path passed to
PathForSource or PathForModuleSrc, remove them from cc.TestConfig.

Bug: 153485543
Test: all soong tests
Change-Id: I90cd7b4dfc49c156afbb0eea9a77159c3e1860fa
Merged-In: I90cd7b4dfc49c156afbb0eea9a77159c3e1860fa
(cherry picked from commit 2fce23ae6d)
 2020-06-15 09:46:31 -07:00
Colin Cross
f5f663b0c3 Remove most paths from java.TestConfig 
Now that tests don't need to specify every path passed to
PathForSource or PathForModuleSrc, remove most of them from
java.TestConfig.  Leave a few that are globbed by lots of tests,
and move a few that are globbed by a single test into the tests.

Bug: 153485543
Test: all soong tests
Change-Id: Ica91d7203a6a7dbca0fd4fed84c78f149b8699e1
Merged-In: Ica91d7203a6a7dbca0fd4fed84c78f149b8699e1
(cherry picked from commit 238c1f3903)
 2020-06-15 09:46:31 -07:00
Colin Cross
f77c720b08 Allow tests to bypass PathForSource existence checks 
Forcing every test to specify every file it wants to pass to
PathForSource or PathForModuleSrc is painful to maintain and
doesn't add any value.  Allow tests to reference paths through
PathForSource and PathForModuleSrc without specifying them in
the mock FS.

Bug: 153485543
Test: all soong tests
Change-Id: Ia8a8fd965a338d0645b3721314bf91f50146ad21
Merged-In: Ia8a8fd965a338d0645b3721314bf91f50146ad21
(cherry picked from commit 5e6a797982)
 2020-06-15 09:46:31 -07:00
Sophie Zheng
83b1296457 Merge "Fix build breakage b/158783867" 2020-06-15 16:44:54 +00:00
Colin Cross
03aa290b52 Merge "Add eakammer and patricearruda to OWNERS" into rvc-dev 2020-06-15 16:38:27 +00:00
Colin Cross
0fd3329a3c Add eakammer and patricearruda to OWNERS 
Bug: 0
Test: none
Change-Id: I4209fc5149dcce6bf75aef130afc69c4600c7f3b
Merged-In: I4209fc5149dcce6bf75aef130afc69c4600c7f3b
(cherry picked from commit b83929c944)
 2020-06-15 16:38:09 +00:00
TreeHugger Robot
b1522d9990 Merge "Implement test config auto-gen for sh_test." into rvc-dev 2020-06-15 16:37:06 +00:00
TreeHugger Robot
4666f7ef3a Merge "Remove libnativehelper modules from whitelist" into rvc-dev-plus-aosp 2020-06-15 15:27:56 +00:00
Treehugger Robot
413fe72e89 [automerger skipped] Merge "java_sdk_library: Add system-server scope" am: 623802f2f2 am: 7036824079 -s ours 
am skip reason: Change-Id I49a2dab5c064b05f16691a3fae65f2b4ffc53bfd with SHA-1 5a757b1ebb is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322696

Change-Id: I1dabb15a7eaf820d902a87734ae64a2c3f83aa6c
 2020-06-15 15:21:05 +00:00
Treehugger Robot
7036824079 Merge "java_sdk_library: Add system-server scope" am: 623802f2f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322696

Change-Id: I542da9bcb6dd3ef0feb0d25f79d46394197f68da
 2020-06-15 15:05:32 +00:00
Treehugger Robot
623802f2f2 Merge "java_sdk_library: Add system-server scope" 2020-06-15 14:52:58 +00:00
Jooyung Han
e30c7b98bc Merge "VNDK APEX should not provide native libs" am: 552d4730c3 am: 6b67734812 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335522

Change-Id: Ieaa981ee386de3a31f45a87e60819b25baf98883
 2020-06-15 14:27:50 +00:00
Jooyung Han
6b67734812 Merge "VNDK APEX should not provide native libs" am: 552d4730c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335522

Change-Id: I4a98e13de0f1abf32b8d8422b4b27f2f1d167a2e
 2020-06-15 14:04:58 +00:00
Paul Duffin
0c5bae5e83 java_sdk_library: Add system-server scope 
Bug: 155164730
Test: m nothing
Merged-In: I49a2dab5c064b05f16691a3fae65f2b4ffc53bfd
Change-Id: I49a2dab5c064b05f16691a3fae65f2b4ffc53bfd
(cherry picked from commit 5a757b1ebb)
 2020-06-15 15:02:19 +01:00
Jooyung Han
552d4730c3 Merge "VNDK APEX should not provide native libs" 2020-06-15 13:52:20 +00:00
Orion Hodson
01615f36f2 Remove libnativehelper modules from whitelist 
Bug: 147364041
Test: m nothing
Change-Id: I6a43511fee3feeb164e07d5620eea0564fbee302
Merged-In: I6a43511fee3feeb164e07d5620eea0564fbee302
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit 7e2354434907257f37255052d9bd08c554e263eb)
 2020-06-15 13:32:14 +00:00
Orion Hodson
494c63b20e Remove libnativehelper modules from whitelist 
Bug: 147364041
Test: m nothing
Change-Id: I6a43511fee3feeb164e07d5620eea0564fbee302
Merged-In: I6a43511fee3feeb164e07d5620eea0564fbee302
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit ab67d8f9b4)
 2020-06-15 13:25:59 +00:00
Roland Levillain
ada1270ef8 Introduce product variables to select Java code coverage paths in Soong. 
Introduce product variables `JavaCoveragePaths` and
`JavaCoverageExcludePaths` (resp. populated from environment variables
`JAVA_COVERAGE_PATHS` and `JAVA_COVERAGE_EXCLUDE_PATHS`). Use them to
control which Java modules are candidate for instrumentation based on
their source path. By default (when `JavaCoveragePaths` is empty),
have all Java module be candidate for instrumentation, to preserve the
existing behavior.

Test: export EMMA_INSTRUMENT=true \
        && export EMMA_INSTRUMENT_FRAMEWORK=true \
        && export JAVA_COVERAGE_PATHS=art \
        && m
Bug: 158212027
Bug: 156284897
Change-Id: Ibe9c1f41ed6110867411952689c5a7ad6536f277
 2020-06-15 11:57:31 +01:00
TreeHugger Robot
3af97dc202 [automerger skipped] Merge "Fix type assertion error regarding dex_import" into rvc-dev am: a5fa9f6df9 -s ours 
am skip reason: Change-Id Id22c20d42effce539fab10b0d349bf340d467f02 with SHA-1 9e83f0b531 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11822729

Change-Id: I9c71e73b5297b24ed35b7b2a2e249e4e000a8def
 2020-06-15 10:50:24 +00:00
TreeHugger Robot
a5fa9f6df9 Merge "Fix type assertion error regarding dex_import" into rvc-dev 2020-06-15 10:40:17 +00:00
Roland Levillain
5e303f1b31 Merge "Rename native code coverage paths product variables in Soong." am: 2752d926a9 am: c052ef7d33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326320

Change-Id: I1a54d986c3e3080588011bab7469f38144a3d748
 2020-06-15 10:37:09 +00:00
Roland Levillain
c052ef7d33 Merge "Rename native code coverage paths product variables in Soong." am: 2752d926a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326320

Change-Id: I2826d4fff0233d98bf59e73aaf3e8bd5a04d1097
 2020-06-15 10:18:46 +00:00
Roland Levillain
2752d926a9 Merge "Rename native code coverage paths product variables in Soong." 2020-06-15 10:12:10 +00:00