am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23435198
Change-Id: Ic9b3b6725de40fabcc8e6a5fe1b6657472583387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23435198
Change-Id: I8cd6b7957fcc87997cf68942bfaeedb3ee68cbea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23435198
Change-Id: I3f4e82ffb57c1482e63c45c38bcb50664ff90920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23435198
Change-Id: I76a7f0803f2d8964f6fd26a8ff46425bacb26848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23435198
Change-Id: Ia2b56a398259d033c7922194fe2ce93c623cf93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23435198
Change-Id: If8fe0992ae2a33b6c872ce5d94e90c91b7354210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
In the current setup in partner branch, we
1. Add blueprint_package_includes to prebuilts/module_sdk/*
2. Add the correct PRODUCT_INCLUDE_TAGS to partner_modules
This means in those setups,none of the prebuilts are visible to aosp products since
they they do not inherit partner_module makefiles.
```
e.g.
prebuilts/module_sdk/art/current/Android.bp
prebuilts/module_sdk/art/<go_specific>/current/Android.bp
// aosp_arm cannot find either
```
To solve this, this CL creates a default inclusion tag for all products
that do not set any PRODUCT_INCLUDE_TAGS explicitly.
In the previous example, Soong analysis of aosp_* will use
prebuilts/module_sdk/art/current/Android.bp. This should be a no-op for
aosp and internal branches since none of the Android.bp files today contains
blueprint_package_includes
Test: m nothing for aosp_arm in the test branch of b/278604467#comment20
Test: m nothing for partner product that uses big android sdk
Test: m nothing for partner product that uses go sdk
Bug: 278604467
(cherry picked from https://android-review.googlesource.com/q/commit:2e69ea622877e7f88b82db4adbc284b9342f8c2c)
Merged-In: I322b52c34ed339989207609dd0fd23c27ed1f697
Change-Id: I322b52c34ed339989207609dd0fd23c27ed1f697
cp required as per b/278604467#comment25
The sysprop to enable/disable AB OTA update is in vendor partition,
but the sysprop which stores list of AB partitions is in product(which
is on system side of treble boundary). This is inconsistent and might
cause problems during mixed build. To mitigate, add a copy of AB
partition list prop in vendor, and readers of this prop will prefer the
vendor copy instead.
Bug: 283042235
Test: th
Change-Id: Idd73971817f663b08824e285d840ed8d8dd60d2c
am skip reason: Merged-In Ic8eb42c369de8c94c7977b9631ff4b9084dfef01 with SHA-1 6284936f20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23397981
Change-Id: Ic6a5d0db1f88cf995110d66583786c3b9e3d55ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ic8eb42c369de8c94c7977b9631ff4b9084dfef01 with SHA-1 6284936f20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23397981
Change-Id: I43f4111dc4ca5a93e4884beb7fa4c0b2ba4b08d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ic8eb42c369de8c94c7977b9631ff4b9084dfef01 with SHA-1 16e7aa3c2e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23397981
Change-Id: Id0c136b8637688cbbc2603a9ba89271d94bbb736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ic8eb42c369de8c94c7977b9631ff4b9084dfef01 with SHA-1 6284936f20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23397981
Change-Id: I76e21246b811360f2c40c059b3edaf8ddce3f946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ic8eb42c369de8c94c7977b9631ff4b9084dfef01 with SHA-1 16e7aa3c2e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23397981
Change-Id: I8416521be5af72b3adea950fe24d9b3c94b5fdc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ic8eb42c369de8c94c7977b9631ff4b9084dfef01 with SHA-1 16e7aa3c2e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23397981
Change-Id: I77be618e08a1d35fc7804da0bbcc21b1ad8dbf80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
