Treehugger Robot
95a2283138
Merge "aconfig: restrict valid namespace and flag names" am: cfc5f5e9fd
am: 2d8615198c
am: 6129693adb
am: 1fe7af4274
am: 1fd419dc63
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2607087
Change-Id: I07013bc6c4f051139049b55d39a2caf303ea2f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 23:40:41 +00:00
Treehugger Robot
1fd419dc63
Merge "aconfig: restrict valid namespace and flag names" am: cfc5f5e9fd
am: 2d8615198c
am: 6129693adb
am: 1fe7af4274
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2607087
Change-Id: I637495054d4736e7ccffe8e6d5c4733acb579455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 22:54:51 +00:00
Treehugger Robot
1fe7af4274
Merge "aconfig: restrict valid namespace and flag names" am: cfc5f5e9fd
am: 2d8615198c
am: 6129693adb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2607087
Change-Id: Ic26969bbb8b273ceeabd4004e2b3ac07815fac03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 22:11:32 +00:00
Treehugger Robot
6129693adb
Merge "aconfig: restrict valid namespace and flag names" am: cfc5f5e9fd
am: 2d8615198c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2607087
Change-Id: I5fc252638c5b49648d678279cd5d9b9a91299558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 21:26:31 +00:00
Treehugger Robot
2d8615198c
Merge "aconfig: restrict valid namespace and flag names" am: cfc5f5e9fd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2607087
Change-Id: Ifb0c77ff4e3c51f8bd0dce787abb022946518c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 20:42:52 +00:00
Treehugger Robot
cfc5f5e9fd
Merge "aconfig: restrict valid namespace and flag names"
2023-05-30 19:35:48 +00:00
Jiakai Zhang
3c439ed964
Merge "Move CLC construction to Ninja phase." am: d5d51e21bf
am: 8c2c816a8a
am: ba795042a6
am: 84519942cb
am: e32095f73b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595208
Change-Id: I49938d92ecd2344bd464d5addd51e9c47e6d0e15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 19:02:34 +00:00
Jiakai Zhang
e32095f73b
Merge "Move CLC construction to Ninja phase." am: d5d51e21bf
am: 8c2c816a8a
am: ba795042a6
am: 84519942cb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595208
Change-Id: I70df6c44dbbe6e64540dbeeaf73d08ae8b943dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 17:53:59 +00:00
Jiakai Zhang
84519942cb
Merge "Move CLC construction to Ninja phase." am: d5d51e21bf
am: 8c2c816a8a
am: ba795042a6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595208
Change-Id: I57900d8af04538fb67c8e4c135314d3dd4afdd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 17:08:09 +00:00
Jiakai Zhang
ba795042a6
Merge "Move CLC construction to Ninja phase." am: d5d51e21bf
am: 8c2c816a8a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595208
Change-Id: I5b36a475c0e6b2f37988359a4eb1455224587f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 16:21:15 +00:00
Jiakai Zhang
8c2c816a8a
Merge "Move CLC construction to Ninja phase." am: d5d51e21bf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595208
Change-Id: I5db0541400045de4a6f4e56a5771fa69498021b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 15:42:08 +00:00
Jiakai Zhang
d5d51e21bf
Merge "Move CLC construction to Ninja phase."
2023-05-30 14:58:15 +00:00
Kiyoung Kim
4897c38df8
Merge "Rename soong.variable with target product" am: 6a821158b1
am: 96febf79e6
am: bdc8e89daa
am: d1ccbf1134
am: 06de078abe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2556453
Change-Id: Id35f3e8a2851f9df881429c6bf6d55f033e134fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:09:36 +00:00
Kiyoung Kim
06de078abe
Merge "Rename soong.variable with target product" am: 6a821158b1
am: 96febf79e6
am: bdc8e89daa
am: d1ccbf1134
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2556453
Change-Id: I84fd99d55bc29295aa5887cdb3f8301875963e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:26:46 +00:00
Kiyoung Kim
d1ccbf1134
Merge "Rename soong.variable with target product" am: 6a821158b1
am: 96febf79e6
am: bdc8e89daa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2556453
Change-Id: I284b3dca8b6e47db5c7e3d893e761268530e5427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 09:21:27 +00:00
Kiyoung Kim
bdc8e89daa
Merge "Rename soong.variable with target product" am: 6a821158b1
am: 96febf79e6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2556453
Change-Id: I9b0383bd44912aafc52b917ed25c0f9ca229fc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 08:33:18 +00:00
Kiyoung Kim
96febf79e6
Merge "Rename soong.variable with target product" am: 6a821158b1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2556453
Change-Id: I2ebab3ef3582650064ea40d70275ce5393f63674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 07:48:35 +00:00
Kiyoung Kim
6a821158b1
Merge "Rename soong.variable with target product"
2023-05-30 07:17:08 +00:00
Mårten Kongstad
00cf045c85
aconfig: restrict valid namespace and flag names
...
The namespace and flag names will be used as identifiers in the
auto-generated code. Place restrictions on what constitutes a valid
name.
Valid identifiers are those that match /[a-z][a-z0-9_]/. aconfig
explicitly does not implement any automatic translation to make names
valid identifiers: this sidesteps potential conflicts such as "foo.bar"
and "foo_bar" mapping to the same name if dots were translated to
underscores.
Bug: b/284252015
Test: atest aconfig.test
Change-Id: I38d005a74311e5829e540063404d1565071e6e96
2023-05-26 17:09:10 +02:00
Mårten Kongstad
654d98caa5
Merge changes from topic "aconfig-create-rust-lib" am: aa977fb083
am: 5c2756c13a
am: e6c068798d
am: e144b18ab9
am: 346da8c084
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2602726
Change-Id: I5eece6addd7dddcc1b55f0a83928ea4d06e23646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 10:35:19 +00:00
Mårten Kongstad
346da8c084
Merge changes from topic "aconfig-create-rust-lib" am: aa977fb083
am: 5c2756c13a
am: e6c068798d
am: e144b18ab9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2602726
Change-Id: I5ced5b4f63a81d0f098c0b263d238d08880acedb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 09:49:37 +00:00
Mårten Kongstad
e144b18ab9
Merge changes from topic "aconfig-create-rust-lib" am: aa977fb083
am: 5c2756c13a
am: e6c068798d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2602726
Change-Id: I84c5ac6dc692612f1caa9c45fc99be8319287c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 09:01:35 +00:00
Mårten Kongstad
e6c068798d
Merge changes from topic "aconfig-create-rust-lib" am: aa977fb083
am: 5c2756c13a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2602726
Change-Id: Ia9af25e2b899d7f5cef5c06cfd22ad90c33ab22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:49:56 +00:00
Mårten Kongstad
5c2756c13a
Merge changes from topic "aconfig-create-rust-lib" am: aa977fb083
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2602726
Change-Id: I2e708156312d2274c430a698b983b5cfe73c20ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:08:20 +00:00
Mårten Kongstad
aa977fb083
Merge changes from topic "aconfig-create-rust-lib"
...
* changes:
aconfig: first iteration of Rust codegen
aconfig: improve dump --format=debug output
2023-05-26 06:00:47 +00:00
Spandan Das
2a564550f3
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: 593b2e5ce4
am: 6090c8ee63
am: 51bb50098c
-s ours
...
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>
2023-05-26 04:15:31 +00:00
Spandan Das
7d81025212
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: 593b2e5ce4
-s ours am: 7c4129e4f5
-s ours am: 9ded812f1b
-s ours
...
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>
2023-05-26 04:12:19 +00:00
Spandan Das
ca20edddf9
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: 593b2e5ce4
am: 6090c8ee63
-s ours am: 4afa2c507e
-s ours
...
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>
2023-05-26 04:10:18 +00:00
Spandan Das
9ded812f1b
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: 593b2e5ce4
-s ours am: 7c4129e4f5
-s ours
...
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>
2023-05-26 03:29:13 +00:00
Spandan Das
51bb50098c
Create default PRODUCT_INCLUDE_TAGS in product_config am: 593b2e5ce4
am: 6090c8ee63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23435198
Change-Id: Ia99c0aaaa2fa7ce01861c0f76c15edc257beb2a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 03:28:57 +00:00
Spandan Das
4afa2c507e
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: 593b2e5ce4
am: 6090c8ee63
-s ours
...
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>
2023-05-26 03:24:42 +00:00
Spandan Das
6090c8ee63
Create default PRODUCT_INCLUDE_TAGS in product_config am: 593b2e5ce4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23435198
Change-Id: I421d3f995e63bb5b2d4a1136bcd2369912dfaa4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 02:45:18 +00:00
Spandan Das
7c4129e4f5
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: 593b2e5ce4
-s ours
...
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>
2023-05-26 02:40:51 +00:00
Spandan Das
7ffb97cb6b
Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224
am: 3639919c3b
am: 6c7fad39da
am: 89fe4dd6f0
am: b214e1ef2c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327
Change-Id: I6d3ac32780994c91ef429de2065e50779d90f03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 20:37:09 +00:00
Spandan Das
b214e1ef2c
Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224
am: 3639919c3b
am: 6c7fad39da
am: 89fe4dd6f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327
Change-Id: I224c6d1a8d61e9a4323faab991a047278ffaaed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:47:15 +00:00
Spandan Das
89fe4dd6f0
Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224
am: 3639919c3b
am: 6c7fad39da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327
Change-Id: I58412f3acf7d19fc211b30734a907bc7636e56f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:03:02 +00:00
Spandan Das
6c7fad39da
Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224
am: 3639919c3b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327
Change-Id: I9bf82a97d32e4e018e11b7e3ae6e1e9f96230166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 18:18:44 +00:00
Spandan Das
3639919c3b
Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327
Change-Id: I46fa139988d8170231cca15c8421248a1efc480c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 17:34:34 +00:00
Spandan Das
593b2e5ce4
Create default PRODUCT_INCLUDE_TAGS in product_config
...
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
2023-05-25 16:50:39 +00:00
Spandan Das
90673eb224
Merge "Create default PRODUCT_INCLUDE_TAGS in product_config"
2023-05-25 16:46:42 +00:00
Treehugger Robot
3e14bf5de0
Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19
am: b7bf0eb30b
am: 8530c7f582
am: f0b33778d1
am: b7a307e1c6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649
Change-Id: Id8c7634ea0708286d7473a1119d5030ac05053d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 14:30:26 +00:00
Treehugger Robot
e4f3acc99e
Merge "Fix merge_target_files in GRF case" am: b3adc24301
am: 592ad2cb13
am: 7c629dbb53
am: 26fda7e335
am: 90da3111c5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564310
Change-Id: Ic42ef791ca87450e1038a9154b81604d89890ead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 14:30:11 +00:00
Mårten Kongstad
f73b963283
aconfig: first iteration of Rust codegen
...
Add a new `create-rust-lib` command to generate Rust code. The output is
a src/lib.rs file; the build system is assumed to set the generated
crate's name.
For READ_ONLY flags, the generated code returns a hard-coded true or false.
For READ_WRITE flags, the generated code reaches out to DeviceConfig via
the cc_library server_configurable_flags via the
libprofcollect_libflags_rust Rust bindings. The build system is assumed
to add this to the generated crate's dependencies.
Note: libprofcollect_libflags_rust seems generic enough that it should
be moved to an official Rust wrapper for server_configurable_flags. This
is tracked in b/284096062.
Summary of module the built system is assumed to wrap the auto-generated
code in:
rust_library {
name: "lib<namespace>_rs",
crate_name: "<namespace>_rs",
edition: "2021",
clippy_lints: "none",
no_stdlibs: true,
lints: "none",
srcs: ["src/lib.rs"],
rustlibs: [
"libprofcollect_libflags_rust",
],
}
Also add a set of test input to be used in the unit tests for a more
coherent test strategy. A follow-up CL will migrate the code in
commands.rs, codegen_java.rs and codegen_cpp.rs.
Bug: 279483360
Bug: 283907905
Test: atest aconfig.test
Test: manual: create cache from files in testdata, create rust lib, add to module template above, verify the module builds
Change-Id: I02606aa3686eda921116e33f7e2df8fd1156a7aa
2023-05-25 16:18:59 +02:00
Treehugger Robot
b7a307e1c6
Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19
am: b7bf0eb30b
am: 8530c7f582
am: f0b33778d1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649
Change-Id: Ib9db9bfb3a1642358ca2555450422954ed0763d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 13:50:22 +00:00
Treehugger Robot
90da3111c5
Merge "Fix merge_target_files in GRF case" am: b3adc24301
am: 592ad2cb13
am: 7c629dbb53
am: 26fda7e335
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564310
Change-Id: Ic51dae57bae159ef3b355638ce6dfe379abfbdf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 13:49:58 +00:00
Treehugger Robot
f0b33778d1
Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19
am: b7bf0eb30b
am: 8530c7f582
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649
Change-Id: I013e166cb03ef927a5af08fb6969301d0d69850b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 13:06:22 +00:00
Treehugger Robot
26fda7e335
Merge "Fix merge_target_files in GRF case" am: b3adc24301
am: 592ad2cb13
am: 7c629dbb53
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564310
Change-Id: I5a0f0236e07f50b7d8cfa05b476734ed3f98300a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 13:06:05 +00:00
Treehugger Robot
8530c7f582
Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19
am: b7bf0eb30b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649
Change-Id: I1e4bf81cc64a0876a4f8a7e0c022a62233a9e744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 12:21:06 +00:00
Treehugger Robot
7c629dbb53
Merge "Fix merge_target_files in GRF case" am: b3adc24301
am: 592ad2cb13
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564310
Change-Id: Icbbb3f0aea90b72d62590bed1e540ab67709c7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 12:20:50 +00:00
Treehugger Robot
b7bf0eb30b
Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649
Change-Id: Ia7bf4f85f58b628bc94b37610fca072bfc44d302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 11:38:09 +00:00