Commit graph

78686 commits

Author SHA1 Message Date
Xin Li
25e7578344 Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master 2022-04-03 06:41:19 +00:00
Jiyong Park
edd9f8aa7f Merge "Update VNDK libraries list after the API freeze for TM" into tm-dev 2022-04-02 00:15:20 +00:00
Bob Badour
061d7e6f2b Support more dependencies for license metadata.
Bug: 213388645

Test: m vts reportmissinglicenses

Change-Id: I8de06c802d2397d02d9c2152f764b1d5ea2f795c
2022-04-01 16:02:40 -07:00
Cole Faust
7679a8e6aa Merge "Fix inheritance order" am: 5e0edffa3c am: 2fbf34c207 am: 12c4475814
Original change: https://android-review.googlesource.com/c/platform/build/+/2052013

Change-Id: I2192fa725afb35f090ab1621e4c183d07ae11386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 21:02:36 +00:00
Cole Faust
12c4475814 Merge "Fix inheritance order" am: 5e0edffa3c am: 2fbf34c207
Original change: https://android-review.googlesource.com/c/platform/build/+/2052013

Change-Id: I7cee84a655c9b1bbc6e86883708bd200c0af434e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 20:49:40 +00:00
Xin Li
f36e10b1f9 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Ib35026f71208afa53f33ee9967cd9acb88a73d0d
Change-Id: If4821c4f2d7e8a0c1cae728a7719be33277a1b2e
2022-04-01 20:37:49 +00:00
Cole Faust
2fbf34c207 Merge "Fix inheritance order" am: 5e0edffa3c
Original change: https://android-review.googlesource.com/c/platform/build/+/2052013

Change-Id: I69db78ce32929c298206c5ae7d2d18f9d94b1ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 20:21:29 +00:00
Cole Faust
5e0edffa3c Merge "Fix inheritance order" 2022-04-01 19:55:21 +00:00
Cole Faust
bbc27ea077 Make dir work on multiple paths
To increase its feature parity with our notdir
implementation and gnu make.

Bug: 227245326
Test: Manually
Change-Id: Ied975f934d7af963e0099054c416f0d364aec8f9
2022-04-01 12:09:40 -07:00
Yihan Dong
e45ff68740 Add additional license dependencies for VTS
Bug: 213388645
Test: m vts
Change-Id: I5f0b35b5ec943f5628f118bf0812391047b49708
2022-04-01 09:35:27 +00:00
Lucas Wei
4da8bbe987 Merge "Remove ALL_GENERATED_SOURCES" am: 20ba096e0a am: 766d8ec746 am: 85f3330d6c
Original change: https://android-review.googlesource.com/c/platform/build/+/2043036

Change-Id: I344c51da9578f73b091dc5e52c918f3ecfa6daf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 04:05:38 +00:00
Lucas Wei
85f3330d6c Merge "Remove ALL_GENERATED_SOURCES" am: 20ba096e0a am: 766d8ec746
Original change: https://android-review.googlesource.com/c/platform/build/+/2043036

Change-Id: Iaa8abf62ec376e5d846937bc7823345bb9c0e280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 03:45:01 +00:00
Lucas Wei
766d8ec746 Merge "Remove ALL_GENERATED_SOURCES" am: 20ba096e0a
Original change: https://android-review.googlesource.com/c/platform/build/+/2043036

Change-Id: I04eae544637a2e9e64dc777dfc916a8f9ae26aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 03:20:09 +00:00
Lucas Wei
20ba096e0a Merge "Remove ALL_GENERATED_SOURCES" 2022-04-01 03:00:10 +00:00
Cole Faust
670c587c09 Fix inheritance order
The children to inherit from were not sorted. This
wasn't a problem for list variables, because all those
inheritances get merged together based on the @inherit/
values in the list variables. But for single value variables
it made a difference.

Bug: 226206409
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ib56bbb91a79fe8c7cb780c253f5bd8d6c0e87765
2022-03-31 17:30:35 -07:00
Colin Cross
44db5fc65c Merge "Reset permissions after unzipping jars" am: bcabb923dc am: 82a15e7798 am: c28d43119f
Original change: https://android-review.googlesource.com/c/platform/build/+/2050411

Change-Id: I0e053c91cc8a57e7f79f08eb1681a5998d349bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 20:51:40 +00:00
Colin Cross
c28d43119f Merge "Reset permissions after unzipping jars" am: bcabb923dc am: 82a15e7798
Original change: https://android-review.googlesource.com/c/platform/build/+/2050411

Change-Id: Ib35026f71208afa53f33ee9967cd9acb88a73d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 20:36:53 +00:00
Colin Cross
82a15e7798 Merge "Reset permissions after unzipping jars" am: bcabb923dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2050411

