Commit Graph

21329 Commits

Author SHA1 Message Date
Anton Hansson 85f59b7b54 Merge "Remove special-cased stub deps on framework-res" 2020-08-18 11:58:57 +00:00
Anton Hansson 8dffd9e1aa Merge "Add a tagged output for app's exportPackage" am: 72ce814def
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398474

Change-Id: If2e7914eff1aec89d76c3a666a57773547bf852d
2020-08-18 11:48:15 +00:00
Anton Hansson 72ce814def Merge "Add a tagged output for app's exportPackage" 2020-08-18 11:38:46 +00:00
Treehugger Robot aa3235edcc Merge "Deduplicate APEX variants that would build identically" am: ca29a25d38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399832

Change-Id: Ic3727a541bb7a098fe81ca0d4cf92e2139f1a7ab
2020-08-18 05:07:22 +00:00
Treehugger Robot ca29a25d38 Merge "Deduplicate APEX variants that would build identically" 2020-08-18 04:50:12 +00:00
Treehugger Robot b8b19daf9d Merge "Make the default exec strategy for javac/r8/d8 remote local fallback." am: 90905c0c68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399527

Change-Id: I7e2b1be312e1d0ccf2b77f463bce343852aa091f
2020-08-18 01:07:12 +00:00
Treehugger Robot 90905c0c68 Merge "Make the default exec strategy for javac/r8/d8 remote local fallback." 2020-08-18 00:54:03 +00:00
Colin Cross d6b2525b00 Deduplicate APEX variants that would build identically
APEX variants that share the same SDK version and updatability
almost always use identical command line arguments to build but
with different intermediates directories.  This causes unnecessary
build time and disk space for duplicated work.

Deduplicate APEX variants that would build identically.  Create
aliases from the per-APEX variations to the new shared variations
so that the APEX modules can continue to depend on them via the
APEX name as the variation.

This has one significant change in behavior.  Before this change,
if an APEX had two libraries in its direct dependencies and one
of those libraries depended on the other, and the second library
had stubs, then the first library would depend on the implementation
of the second library and not the stubs.  After this change, if
the first library is also present in a second APEX but the second
library is not, then the common variant shared between the two
APEXes would use the stubs, not the implementation.

In a correctly configured set of build rules this change will
be irrelevant, because if the compilation worked for the second
APEX using stubs then it will work for the common variant using
stubs.  However, if an incorrect change to the build rules is
made this could lead to confusing errors, as a previously-working
common variant could suddenly stop building when a module is added
to a new APEX without its dependencies that require implementation
APIs to compile.

This change reduces the number of modules in an AOSP arm64-userdebug
build by 3% (52242 to 50586), reduces the number of variants of the
libcutils module from 74 to 53, and reduces the number of variants
of the massive libart[d] modules from 44 to 32.

Bug: 164216768
Test: go test ./build/soong/apex/...
Change-Id: I0529837476a253c32b3dfb98dcccf107427c742c
2020-08-17 15:18:31 -07:00
Treehugger Robot ed688224e9 Merge "Override EarlyModuleContext.Namespace" am: 8cb67e4358
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401847

Change-Id: I798a7fa68345ed7407d8ab3d6c99933392915ad2
2020-08-17 19:49:24 +00:00
Treehugger Robot 8cb67e4358 Merge "Override EarlyModuleContext.Namespace" 2020-08-17 19:37:39 +00:00
Jaewoong Jung a41a8877cb Add data bin and lib properties to sh_test
This attempts to reland I7b64de4b06e9bba3fba3712b25dd9f9d112e1625
by fixing Mac-related test issues.

Test: sh_binary_test.go
Test: Modified ziptool-tests
Bug: 156980228
Change-Id: Icb7bfb183f6a1d429caefc05b0550aff292d7633
2020-08-17 10:01:41 -07:00
Treehugger Robot 73a14bb9e5 Merge "Rename class2greylist" am: 51636c0ae9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398467

Change-Id: I636354f2b13cd9352855faf66b10d273318dfcbe
2020-08-17 16:35:29 +00:00
Treehugger Robot 51636c0ae9 Merge "Rename class2greylist" 2020-08-17 16:33:21 +00:00
Treehugger Robot 1fe098e329 Merge "Propagate settings for building in an unbundled tree." am: ba161370aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1396067

