Commit Graph

35462 Commits

Author SHA1 Message Date
Bob Badour
967ca0a6f0 [automerger skipped] Minimal license feature. am: 58d85b87bc am: 6b4ddeb66c -s ours
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 dc5be9099b is already in history

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

Change-Id: I8fd218bbabaf658ef3408fbefe00b9eb2ed8e3f4
2021-03-19 20:15:33 +00:00
Bob Badour
6b4ddeb66c Minimal license feature. am: 58d85b87bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13929165

Change-Id: I49453a723ea46a2bda5d21655e569c212564c076
2021-03-19 19:35:42 +00:00
Paul Duffin
29a1d49066 Merge changes I6b868bac,If75f4718 am: 479605bed7 am: e0e8fc6539
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645100

Change-Id: Ie020d22413bb6bb629eca536dfddc78bb0041c52
2021-03-19 18:38:59 +00:00
Colin Cross
5c2afde7f1 Merge changes Iab4e09d9,Icf2f24dd,I15be5ef1,Ic0db9619 am: d2db7953a0 am: fa5bd82ef0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634812

Change-Id: I70d44d99d603a83f574e21eab03e778f2721938e
2021-03-19 18:38:50 +00:00
Paul Duffin
e0e8fc6539 Merge changes I6b868bac,If75f4718 am: 479605bed7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645100

Change-Id: Ic121524bc54ab6f0ce5cfa204fc5156041f6a863
2021-03-19 18:01:20 +00:00
Colin Cross
fa5bd82ef0 Merge changes Iab4e09d9,Icf2f24dd,I15be5ef1,Ic0db9619 am: d2db7953a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634812

Change-Id: Iddfbbd126b4d0c3ef18940e65eab338aa958a061
2021-03-19 18:00:43 +00:00
Paul Duffin
479605bed7 Merge changes I6b868bac,If75f4718
* changes:
  Migrate android package to a per test build directory
  Convert android/path_properties_test.go to test fixtures
2021-03-19 17:28:38 +00:00
Colin Cross
d2db7953a0 Merge changes Iab4e09d9,Icf2f24dd,I15be5ef1,Ic0db9619
* changes:
  Run lint actions in sbox
  Support sbox-in-RBE
  Move android package on top of remotexec
  Support sandboxing inputs in RuleBuilder
2021-03-19 17:25:14 +00:00
Julien Desprez
2dc86b2956 Migrate manifest_*_test out of test mapping
Unit tests do not require an explicit TEST_MAPPING config

Change-Id: Ieccebc78a26b9555803a2278e2962d0b388a6957
Test: presubmit
Bug: 183209529
2021-03-19 17:16:16 +00:00
Yi Kong
55163399f5 Merge "[strip.sh] Move remaining GNU binutils usage to llvm binutils" am: 00d54280d0 am: dd3494b8e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1235781

Change-Id: I0ccd796d28aeacc1394a37019de613ac572a0b2e
2021-03-19 16:42:33 +00:00
Yi Kong
dd3494b8e4 Merge "[strip.sh] Move remaining GNU binutils usage to llvm binutils" am: 00d54280d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1235781

Change-Id: I03057b66f9a029f4437fb1a1668af6c0519f5644
2021-03-19 16:05:40 +00:00
Paul Duffin
1c92818e64 Merge "Remove javaMockFS()" am: 54a5e9a467 am: bb1441b473
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634638

Change-Id: I9b100ed98446bb9a6c8501b9974bb66d0ece367d
2021-03-19 15:46:08 +00:00
Yi Kong
00d54280d0 Merge "[strip.sh] Move remaining GNU binutils usage to llvm binutils" 2021-03-19 15:32:49 +00:00
Paul Duffin
bb1441b473 Merge "Remove javaMockFS()" am: 54a5e9a467
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634638

Change-Id: Ib8748d7d5fcb88e0650fdc295e90983c09969b44
2021-03-19 15:04:18 +00:00
Paul Duffin
54a5e9a467 Merge "Remove javaMockFS()" 2021-03-19 14:18:46 +00:00
Paul Duffin
9ac835e9c9 Merge "Fix TestTurbine to work without javaMockFS()" am: 89fbdb2387 am: 9f05456008
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634637

Change-Id: Id797b863f7529f25724acd4556db45d5d5e92a96
2021-03-19 12:06:04 +00:00
Paul Duffin
356f5c13d4 Merge "Fix testDexpreoptBoot to work without javaMockFS()" am: 64df56def9 am: a5807d2dfb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634636

Change-Id: I2872821a77332630cb0c6c9d96bf2644b1d2874c
2021-03-19 12:05:57 +00:00
Paul Duffin
d827b98966 Merge "Fix TestClasspath to work without javaMockFS()" am: 750f8f3515 am: e9cbe547f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634635