Change-Id: Iee8425b382281d1b85664153025132eee9d755bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 20:21:06 +00:00
Colin Cross
bcabb923dc Merge "Reset permissions after unzipping jars" 2022-03-31 19:35:06 +00:00
Trevor Radcliffe
74a4de735b Make changes to support test_suites for test lib
Had to make changes to make to ensure that we don't duplicate

Bug: 226402757
Test: Confirmed that libraries are installed to the correct place
Change-Id: I64e4a5ab7cac3fb57442d19b0f796fffb0a3f48a
2022-03-31 18:15:58 +00:00
Treehugger Robot
a35c859df7 Merge "Support per-partition settings for os_version AVB props" am: 4a723d0ecf am: f2ed2638d2 am: fd3cabf6cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2049103

Change-Id: I0dd1df61f6810c0f5821c44f12c1452a2bae3e78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 03:24:30 +00:00
Colin Cross
a8ac282038 Reset permissions after unzipping jars
Jars unzipped for jacoco instrumentation may contain nonsensical
permissions.  Use chmod -R =rwX to apply the current umask to all
the files and add the execute bit to directories.

Bug: 227470935
Test: manual
Change-Id: I52667ec3f0b8b8ce64b57fab088ca9d20cf561e1
2022-03-30 20:05:34 -07:00
Treehugger Robot
fd3cabf6cf Merge "Support per-partition settings for os_version AVB props" am: 4a723d0ecf am: f2ed2638d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2049103

Change-Id: Ib984b03d68527107043ad4c43517e8240fd2e345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 03:02:58 +00:00
Treehugger Robot
f2ed2638d2 Merge "Support per-partition settings for os_version AVB props" am: 4a723d0ecf
Original change: https://android-review.googlesource.com/c/platform/build/+/2049103

Change-Id: I9c4f42eae5a353c98621cb7bced1147f01c5e9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 02:46:48 +00:00
Treehugger Robot
4a723d0ecf Merge "Support per-partition settings for os_version AVB props" 2022-03-31 02:27:04 +00:00
Jiyong Park
7d31be765b Update VNDK libraries list after the API freeze for TM
Bug: 225941299
Test: m
Change-Id: I13c91e2fbaef79c5016f32d4cdc7cce8f262894e
2022-03-31 11:08:39 +09:00
Treehugger Robot
6d9c577359 Merge "Build modules from source for module products." am: 06f7176fc6 am: cbe2b0a7a9 am: f1d08ac906
Original change: https://android-review.googlesource.com/c/platform/build/+/2020203

Change-Id: Ic402f43b7ab810dc7a7039dcdd816e211c4ffee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:44:01 +00:00
Treehugger Robot
f1d08ac906 Merge "Build modules from source for module products." am: 06f7176fc6 am: cbe2b0a7a9
Original change: https://android-review.googlesource.com/c/platform/build/+/2020203

Change-Id: I5dda82bdfe84e323ea2120b9c2ea6285e2b873f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:15:25 +00:00
Treehugger Robot
cbe2b0a7a9 Merge "Build modules from source for module products." am: 06f7176fc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2020203

Change-Id: I293f368dbe3f33196041e7a77a89def98a272095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:58:53 +00:00
Cole Faust
42d34135be Merge "Update paths to mk2rbc/rbcrun" am: 4f414a9f52 am: 79e86e7fcc am: b203ae3da8
Original change: https://android-review.googlesource.com/c/platform/build/+/2043368

Change-Id: I4611ecae219acd088860084397ab4579fd20516c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:44:02 +00:00
Treehugger Robot
a92032b7c6 Merge "add flag to skip soong tests for b command" am: 375dd60d5a am: 9244deabb0 am: 6fa65aef1c
Original change: https://android-review.googlesource.com/c/platform/build/+/2045666

Change-Id: I9b51987a12706961df931277d186c5a467c239bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:43:50 +00:00
Treehugger Robot
06f7176fc6 Merge "Build modules from source for module products." 2022-03-30 20:41:53 +00:00
Cole Faust
b203ae3da8 Merge "Update paths to mk2rbc/rbcrun" am: 4f414a9f52 am: 79e86e7fcc
Original change: https://android-review.googlesource.com/c/platform/build/+/2043368

Change-Id: If646d6106cbcc1fc88b51014da3a12f5bd8777e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:20:42 +00:00
Treehugger Robot
6fa65aef1c Merge "add flag to skip soong tests for b command" am: 375dd60d5a am: 9244deabb0
Original change: https://android-review.googlesource.com/c/platform/build/+/2045666