Change-Id: I2b04c4721c1317281aaa9b9b28f62baa2940dc26
2020-08-17 13:48:50 +00:00
Treehugger Robot ba161370aa Merge "Propagate settings for building in an unbundled tree." 2020-08-17 13:35:16 +00:00
Anton Hansson 8f903f30ff Remove special-cased stub deps on framework-res
This dep is now possible to express in native Android.bp syntax,
which makes the build easier to understand.

Bug: 161214753
Test: build sdk, diff out/dist before and after
Change-Id: I878eda49b5bf54aaf581fc52e0fe9719e4bcdfce
Merged-In: I878eda49b5bf54aaf581fc52e0fe9719e4bcdfce
2020-08-17 11:00:03 +01:00
Anton Hansson 092aca410f Add a tagged output for app's exportPackage
This allows the android stubs to depend on framework-res' exportPackage
without special-casing inside the build system.

Bug: 161214753
Test: depending on this output in a followup CL
Change-Id: I8c5d17540d2624974983d73e56ba17898505dba8
2020-08-17 11:00:00 +01:00
Thiébaud Weksteen 745e90d802 Merge "rust: modify linting properties" am: 2346b014eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398468

Change-Id: Ie468f2f2826c3b5016fff975c38d8c31b9add3b5
2020-08-17 07:13:20 +00:00
Thiébaud Weksteen 2346b014eb Merge "rust: modify linting properties" 2020-08-17 07:01:14 +00:00
Treehugger Robot be9a9035f2 Merge "Rename ApexName to ApexVariationName" am: a07777d434
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399831

Change-Id: Ia9682ee4bbf068131fa6f807f9f74075faba14ed
2020-08-15 06:52:17 +00:00
Treehugger Robot a07777d434 Merge "Rename ApexName to ApexVariationName" 2020-08-15 06:43:52 +00:00
Jaewoong Jung ce59a88137 Revert "Add data bin and lib properties to sh_test" am: cc1bfd6aa0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401770

Change-Id: I193be0f0cbe1c5fb9abf12d881b40a9f14ba8171
2020-08-15 01:26:28 +00:00
Jaewoong Jung cc1bfd6aa0 Revert "Add data bin and lib properties to sh_test"
This reverts commit 91dbd520de.

Reason for revert: Fix CLs didn't completely fix the builds.

Test: sh_binary_test.go
Bug: 156980228
Bug: 164465992
Change-Id: I1ed214c2ea6cd460db909a103c4b3a9a895ad9f7
2020-08-14 18:11:23 -07:00
Colin Cross 133ebefb8d Override EarlyModuleContext.Namespace
Make android.EarlyModuleContext return a *Namespace.

Test: m checkbuild
Change-Id: I4c29d5e69e90eb9b7afbefc1355f63991a3e3331
2020-08-14 17:38:45 -07:00
Jaewoong Jung 6b4fd94ba3 Merge "Fix broken darwin build." am: abdafede81
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401171

Change-Id: I59114c7fc02665a9a15e6c46a436de5f982069b4
2020-08-15 00:33:50 +00:00
Jaewoong Jung abdafede81 Merge "Fix broken darwin build." 2020-08-15 00:19:12 +00:00
Treehugger Robot e01b3ae9e9 Merge "Add CreateAliasVariation to BottomUpMutatorContext" am: 046cbd1590
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399830

Change-Id: Iacf439e11aa971019924a93bafa4d2516604f038
2020-08-14 23:00:02 +00:00
Treehugger Robot 046cbd1590 Merge "Add CreateAliasVariation to BottomUpMutatorContext" 2020-08-14 22:54:02 +00:00
Treehugger Robot 191f89298a Merge "Add a default value for the RBE_log_dir variable." am: 6b6f9dbb7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399727

Change-Id: If103656e32b3ea644dace93989f93e6d99dc5b2c
2020-08-14 22:34:55 +00:00
Treehugger Robot 6b6f9dbb7d Merge "Add a default value for the RBE_log_dir variable." 2020-08-14 22:22:17 +00:00
Treehugger Robot c55f345058 Merge "Shorten missing module panic message" am: 0fe22f4b90
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399829

Change-Id: I19a117319d751a332f303344a3580a266982c327
2020-08-14 21:56:04 +00:00
Treehugger Robot 0fe22f4b90 Merge "Shorten missing module panic message" 2020-08-14 21:46:44 +00:00
Jaewoong Jung 8eee3f6b58 Fix broken darwin build.
Offending change - I7b64de4b06e9bba3fba3712b25dd9f9d112e1625

This is in addition to Idebfdf1ed7d8e10ba867c8eaac01410d754c7131

