StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,305 Commits 1 Branch 0 Tags
759f5a25a65db9d4a63f7bea8e0cdd5b5471f44c
Commit Graph

56305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
759f5a25a6 Merge changes from topic "export-vars" am: a2a7b57924 am: 066a777c15 am: fefe3547a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044966

Change-Id: I3f71b23b335baa61b0b997e454d900a8e914c549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:36:58 +00:00
Treehugger Robot
fefe3547a2 Merge changes from topic "export-vars" am: a2a7b57924 am: 066a777c15 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044966

Change-Id: I8e1725f91f86c4e18da96bbd2153e014642ce1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:13:39 +00:00
Treehugger Robot
066a777c15 Merge changes from topic "export-vars" am: a2a7b57924 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044966

Change-Id: If35e6cdd50ecf5c573fa6944780cf52f959c1ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 17:50:08 +00:00
Treehugger Robot
a2a7b57924 Merge changes from topic "export-vars" 
* changes:
  export Java variables to Bazel
  refactor Bazel variable export
 2022-04-08 17:31:23 +00:00
Albert Martin
5b0f6b9717 Merge "Flag to globally override apexes' min_sdk_version" into tm-dev 2022-04-08 16:05:23 +00:00
Paul Duffin
47d2f67b63 Merge "Use named options for verify_overlaps" am: 510a5e054d am: 0971c66db1 am: 965a6b6ace 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056469

Change-Id: I4286758276a613ade977eba53192875d9b4b4fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 14:40:21 +00:00
Paul Duffin
d842c09954 Merge "Cleanup verify_overlaps*.py" am: 6f041b56a2 am: e977374d90 am: bc708d682e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056468

Change-Id: I5c63154b537afa03875567956fd9540732125805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 14:40:12 +00:00
Paul Duffin
965a6b6ace Merge "Use named options for verify_overlaps" am: 510a5e054d am: 0971c66db1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056469

Change-Id: I8175fcbee11d0be40069f869adf5e1d59c4504d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 14:20:02 +00:00
Paul Duffin
bc708d682e Merge "Cleanup verify_overlaps*.py" am: 6f041b56a2 am: e977374d90 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056468

Change-Id: If9a13b47cce210805de1d2814adc6a3a8d0d8f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 14:19:54 +00:00
Sam Delmerico
932c01cf9e export Java variables to Bazel 
Test: build/bazel/bp2build.sh
Change-Id: Ia06f9265c9f96e6add6edbd0cee925fe37b430d3
 2022-04-08 14:15:43 +00:00
Liz Kammer
e9d89108c4 Merge "Clean up allowlist contents." am: bfc3bd712a am: 55c3707d03 am: d5fb756e53 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057072

Change-Id: I789ff25a7d6854fe71a1731bfe79c76581c56dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 14:04:03 +00:00
Paul Duffin
0971c66db1 Merge "Use named options for verify_overlaps" am: 510a5e054d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056469

Change-Id: I6952486297987b68eaf0d9a25693937169499e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 14:04:00 +00:00
Paul Duffin
e977374d90 Merge "Cleanup verify_overlaps*.py" am: 6f041b56a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056468

Change-Id: I2773f8af41890f7ccf7e7724969d8c5d48e0b521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 14:03:46 +00:00
Paul Duffin
510a5e054d Merge "Use named options for verify_overlaps" 2022-04-08 13:50:17 +00:00
Paul Duffin
6f041b56a2 Merge "Cleanup verify_overlaps*.py" 2022-04-08 13:50:12 +00:00
Liz Kammer
d5fb756e53 Merge "Clean up allowlist contents." am: bfc3bd712a am: 55c3707d03 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057072

Change-Id: I8eb0079e7028564bf3e038a99541235f650a536c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 13:49:48 +00:00
Liz Kammer
55c3707d03 Merge "Clean up allowlist contents." am: bfc3bd712a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057072

Change-Id: I36d4a00096f5fb2c2e46a929f3c153bdb630b237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 13:34:52 +00:00
Liz Kammer
bfc3bd712a Merge "Clean up allowlist contents." 2022-04-08 13:11:50 +00:00
Paul Duffin
cc2f9c5867 [automerger skipped] Merge "Copy the out/soong/build_number.txt file into sdk snapshots" into sc-mainline-prod am: e42d92f4c1 -s ours 
am skip reason: Merged-In Ib3ac0cea5c9315cad0b9a3c25d88759097e37163 with SHA-1 9d0f2c1c44 is already in history

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