Change-Id: I5b01c2a947132abe301909c409db91fa7595a593
2021-03-19 12:05:45 +00:00
Paul Duffin
f6bc52175d Merge "Convert TestClasspath to test fixtures" am: 903a8a08ab am: d5e47f1edb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634634

Change-Id: I368f0f9e09222003beaaeead5241ae8e64cc407b
2021-03-19 12:05:40 +00:00
Paul Duffin
9f05456008 Merge "Fix TestTurbine to work without javaMockFS()" am: 89fbdb2387
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634637

Change-Id: I97d73dd2c36886fe6982a31266d5c999bf3614f4
2021-03-19 11:27:54 +00:00
Paul Duffin
a5807d2dfb Merge "Fix testDexpreoptBoot to work without javaMockFS()" am: 64df56def9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634636

Change-Id: I6e2ea6cce1643bdb51c74b5eed871fbbdd104ee0
2021-03-19 11:27:43 +00:00
Paul Duffin
e9cbe547f1 Merge "Fix TestClasspath to work without javaMockFS()" am: 750f8f3515
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634635

Change-Id: I2d5c352c8df9e5c6dc83f7d28adffac1d5823cdc
2021-03-19 11:27:25 +00:00
Paul Duffin
d5e47f1edb Merge "Convert TestClasspath to test fixtures" am: 903a8a08ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634634

Change-Id: Id534df47dd13b365247d63e358e05f6bca9fc4bf
2021-03-19 11:26:11 +00:00
Paul Duffin
89fbdb2387 Merge "Fix TestTurbine to work without javaMockFS()" 2021-03-19 11:11:42 +00:00
Paul Duffin
64df56def9 Merge "Fix testDexpreoptBoot to work without javaMockFS()" 2021-03-19 11:09:21 +00:00
Paul Duffin
750f8f3515 Merge "Fix TestClasspath to work without javaMockFS()" 2021-03-19 11:08:35 +00:00
Paul Duffin
903a8a08ab Merge "Convert TestClasspath to test fixtures" 2021-03-19 11:08:17 +00:00
Jingwen Chen
b1ab70742c Merge "bp2build: cc_library_headers converter should only include that module type" am: b1672af5d2 am: 5d622ec767
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645006

Change-Id: I9e7bd5858f3ea6608f2bf4cdaf00dc4fb26eb0d8
2021-03-19 10:45:31 +00:00
Jingwen Chen
5d622ec767 Merge "bp2build: cc_library_headers converter should only include that module type" am: b1672af5d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645006

Change-Id: I3b7b057acc4ad90393669b89f56118635c258c36
2021-03-19 09:58:37 +00:00
Jingwen Chen
b1672af5d2 Merge "bp2build: cc_library_headers converter should only include that module type" 2021-03-19 09:18:15 +00:00
Bob Badour
459beab694 Minimal license feature.
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
2021-03-19 01:28:12 -07:00
Bob Badour
58d85b87bc Minimal license feature.
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
2021-03-19 00:42:52 -07:00
Yi Kong
ad50ce8349 [strip.sh] Move remaining GNU binutils usage to llvm binutils
With clang r377782, llvm binutils implements all the necessary
funtionaility for strip.sh. We can finally get rid of all the fallback
GNU binutils usage.

Test: m
Bug: 141010852
Bug: 135627985
Change-Id: I110f6028dab7f599decf59a5cb1b927b35e11857
2021-03-19 12:28:44 +08:00
Pirama Arumuga Nainar
c7d23478e1 Switch to clang r416183 12.0.4.
Bug: http://b/181927912

Test: go/android-llvm-testing-dashboard tag: test_clang_r416183
      go/android-llvm-windows-testing
      go/ab/P20855845 sdk_phone_armv7-sdk_mac build on Forrest
      Forrest run L21700000838126631 for CtsNNAPITestCases

Change-Id: If677b57616348ae52704494f40c7b1ed470bb5f4
2021-03-19 01:14:20 +00:00
Inseob Kim
1d84157810 Merge "Add sepolicy related variables" am: fc8e9c7f00 am: d76ad94973
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641780

Change-Id: I9fafcbed21d366dc93444a19eab8285ae2ce3faf
2021-03-19 01:07:25 +00:00
Justin Yun
76e4387707 Merge "Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__" am: b1d5479783 am: 2d0020dbbd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620648

Change-Id: Ic0accb0b64f1034ed41ebeb8bc3e583678d114a9
2021-03-19 01:07:17 +00:00
Inseob Kim
d76ad94973 Merge "Add sepolicy related variables" am: fc8e9c7f00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641780

Change-Id: Ic5911a7ee516f6ecef60955fdfe7d65d0bbbc47d
2021-03-19 00:30:48 +00:00
Justin Yun
2d0020dbbd Merge "Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__" am: b1d5479783
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620648