Change-Id: Ia62bc9642e7f2d2a688a19e5ca166987acb36057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:20:13 +00:00
Cole Faust
79e86e7fcc Merge "Update paths to mk2rbc/rbcrun" am: 4f414a9f52
Original change: https://android-review.googlesource.com/c/platform/build/+/2043368

Change-Id: I419b7e652008741824a1ea712c63603d4f05dbc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:56:04 +00:00
Treehugger Robot
9244deabb0 Merge "add flag to skip soong tests for b command" am: 375dd60d5a
Original change: https://android-review.googlesource.com/c/platform/build/+/2045666

Change-Id: I0568692ad79045a6d992e65559ed7411016a6295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:55:13 +00:00
Roopa Sattiraju
a2411e4b68 Copy com_google_android_bluetooth_services certs for sepolicy
BUG: 226403247
Test: TH
Change-Id: I6cf4e9fa1f2e5a2e628f10b1e734b2a8c8df61fc
2022-03-30 12:53:40 -07:00
Cole Faust
4f414a9f52 Merge "Update paths to mk2rbc/rbcrun" 2022-03-30 19:43:06 +00:00
Treehugger Robot
375dd60d5a Merge "add flag to skip soong tests for b command" 2022-03-30 19:27:45 +00:00
Cole Faust
62878a2cef Remove regex functionality from rbcrun
As a first step to making .rbc files compatible with bazel,
remove regex support since bazel doesn't have it.

Fixes: 227384703
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I8b946c20cc42897a47a5516a167732f4e16b6158
2022-03-30 12:00:15 -07:00
Martin Stjernholm
47dcbeaefb Build modules from source for module products.
This overrides the branch default
(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE) if it is set to use
prebuilts.

Test: build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns false with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=module_arm64 \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns true with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=mainline_modules_x86 \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns true with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Test: env TARGET_PRODUCT=redfin \
      build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
  returns false with BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE:=false
  in internal
Bug: 222723757
Change-Id: I0faea006b0e95eff40bbfbe00cc74ba5985beeba
2022-03-30 18:16:51 +01:00
Treehugger Robot
b418d7a46a Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." am: ddfa3ff19c am: c64f248280 am: 57d7999f5a
Original change: https://android-review.googlesource.com/c/platform/build/+/2045278

Change-Id: I6b3a92c2aadb16e762316cd68dd23d5f3a8a07e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 12:11:25 +00:00
Treehugger Robot
57d7999f5a Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." am: ddfa3ff19c am: c64f248280
Original change: https://android-review.googlesource.com/c/platform/build/+/2045278

Change-Id: I8ff931bbd95218c40e3f08b49bcbf06720b99764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 11:46:52 +00:00
Treehugger Robot
c64f248280 Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." am: ddfa3ff19c
Original change: https://android-review.googlesource.com/c/platform/build/+/2045278

Change-Id: I8a487ebbc8bfabfbc36a80d8a23b44a1f114d82a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 11:23:49 +00:00
Treehugger Robot
ddfa3ff19c Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." 2022-03-30 11:06:46 +00:00
Bowgo Tsai
b0f436386f Support per-partition settings for os_version AVB props
The value of the AVB properties are parsed by the device
bootloader, which might expect a different format of the value.
Allowing them to have per-device settings.

The default value of those per-partition os_version is
$(PLATFORM_VERSION_LAST_STABLE), which is usually an integer,
e.g., 12.

Bug: 211364958
Test: build then `avbtool info_image`
Change-Id: I2005df615c0ff35622030baa2477e29d9d20e94f
2022-03-30 11:52:39 +08:00
Treehugger Robot
518142885e Merge "Exclude deprecated variables from dump-variables-rbc" am: 0b7aea6dc5 am: a48a2935f3 am: 5c714e950c
Original change: https://android-review.googlesource.com/c/platform/build/+/2042024

Change-Id: I33219a584c87e0f67635edc1f3e273e59a2f3ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 02:51:48 +00:00
Treehugger Robot
5c714e950c Merge "Exclude deprecated variables from dump-variables-rbc" am: 0b7aea6dc5 am: a48a2935f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2042024

Change-Id: I4678710787f617a83230ce6fd5f81bfee5e3c016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 02:37:06 +00:00
Treehugger Robot
a48a2935f3 Merge "Exclude deprecated variables from dump-variables-rbc" am: 0b7aea6dc5
Original change: https://android-review.googlesource.com/c/platform/build/+/2042024

Change-Id: Idedb905ce9f3d34438aeade12295840a3f0530da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 02:19:19 +00:00
Treehugger Robot
0b7aea6dc5 Merge "Exclude deprecated variables from dump-variables-rbc" 2022-03-30 02:03:23 +00:00