Change-Id: Ib9c9cbd377d8e02f03b2af1c0659edcbffcf68fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 12:31:41 +00:00
Paul Duffin
fcb4a6a82c Merge changes from topic "presubmit-am-9a54602642a8421abe834cb0d7a1681d" into tm-dev 
* changes:
  [automerge] Copy the out/soong/build_number.txt file into sdk snapshots 2p: 9d0f2c1c44
  Copy the out/soong/build_number.txt file into sdk snapshots
 2022-04-08 12:00:32 +00:00
Paul Duffin
e42d92f4c1 Merge "Copy the out/soong/build_number.txt file into sdk snapshots" into sc-mainline-prod 2022-04-08 12:00:32 +00:00
Paul Duffin
0c12b78ae8 Use named options for verify_overlaps 
Previously, verify_overlaps used positional arguments, the first was
the monolithi flags and the rest were the module flag pairs (filtered
flags file and signature patterns file). This change makes them use
named options to make the purpose of the arguments clearer on the
command line.

Bug: 194063708
Test: atest --host verify_overlaps_test
      m out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: Ife0af0016eb0f91416e8330d5d98cb53c97d68a4
 2022-04-08 10:56:21 +01:00
Paul Duffin
181b56cf4d Cleanup verify_overlaps*.py 
Fix issues reported by pylint, Intellij Python checks and also try and
adhere to the Google Python Style Guide.

Bug: 194063708
Test: atest --host verify_overlaps_test
      m out/soong/hiddenapi/hiddenapi-flags.csv
      /usr/bin/pylint --rcfile $ANDROID_BUILD_TOP/tools/repohooks/tools/pylintrc scripts/hiddenapi/verify_overlaps*.py
      pyformat -s 4 --force_quote_type single -i scripts/hiddenapi/verify_overlaps*.py
Change-Id: I6273456abc3a4da4af780ae1a0473ca63521dff5
 2022-04-08 10:49:24 +01:00
Yi Kong
121fdcc569 Merge "Move PGO profiles to its own subdir" am: db7e96083f am: 9e6272329c am: 0ac50898d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057434

Change-Id: I9f48f5ba5643f90a37bebda589dd9862f3cb6aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 05:30:51 +00:00
Yi Kong
0ac50898d3 Merge "Move PGO profiles to its own subdir" am: db7e96083f am: 9e6272329c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057434

Change-Id: Ia734be2ac20dcbce62f15117e2ed0ed61ccdc0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 05:06:51 +00:00
Yi Kong
9e6272329c Merge "Move PGO profiles to its own subdir" am: db7e96083f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057434

Change-Id: I45e5ed428bad279b69edcc6080d0d0b22429d996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:44:43 +00:00
Yi Kong
db7e96083f Merge "Move PGO profiles to its own subdir" 2022-04-08 04:10:16 +00:00
Cole Faust
dc80d16d3f Merge "Revert^3 "Prevent unspecified values in soong_config_string_variable"" am: dee36f457c am: 6f18cf01f7 am: 12ba6eaa28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2058887

Change-Id: I908813d3cf10938341e3c9aa853936c66e9000d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:42:46 +00:00
Cole Faust
12ba6eaa28 Merge "Revert^3 "Prevent unspecified values in soong_config_string_variable"" am: dee36f457c am: 6f18cf01f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2058887

Change-Id: I7b6420dd3c3e00f8c2b9bb868ec3bd01c8b8cf81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:13:10 +00:00
Cole Faust
6f18cf01f7 Merge "Revert^3 "Prevent unspecified values in soong_config_string_variable"" am: dee36f457c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2058887

Change-Id: I4b49b2c4b536f40927dd5c3cddc86e12509b2ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:35:36 +00:00
Cole Faust
dee36f457c Merge "Revert^3 "Prevent unspecified values in soong_config_string_variable"" 2022-04-08 00:45:24 +00:00
Cole Faust
3aa9dacdde Revert^3 "Prevent unspecified values in soong_config_string_variable" 
This reverts commit bd86457796.

Reason for revert: More breakages

Change-Id: I9252b62444870d3d16a84254190cefb64e0a4bf3
 2022-04-08 00:42:33 +00:00
Treehugger Robot
950d51311d Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" am: 6747790e06 am: 3a7abc158e am: f2c93fbca4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057152

