Commit Graph

50871 Commits

Author SHA1 Message Date
Colin Cross
f2c86c8c76 Merge changes I046d75db,Ie13817dc am: d2aa190bdc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2058908

Change-Id: Ia6f464f84187a7519c2123a7d0e01dae4544efa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 23:43:26 +00:00
Colin Cross
d2aa190bdc Merge changes I046d75db,Ie13817dc
* changes:
  Don't panic if no certificates found
  Move proguard test files to java package
2022-04-11 23:24:06 +00:00
Alix Espino
dc338ac418 Merge "moved comment to describe Afdo bool" am: 8c81305c80
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057880

Change-Id: Ib42a263a8bed6bde3ba39447a0a066aeb3610c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 19:37:58 +00:00
Alix Espino
8c81305c80 Merge "moved comment to describe Afdo bool" 2022-04-11 19:16:28 +00:00
Colin Cross
412436f7fe Don't panic if no certificates found
Getting the first certificate will panic if there are no certificates,
which can happen when AllowMissingDependencies is set and the
certificate property is a module reference to a missing module.
Only get the first certificate if the list is not nil.

Bug: 228379411
Test: TestAppMissingCertificateAllowMissingDependencies
Change-Id: I046d75dbbd4f21f4a2b6851f558e430e9879fcff
2022-04-11 11:50:34 -07:00
Colin Cross
abc0dab477 Move proguard test files to java package
The proguard test files are duplicated in apex and sysprop and will
be needed by app tests, move them to the java package.

Test: run all soong tests
Change-Id: Ie13817dcda8d98801d16a97ffceef1100c7d5380
2022-04-11 11:44:32 -07:00
Albert Martin
5dddca08bd Merge "Flag to globally override apexes' min_sdk_version" am: 26ef058655
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059889

Change-Id: I4f5470ca60bf95a9766c58b31a4cbfa9c52f9099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 12:48:42 +00:00
Albert Martin
26ef058655 Merge "Flag to globally override apexes' min_sdk_version" 2022-04-11 12:29:09 +00:00
Treehugger Robot
af8e9c73e6 Merge "convert logtags in java srcs" am: b6e1614272
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042847

Change-Id: I65b70f5592f8c3f2cfbb5158d3b68bad4502a117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:58:07 +00:00
Treehugger Robot
b6e1614272 Merge "convert logtags in java srcs" 2022-04-08 22:37:22 +00:00
Alix
40216ae88b moved comment to describe Afdo bool
Test: just added a comment, no tests performed.

Change-Id: Id921b808462600e889ee8fda532a3305821692b2
2022-04-08 18:57:30 +00:00
Albert Martin
eefabcf321 Flag to globally override apexes' min_sdk_version
Override all mainline updateable apexes' min_sdk_version
to same version to get single shared native libs on DCLA.

Test: Run "vendor/google/build/go/mainline_go_modules_arm.sh" and inspect built apexes
Bug: 212609891
Change-Id: Ide7d3f2bc772ac6240f1c917b87285d051d6f605
Merged-In: Ide7d3f2bc772ac6240f1c917b87285d051d6f605
2022-04-08 17:51:07 +00:00
Treehugger Robot
3258cf45ec Merge "Add the handle to artifact path requirement functions" am: 19da477d4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2035363

Change-Id: I206d810a4659a27f9dd8a02a2408957830144255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:50:48 +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
19da477d4d Merge "Add the handle to artifact path requirement functions" 2022-04-08 17:32:25 +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
Sam Delmerico
24da73c032 convert logtags in java srcs
Some java_* modules contain .logtag files in their srcs, but we should
separate these out into their own targets.

Test: enabled QuickSearchBox and build
Change-Id: I595722ca59686d450ff522987a15ce283d3607e0
2022-04-08 14:43:18 +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
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
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
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
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
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
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
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
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
Cole Faust
c1c91c9499 Merge "Revert^2 "Prevent unspecified values in soong_config_string_variable""" 2022-04-07 17:14:46 +00:00
Paul Duffin
1a8ec421bf Merge "Copy the out/soong/build_number.txt file into sdk snapshots" am: d72c85219a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056132

Change-Id: I65933c6250c4a6b0c26948518f7fdde1b4eca24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:08:19 +00:00
Paul Duffin
d72c85219a Merge "Copy the out/soong/build_number.txt file into sdk snapshots" 2022-04-07 16:46:02 +00:00
Yi Kong
88b94eac7c Move PGO profiles to its own subdir
This separates out AFDO profiles from PGO profiles.

Test: presubmit
Change-Id: I2c0b710199cae31773bd6c3b29a0ca7a4e338b47
2022-04-07 23:54:28 +08:00
Treehugger Robot
4fef0e2167 Merge "Enable deprecated-enum-enum-conversion warning" am: 2c3999050b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057428

Change-Id: I84d54a586639338db3b8852a851df5deb24b9d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 12:07:08 +00:00
Treehugger Robot
2c3999050b Merge "Enable deprecated-enum-enum-conversion warning" 2022-04-07 11:46:12 +00:00
Cole Faust
62e0511202 Allow include $(sort $(wildcard */font.mk)) and variants
Include/inherit-product calls already allow asterisks, the
wildcard is not necessary. If we see an include using $(wildcard),
act as if it doesn't exist.

Bug: 218736658
Test: go test
Change-Id: Ib21007a2042fbfaa95c07571792983e14135a035
2022-04-06 16:37:54 -07:00
Colin Cross
c83c994e81 Merge "sbox: report the script path instead of the full command line" am: 70b9a7e493
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2055426

Change-Id: I73dd84580692d98a8e8f6328170bf519790d10af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:06:36 +00:00
Colin Cross
39f00ed9da Merge "symbols_map: don't error on bad elf files" am: 07907127b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056929

Change-Id: Idf4dd208199aa364d486775614f0bf72b9a7b8ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:06:23 +00:00
Colin Cross
70b9a7e493 Merge "sbox: report the script path instead of the full command line" 2022-04-06 20:11:20 +00:00
Liz Kammer
d5aa079291 Clean up allowlist contents.
Test: mixed_droid.sh
Test: bp2build.sh
Change-Id: I6d00a55400e7843899c71be3de9e52403ba26f55
2022-04-06 15:26:15 -04:00