Test: sh_binary_test.go
Bug: 156980228
Bug: 164465992
Change-Id: I8d01d0e82efe764cc6901bb3e2c2767c8b25d81f
2020-08-14 14:27:02 -07:00
Jaewoong Jung e22ef09f6c Merge "Fix broken darwin build." am: e3c24b1c77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1400887

Change-Id: I50d2bbc7e1897b9cfadf2f24a36f1f4edea8976a
2020-08-14 19:19:53 +00:00
Jaewoong Jung e3c24b1c77 Merge "Fix broken darwin build." 2020-08-14 19:07:36 +00:00
Jaewoong Jung 181cfdf898 Fix broken darwin build.
Offending change - I7b64de4b06e9bba3fba3712b25dd9f9d112e1625

Test: sh_binary_test.go
Bug: 156980228
Fixes: 164465992
Change-Id: Idebfdf1ed7d8e10ba867c8eaac01410d754c7131
2020-08-14 18:44:23 +00:00
Ramy Medhat 30a09c0b81 Merge "Do not generate a random socket address for RBE if NOSTART_RBE is set." am: 39fff45b8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399835

Change-Id: I904976d45110a6857d8171e0f19772233fd28b56
2020-08-14 18:29:37 +00:00
Ramy Medhat 8c56bc2726 Add a default value for the RBE_log_dir variable.
Test: built simple target.
Change-Id: Id93dd80119037b594e5f8c370f4ac2fbc12a5144
2020-08-14 14:17:33 -04:00
Ramy Medhat 39fff45b8e Merge "Do not generate a random socket address for RBE if NOSTART_RBE is set." 2020-08-14 18:12:33 +00:00
Jaewoong Jung d31cbffaf4 Merge "Add data bin and lib properties to sh_test" am: b2567eb9d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1386705

Change-Id: I9d5f5592d536ae45d9f824bb813fa998228b512a
2020-08-14 18:04:22 +00:00
Jaewoong Jung b2567eb9d8 Merge "Add data bin and lib properties to sh_test" 2020-08-14 17:50:05 +00:00
Jeff Vander Stoep 3a9d80a60c Rust: use 1.45.2 prebuilts
Test: TH
Change-Id: I2eab5af0a822673ca1f5bb2f63c88edc2c7830ff
2020-08-14 13:53:38 +02:00
Treehugger Robot 1efeaa552c Merge "Update ApexAvailableBaseline" am: 52cefc00f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1396192

Change-Id: If00f6e5b81887eb04618ad65816e3c41c5dcd9e8
2020-08-14 03:51:43 +00:00
Treehugger Robot 52cefc00f7 Merge "Update ApexAvailableBaseline" 2020-08-14 03:40:33 +00:00
Ramy Medhat a958d35247 Do not generate a random socket address for RBE if NOSTART_RBE is set.
Test: A build with NOSTART_RBE=1
Change-Id: I5872632442c754b597901b7729eed597ee45859f
2020-08-13 22:53:42 -04:00
Colin Cross e07f2316b7 Rename ApexName to ApexVariationName
In preparation for reusing the same variation for multiple apexes,
rename ApexName to ApexVariationName.

Bug: 164216768
Test: all soong tests
Change-Id: I88f2c5b192ffa27acd38e01952d0cefd413222a0
2020-08-13 17:50:29 -07:00
Colin Cross 1b9604b463 Add CreateAliasVariation to BottomUpMutatorContext
Propagate CreateAliasVariation from Blueprint to Soong.

Bug: 164216768
Test: m checkbuild
Change-Id: I635bf67481092b83a8d26ef1cb06e2e3e21a595f
2020-08-13 17:50:05 -07:00
Jaewoong Jung 91dbd520de Add data bin and lib properties to sh_test
Test: sh_binary_test.go
Test: Modified ziptool-tests
Bug: 156980228
Change-Id: I7b64de4b06e9bba3fba3712b25dd9f9d112e1625
2020-08-13 15:36:44 -07:00
Colin Cross 094956cf00 Merge changes I02fb745a,Iccc96c0d am: a24b9deb5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1378536

Change-Id: I109e5814ae04de65667962a3299989e0ca160d11
2020-08-13 22:10:01 +00:00
Colin Cross a24b9deb5f Merge changes I02fb745a,Iccc96c0d
* changes:
  Follow all shared library dependencies when collecting JNI libraries
  Handle static unwinder in ltoDepsMutator
2020-08-13 21:55:53 +00:00