Change-Id: I63f27b734085f8fffb4d43cbcf501c1ea25c8d01
2021-03-19 00:29:52 +00:00
Inseob Kim
fc8e9c7f00 Merge "Add sepolicy related variables" 2021-03-19 00:07:58 +00:00
Justin Yun
b1d5479783 Merge "Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__" 2021-03-18 23:33:43 +00:00
Colin Cross
1661aff8be Run lint actions in sbox
Run lint actions in sbox with RuleBuilder.SandboxInputs.  This
copies all input files into the sandbox, which prevents the lint
tool from finding nearby source files that were not presented to it.

Using SandboxInputs requires use of PathForInput or PathForOutput
anywhere a path is used outside of the RuleBuilderCommand methods
that take paths so that they can be translated to the paths that
will be used in the sandbox.

Bug: 181681346
Test: lint_test.go
Test: m lint-check dist
Test: m USE_RBE=true RBE_LINT=true lint-check dist
Test: m USE_RBE=true RBE_LINT=true RBE_LINT_EXEC_STRATEGY=remote lint-check dist
Change-Id: Iab4e09d961891ef182643583d4d456e413bc5e39
2021-03-18 16:17:34 -07:00
Colin Cross
ef972743e8 Support sbox-in-RBE
Allow passing a remoteexec.REParams to RuleBuilder to configure it to
run the rule remotely through RBE.  Requires the rule to use
SandboxInputs, which ensures that RuleBuilder is aware of all of the
inputs and outputs of the rule.

Running sbox in RBE initially seems unnecessary, as RBE is already a
good sandbox, but reproxy can execute RBE actions locally when configured
for local execution, local fallback or racing.  Using sbox in RBE ensures
that these local actions are also sandboxed, giving consistent results
between directly executed actions, local RBE actions, and remote RBE
actions.

Bug: 182612695
Test: manual
Change-Id: Icf2f24dde8dee833eb680ba22566a8e1c0143b15
2021-03-18 16:17:34 -07:00
Colin Cross
77cdcfdeaf Move android package on top of remotexec
Remove the references to the android package in remotexec so that
the android package can reference the remoteexec package.  This
will allow RuleBuilder to integrate directly with remoteexec.

Bug: 182612695
Test: m checkbuild
Change-Id: I15be5ef126d8aacbd605518638f341daf6f31bb3
2021-03-18 16:17:34 -07:00
Colin Cross
ab020a7333 Support sandboxing inputs in RuleBuilder
When RuleBuilder.SandboxInputs() is called configure sbox to copy
all the input files into the sandbox directory and then change the
working directory there when running the command.

Copying input files into the sandbox directory gets tricky when
the input file is the output file from another rule, and could
be at an arbitrary, possibly absolute path based on the value
of OUT_DIR.  They will need to be copied to a directory in the
sandbox using the path relative to OUT_DIR.

RSP files need special handling, they need to both be copied into
the sandbox as an input, rewritten to contain paths as seen in the
sandbox, and references to them on the command line need to use
sandbox paths.

Bug: 182612695
Test: rule_builder_test.go
Change-Id: Ic0db961961b186e4ed9b76246881e3f04971825c
2021-03-18 16:17:32 -07:00
Jingwen Chen
ca2a2d2136 Merge "bp2build: genrule converter only supports "genrule"." am: c5a0089ac4 am: 89b72a0e53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1644566

Change-Id: I2a76fd5885f46bf7518f0482cb66fafa908a459f
2021-03-18 23:06:17 +00:00
Colin Cross
4a2a496ac1 Merge changes Idcbe2046,I09616402,Ide2f1ed9 am: a5d09762a6 am: 65bb7ab016
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634808

Change-Id: I51cc8a1208db30e42ef9dae09fb73e45c4bed42b
2021-03-18 23:06:12 +00:00
Tri Vo
f3a3a16b4e Merge "Remove "-C link-dead-code=y" flag" am: 0e3758caea am: 27003f983a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643983

Change-Id: I604a8f14d29a997dca5fef1a8dfca0dd316c0a2d
2021-03-18 23:06:06 +00:00
Treehugger Robot
dccc90192c Merge "Check for frameworks/base/Android.bp instead of frameworks/base" am: d19b824e7f am: b355d10e16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640629

Change-Id: I524ab9bb03ddd5f360b711382612cc3f6f2b7cef
2021-03-18 23:06:00 +00:00
Kousik Kumar
aab06f6afb Merge "Allowlist RBE_num_retries_if_mismatched variable" am: 47665870d7 am: a5c5f83b7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642779

Change-Id: I4a3ad07237e5f726bfd052cab43243b393d3be01
2021-03-18 23:05:44 +00:00
Paul Duffin
4377482f45 Merge "Convert android/packaging_test.go to test fixtures" am: 813bfcb252 am: 6a64d60ec2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645098

Change-Id: I73d03c017fbda068818fa5ae04bf8af3c5a793ab
2021-03-18 23:05:39 +00:00