aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-20Snap for 7223127 from 06a524a85b8e99ff9172bd03650008a97373802b to ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot
rvc-qpr3-release Change-Id: I686b1458b0a8ad89feae8e1a341d0ef7b1da9c30
2021-03-19[automerger skipped] Minimal license feature. am: 459beab694 -s ours am: ↵Bob Badour
b5d58b3eaa -s ours am: 64a932b9c7 -s ours am: 7ebfebdb93 -s ours am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13928045 Change-Id: I33d035390a3218f8316b656921970c63b509b545
2021-03-19[automerger skipped] Minimal license feature. am: 459beab694 -s ours am: ↵Bob Badour
b5d58b3eaa -s ours am: 64a932b9c7 -s ours am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13928045 Change-Id: Ieaddfa6ed52c8febdb199cb604f372afb350d65d
2021-03-19[automerger skipped] Minimal license feature. am: 459beab694 -s ours am: ↵Bob Badour
b5d58b3eaa -s ours am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13928045 Change-Id: I4393e98e96b34b0e4604e0c03a7cc2b16e7a5c2e
2021-03-19[automerger skipped] Minimal license feature. am: 58d85b87bc am: 6b4ddeb66c ↵Bob Badour
-s ours am: 967ca0a6f0 -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: I205fdd6184d71558111a96988861838906ec8649
2021-03-19[automerger skipped] Minimal license feature. am: 459beab694 -s oursBob Badour
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13928045 Change-Id: If527f71987f23aee63aa0a1209572479672398c5
2021-03-19[automerger skipped] Minimal license feature. am: 58d85b87bc am: 6b4ddeb66c ↵Bob Badour
-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-19Minimal license feature. am: 58d85b87bcBob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13929165 Change-Id: I49453a723ea46a2bda5d21655e569c212564c076
2021-03-19Minimal license feature.Bob Badour
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-19Minimal license feature.Bob Badour
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-17Snap for 7215955 from 2c75333a450a93b0f769d3af492f43d5d08b4ca7 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: Ib835221bb007f4bea64fd45e2a6826e158f3608f
2021-03-16Minimal license feature. am: dc5be9099bBob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13879853 Change-Id: Ib49755e526c64d8cbaee4e6d26133321b66bd535
2021-03-16Minimal license feature.Bob Badour
Keeps license declarations from breaking the build without implementing the full feature. Test: m all Bug: 181768532 Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
2020-11-02[automerger skipped] Merge "[DO NOT MERGE] Capture the build command that ↵TreeHugger Robot
executed the build system." into rvc-dev am: b157ffc6f7 -s ours am: 6b49ce61f9 -s ours am skip reason: Change-Id I7ab94dcf037211f1abffe6afd012b03ffbf99756 with SHA-1 807a8f9142 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969380 Change-Id: I6a2b6740a8181b8ed8687ae86def6f4ad30529cc
2020-11-02[automerger skipped] Merge "[DO NOT MERGE] Capture the build command that ↵TreeHugger Robot
executed the build system." into rvc-dev am: b157ffc6f7 -s ours am skip reason: Change-Id I7ab94dcf037211f1abffe6afd012b03ffbf99756 with SHA-1 807a8f9142 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969380 Change-Id: I51531f29f1543778abd9a66baf9e67f7e7e86967
2020-11-02Merge "[DO NOT MERGE] Capture the build command that executed the build ↵TreeHugger Robot
system." into rvc-dev
2020-11-02[automerger skipped] [DO NOT MERGE] Capture the build command that executed ↵Patrice Arruda
the build system. am: 807a8f9142 am: 43743ee2ce -s ours am: b777aac4c8 am: c8018262c6 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335 Change-Id: Iea2abcbab2bdda6372738f00d8aecbac3ea38e0d
2020-11-02[automerger skipped] [DO NOT MERGE] Capture the build command that executed ↵Patrice Arruda
the build system. am: 807a8f9142 am: 43743ee2ce -s ours am: b777aac4c8 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335 Change-Id: I83127208c359ab80837e15fb116b1e3a3a1f4579
2020-11-02[automerger skipped] [DO NOT MERGE] Capture the build command that executed ↵Patrice Arruda
the build system. am: 807a8f9142 am: 43743ee2ce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335 Change-Id: Ic96b958a70e654d6f8893bdbd6777027974510fd
2020-11-02[DO NOT MERGE] Capture the build command that executed the build system. am: ↵Patrice Arruda
807a8f9142 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335 Change-Id: Ib496613df81acb9e17f1ca4b717583fab39643cc
2020-11-02[DO NOT MERGE] Capture the build command that executed the build system.Patrice Arruda
We need to capture the user build command to understand what additional arguments is passed in to Soong. This data is useful to know which targets are being executed and have statistics on top build targets are specified. Bug: b/169453712 Test: ran "m blueprint_tools", "m nothing", "lunch 1" and checked in soong_metrics proto. Change-Id: I7ab94dcf037211f1abffe6afd012b03ffbf99756 Merged-In: I7ab94dcf037211f1abffe6afd012b03ffbf99756 Merged-In: If9a1443eff6b48cee865ea914370261f5e0cfee6
2020-11-02[DO NOT MERGE] Capture the build command that executed the build system.Patrice Arruda
We need to capture the user build command to understand what additional arguments is passed in to Soong. This data is useful to know which targets are being executed and have statistics on top build targets are specified. Bug: b/169453712 Test: ran "m blueprint_tools", "m nothing", "lunch 1" and checked in soong_metrics proto. Change-Id: I7ab94dcf037211f1abffe6afd012b03ffbf99756 Merged-In: I7ab94dcf037211f1abffe6afd012b03ffbf99756
2020-10-21Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: ↵Kousik Kumar
04f6efa716 am: 72fd2abc5c am: e21a8a1c00 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656 Change-Id: I7f218f2d042cabcad930e683a6dc76314d8bebd1
2020-10-21Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: ↵Kousik Kumar
04f6efa716 am: 72fd2abc5c Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656 Change-Id: I52d2bbdfd8682c37c595b49d3c1bc78a4d96e30c
2020-10-21Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: 04f6efa716Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656 Change-Id: Ib4848042fdc9926a9929e6eebf416e01d045fd90
2020-10-21Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49fKousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656 Change-Id: If52cdcd09678cc154257b22b869f6ebabd8557f0
2020-10-20Deprecate both USE_GOMA and FORCE_USE_GOMA flagsKousik Kumar
Test: m USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox m FORCE_USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox both result in error message being printed. Bug: b/171325288 Change-Id: I94ccaf217dba71aca990d88d205bad669a49a2f5 Merged-In: I94ccaf217dba71aca990d88d205bad669a49a2f5
2020-10-20Merge "Add data bin and lib properties to sh_test" into rvc-qpr-devJaewoong Jung
2020-10-19Merge "resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 ↵TreeHugger Robot
to rvc-dev" into rvc-dev am: 7790f714d5 am: b0c70846ae Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151 Change-Id: If1fbc8f73c6fb4a2a61a16b9fcaa19323d535acb
2020-10-19Merge "resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 ↵TreeHugger Robot
to rvc-dev" into rvc-dev am: 7790f714d5 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151 Change-Id: I0b4a0274e5a8a78d2d8c5ad5359534a25135e4bf
2020-10-19Merge "resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 ↵TreeHugger Robot
to rvc-dev" into rvc-dev
2020-10-19resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 to rvc-devPatrice Arruda
Test: I solemnly swear I tested this conflict resolution. Bug: b/169395325 Change-Id: Iaac2f8ef4b452c95bdc4584697c3e4e9ed69aa5c Merged-In: Ib6898b49c16a830d814efe74581bde463caedf76 Merged-In: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8
2020-10-16Merge "Remove special-cased stub deps on framework-res" into rvc-dev am: ↵Liz Kammer
0f35aeec67 am: 81768cc9cc Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849659 Change-Id: I26c9f5f44f9e503fc757e89098fd020d932b6b0f
2020-10-16Add a tagged output for app's exportPackage am: 8fe023c551 am: 4139580eb7Anton Hansson
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12838384 Change-Id: Id094c934a1184262b594a33f4f0846e617efc6fb
2020-10-16Merge "Remove special-cased stub deps on framework-res" into rvc-dev am: ↵Liz Kammer
0f35aeec67 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849659 Change-Id: I4c7b013d883f0d93caa32a0cb07aa374ccb05f31
2020-10-16Add a tagged output for app's exportPackage am: 8fe023c551Anton Hansson
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12838384 Change-Id: I07d592fa57b4ba3b06249a79a6ad8bd373795f7d
2020-10-16Merge "Remove special-cased stub deps on framework-res" into rvc-devLiz Kammer
2020-10-15Add data bin and lib properties to sh_testJaewoong Jung
This cherry-picks Id3952e136c1dabfcd34048b6c9f31d0125a623df to rvc-qpr-dev along with the first device target fix, Ib56f52424ebf47f3eee6ac62b9fd9eca2919d63a. Test: sh_binary_test.go Test: Modified ziptool-tests Test: build/soong/scripts/build-ndk-prebuilts.sh Fixes: 169299866 Change-Id: Id3952e136c1dabfcd34048b6c9f31d0125a623df Merged-In: Id3952e136c1dabfcd34048b6c9f31d0125a623df Merged-In: Ib56f52424ebf47f3eee6ac62b9fd9eca2919d63a
2020-10-15Collect the hostname of the machine as a metric. am: af7b75b8dbPatrice Arruda
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849657 Change-Id: I21d6d894ce261bb9181dc6863c41ff67c5af904a
2020-10-15Remove special-cased stub deps on framework-resAnton Hansson
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-10-15Collect the hostname of the machine as a metric.Patrice Arruda
The hostname is collected during a build to determine where the user is build from (from office workstation, cloudtop, etc...). This is a useful metrics for RBE related builds. Bug: b/169395325 Test: m nothing, ran printproto to verify that soong_metrics has the hostname. Change-Id: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8 Merged-In: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8 Merged-In: Ib6898b49c16a830d814efe74581bde463caedf76
2020-10-14Add a tagged output for app's exportPackageAnton Hansson
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 Merged-In: I8c5d17540d2624974983d73e56ba17898505dba8 Change-Id: I8c5d17540d2624974983d73e56ba17898505dba8
2020-10-05Update to r383902b1.Stephen Hines
This brings in a fix for ASan that was requested by partners. Bug: http://b/167642019 Bug: https://issuetracker.google.com/159095144 Bug: https://issuetracker.google.com/167642019 Test: m Change-Id: I1471a1e1ebc8a749b78038a8900a1b8d3fd4d017 Merged-In: I34d26da72a36b16491cf328075d817b073acfc0d
2020-09-30resolve merge conflicts of 87deed46bf3693f0fb0a63b9da0b863af6bd9177 to ↵android-11.0.0_r30android11-qpr1-c-releasePatrice Arruda
rvc-dev am: 925c9f2983 am: db8dd5e17d Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12736108 Change-Id: I6dca5e284e200caaf1ec683aad5c22a5315fc20d
2020-09-30resolve merge conflicts of 87deed46bf3693f0fb0a63b9da0b863af6bd9177 to ↵Patrice Arruda
rvc-dev am: 925c9f2983 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12736108 Change-Id: Id12186162a3d0d6e6f7250e820a5bdf648594a68
2020-09-30resolve merge conflicts of 87deed46bf3693f0fb0a63b9da0b863af6bd9177 to rvc-devPatrice Arruda
Test: I solemnly swear I tested this conflict resolution. Bug: b/169423400 Merged-In: If801d23c431a71eddcf332c100b00eacd97ced5a Merged-In: Ifcce83e3d424a5eaaea38068a9cda79dc8c4b747 Merged-In: I2d3b790f8e031d0607a32cae9a21c6bc9fc3238a Merged-In: If3cabaf2058844fceaa8366ce3592e8ebd69736e Change-Id: I8a9768f23a0ebf221a969cebf620e6bd604c7458
2020-09-30resolve merge conflicts of 64d43056ace73e9cc34b6bd2885185af2495633d to ↵Patrice Arruda
rvc-dev am: 68805280f0 am: d6f7bf5069 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12730519 Change-Id: If3b9521ab940e4060b13ef1c3b96b2de5ea684a8
2020-09-30resolve merge conflicts of 64d43056ace73e9cc34b6bd2885185af2495633d to ↵Patrice Arruda
rvc-dev am: 68805280f0 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12730519 Change-Id: I809d86b85f8f796c1b24c4a7718045e357f661be
2020-09-30resolve merge conflicts of 64d43056ace73e9cc34b6bd2885185af2495633d to rvc-devPatrice Arruda
Test: I solemnly swear I tested this conflict resolution. Bug: b/169423400 Change-Id: I9e4bf3784a1ba5ae49793dbf367347106b997461 Merged-In: I67b229fbf52e913b0c4f5e7932021132ddc0598f
2020-09-29Collect FORCE_USE_GOMA environment variable as a metric. am: 3fc4c98bd9Patrice Arruda
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12722544 Change-Id: I97b6cc360664bb8a2c2f959a632efd99b9d9021a