Change-Id: Ic3d1e2d0fb9207d92dccc2a75d4d5ccb0513f4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:51:34 +00:00
Cole Faust
416e7406ee Merge changes from topic "colefaust_mksort" am: 4cbfa0d7d3 am: bf32954188 am: a207cfdaf9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056409

Change-Id: Ib2acbe230a75a1a23e50e1302eb0cf2701b0b43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:51:18 +00:00
Treehugger Robot
f2c93fbca4 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" am: 6747790e06 am: 3a7abc158e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057152

Change-Id: I33e58c06b0c7c17acada26b9967a7a67d614d955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:28:47 +00:00
Cole Faust
a207cfdaf9 Merge changes from topic "colefaust_mksort" am: 4cbfa0d7d3 am: bf32954188 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056409

Change-Id: I908317ed68390400b4f9950c1f95e4a894bb4f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:27:57 +00:00
Treehugger Robot
3a7abc158e Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" am: 6747790e06 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057152

Change-Id: I89e33fe56ef10608277d8c9ff30cbdc501151a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:11:07 +00:00
Cole Faust
bf32954188 Merge changes from topic "colefaust_mksort" am: 4cbfa0d7d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056409

Change-Id: I3ad6de6b5f690b06e260b4a97b540d33dbea6f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:09:49 +00:00
Treehugger Robot
6747790e06 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" 2022-04-07 22:25:30 +00:00
Cole Faust
4cbfa0d7d3 Merge changes from topic "colefaust_mksort" 
* changes:
  Allow include $(sort $(wildcard */font.mk)) and variants
  Convert $(sort) to Starlark
 2022-04-07 21:59:00 +00:00
Matt Banda
ae0da713c8 Merge changes from topic "presubmit-am-4f4b7adc7dbc4c98b32a24a58a70181d" into tm-dev 
* changes:
  [automerged blank] Surface Java APIs Used By APK-only Modules. 2p: 5892457a68
  Surface Java APIs Used By APK-only Modules.
 2022-04-07 20:42:10 +00:00
Yuntao Xu
0ad0152fcf Merge "rewrite android_app to android_test in mk2bp" am: 36a0e33bad am: 212a825a9d am: 1dd1a81cfb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056410

Change-Id: Ic1665ae8894219486f5323f3a284ffbb76689035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:39:43 +00:00
Cole Faust
71e593cb2b Merge "Revert^2 "Prevent unspecified values in soong_config_string_variable""" am: c1c91c9499 am: f2e3d9b840 am: 9c51d93b3f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056528

Change-Id: I81f45eb51f38815eab69184cbb792e4dfa147464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:39:33 +00:00
Yuntao Xu
1dd1a81cfb Merge "rewrite android_app to android_test in mk2bp" am: 36a0e33bad am: 212a825a9d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056410

Change-Id: I3042157a71bae26c10f89b46e472d87bf8b2631e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:18:30 +00:00
Cole Faust
9c51d93b3f Merge "Revert^2 "Prevent unspecified values in soong_config_string_variable""" am: c1c91c9499 am: f2e3d9b840 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056528

Change-Id: Iad2ad8ab8e782d580a13c010e7eafcddd93c0c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:18:13 +00:00
Yuntao Xu
212a825a9d Merge "rewrite android_app to android_test in mk2bp" am: 36a0e33bad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056410

Change-Id: I8b174b2951b276bea3dbc6dc2f82f67e6518215f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:17:47 +00:00
Paul Duffin
54f53183ef Merge "Copy the out/soong/build_number.txt file into sdk snapshots" am: d72c85219a am: 1a8ec421bf am: 66459a510f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056132

Change-Id: I3792b60c8f39d9aec2900d5f19cab9e74ba6864b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:54:03 +00:00
Yuntao Xu
36a0e33bad Merge "rewrite android_app to android_test in mk2bp" 2022-04-07 17:53:28 +00:00
Cole Faust
f2e3d9b840 Merge "Revert^2 "Prevent unspecified values in soong_config_string_variable""" am: c1c91c9499 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056528

Change-Id: I94fa4379e9af662ff3c92d7845373667d661655b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:45:51 +00:00
Bob Badour
618eee39bf [LSC] Add LOCAL_LICENSE_KINDS to build/soong 
Added SPDX-license-identifier-Apache-2.0 to:
  provenance/tools/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I252266b48b587c4de9578a01faf076f7d9d13f5c
 2022-04-07 10:36:08 -07:00