StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,823 Commits 1 Branch 0 Tags
20f9129bafcf61afb395e470ab62da4f7627d60b
Commit Graph

76823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Garside
20f9129baf Add the ability for a java_sdk_library to depend on another. am: e570ace2e4 am: b5429e879e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844082

Change-Id: Id586e97d13ab3602207873308e5b4ec483744da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 16:45:45 +00:00
Jamie Garside
b5429e879e Add the ability for a java_sdk_library to depend on another. am: e570ace2e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844082

Change-Id: Iac17dd61875b799fbf6d399401beffc89d463e9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 16:15:50 +00:00
Treehugger Robot
de0f34a3cd Merge "Sandbox libbssl_sys_src_nostd" into main am: 40b8b16042 am: df87e309e7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844846

Change-Id: I0110d27ee8aa6ff44beeb99e3e306ea2fc429cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 12:10:25 +00:00
Jamie Garside
e570ace2e4 Add the ability for a java_sdk_library to depend on another. 
This simply exports all of the uses_libs: [] libraries into a
"dependency=''" statement in the generated XML file (with the <library>
stanza in it).

Test: `go test` in java/
Bug: 184396657

NOTE FOR REVIEWERS - original patch and result patch are not identical.
PLEASE REVIEW CAREFULLY.
Diffs between the patches:
 func formattedDependenciesAttribute(dependencies []string) string {
> +	if dependencies == nil {
> +		return ""
> +	}
> +	return fmt.Sprintf(`        dependency=\"%s\"\n`, strings.Join(dependencies, ":"))
> +}
> +
> +	dependenciesAttr := formattedDependenciesAttribute(module.properties.Uses_libs_dependencies)
> +		dependenciesAttr,
> --- java/sdk_library_test.go
> +++ java/sdk_library_test.go
> +
> +func TestSdkLibraryDependency(t *testing.T) {
> +	result := android.GroupFixturePreparers(
> +		prepareForJavaTest,
> +		PrepareForTestWithJavaSdkLibraryFiles,
> +		FixtureWithPrebuiltApis(map[string][]string{
> +			"30": {"bar", "foo"},
> +		}),
> +	).RunTestWithBp(t,
> +		`
> +		java_sdk_library {
> +			name: "foo",
> +			srcs: ["a.java", "b.java"],
> +			api_packages: ["foo"],
> +		}
> +		
> +		java_sdk_library {
> +			name: "bar",
> +			srcs: ["c.java", "b.java"],
> +			libs: [
> +				"foo",
> +			],
> +			uses_libs: [
> +				"foo",
> +			],
> +		}
> +`)
> +	
> +	barPermissions := result.ModuleForTests("bar.xml", "android_common").Rule("java_sdk_xml")
> +	
> +	android.AssertStringDoesContain(t, "bar.xml java_sdk_xml command", barPermissions.RuleParams.Command, `dependency=\"foo\"`)
> +}

Original patch:
 diff --git a/java/sdk_library.go b/java/sdk_library.go
old mode 100644
new mode 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1993,6 +1993,7 @@
 		Min_device_sdk            *string
 		Max_device_sdk            *string
 		Sdk_library_min_api_level *string
+		Uses_libs_dependencies    []string
 	}{
 		Name:                      proptools.StringPtr(module.xmlPermissionsModuleName()),
 		Lib_name:                  proptools.StringPtr(module.BaseModuleName()),
@@ -2002,6 +2003,7 @@
 		Min_device_sdk:            module.commonSdkLibraryProperties.Min_device_sdk,
 		Max_device_sdk:            module.commonSdkLibraryProperties.Max_device_sdk,
 		Sdk_library_min_api_level: &moduleMinApiLevelStr,
+		Uses_libs_dependencies:    module.usesLibraryProperties.Uses_libs,
 	}
 
 	mctx.CreateModule(sdkLibraryXmlFactory, &props)
@@ -2968,6 +2970,11 @@
 	//
 	// This value comes from the ApiLevel of the MinSdkVersion property.
 	Sdk_library_min_api_level *string
+
+	// Uses-libs dependencies that the shared libra
[[[Original patch trimmed due to size. Decoded string size: 3559. Decoded string SHA1: 67fbd040aa818732a686514c4556850c8c36dc8d.]]]

Result patch:
 diff --git a/java/sdk_library.go b/java/sdk_library.go
index fb27812..fbfe509 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1993,6 +1993,7 @@
 		Min_device_sdk            *string
 		Max_device_sdk            *string
 		Sdk_library_min_api_level *string
+		Uses_libs_dependencies    []string
 	}{
 		Name:                      proptools.StringPtr(module.xmlPermissionsModuleName()),
 		Lib_name:                  proptools.StringPtr(module.BaseModuleName()),
@@ -2002,6 +2003,7 @@
 		Min_device_sdk:            module.commonSdkLibraryProperties.Min_device_sdk,
 		Max_device_sdk:            module.commonSdkLibraryProperties.Max_device_sdk,
 		Sdk_library_min_api_level: &moduleMinApiLevelStr,
+		Uses_libs_dependencies:    module.usesLibraryProperties.Uses_libs,
 	}
 
 	mctx.CreateModule(sdkLibraryXmlFactory, &props)
@@ -2968,6 +2970,11 @@
 	//
 	// This value comes from the ApiLevel of the MinSdkVersion property.
 	Sdk_library_min_api_level *string
+
+	// Uses-libs dependencies that the shared library
[[[Result patch trimmed due to size. Decoded string size: 3614. Decoded string SHA1: b5730ecbeeaad420439ddb67eaaa9150ede94585.]]]

Change-Id: I73f69e2a4573e416492f68e083fe739f3f75b721
 2023-11-27 12:07:36 +00:00
Treehugger Robot
fc319cc18b Merge "Sandbox libbssl_sys_src_nostd" into main am: 40b8b16042 am: 3cda4737b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844846

Change-Id: I695e9cd0eaaa75a91b7f6c2cf681d16a8e392330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 11:50:35 +00:00
Treehugger Robot
df87e309e7 Merge "Sandbox libbssl_sys_src_nostd" into main am: 40b8b16042 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844846

Change-Id: I45b58a1b1735dbdf76711a0b2c419d2f55c62276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 11:21:39 +00:00
Treehugger Robot
3cda4737b1 Merge "Sandbox libbssl_sys_src_nostd" into main am: 40b8b16042 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2844846

Change-Id: I8c7125deece5e76c582413047668bf068e5080a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 11:15:47 +00:00
Treehugger Robot
40b8b16042 Merge "Sandbox libbssl_sys_src_nostd" into main 2023-11-27 10:28:27 +00:00
Seungjae Yoo
f6045e44d4 Merge "Support adding AVB properties into vbmeta module" into main am: 55edc0cd2d am: 78dc82ef19 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842913

Change-Id: Ib751ea38812b0d03eb390e26b559e90ac66adaca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 03:28:59 +00:00
Seungjae Yoo
78dc82ef19 Merge "Support adding AVB properties into vbmeta module" into main am: 55edc0cd2d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842913

Change-Id: I99ece682c5cb77922ce385b25c5e975845517046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 02:58:58 +00:00
Seungjae Yoo
5e537631d1 Merge "Support adding AVB properties into vbmeta module" into main am: 55edc0cd2d am: f259847179 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842913

Change-Id: Ic772949aa71d4e7315a02f736794cbe7444504eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 02:53:42 +00:00
Seungjae Yoo
f259847179 Merge "Support adding AVB properties into vbmeta module" into main am: 55edc0cd2d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842913

Change-Id: I6d5608c94856f1202ed8aa4a3ede2a70d7a90b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 02:16:34 +00:00
Seungjae Yoo
55edc0cd2d Merge "Support adding AVB properties into vbmeta module" into main 2023-11-24 01:21:46 +00:00
Treehugger Robot
c6c73ab8ae Merge "Sandbox r8retrace genrules" into main am: d766a44530 am: 6bafd299ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839048

Change-Id: I061c5cfe7a407ee1236287f196ea077cb30f57fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 01:30:03 +00:00
Treehugger Robot
fe422a7c8c Merge "Sandbox r8retrace genrules" into main am: d766a44530 am: 9d711fd36b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839048

Change-Id: I5cbc2bc9b67c04ea63d68d996096c3c69c139473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 00:58:10 +00:00
Treehugger Robot
6bafd299ba Merge "Sandbox r8retrace genrules" into main am: d766a44530 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839048

Change-Id: I68e7916db265849c3f08c2a3bad3496b7eb30166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 00:56:29 +00:00
Treehugger Robot
9d711fd36b Merge "Sandbox r8retrace genrules" into main am: d766a44530 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839048

Change-Id: Ia294def8684a6254f4c1466c9d021047079322f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 00:26:08 +00:00
Treehugger Robot
d766a44530 Merge "Sandbox r8retrace genrules" into main 2023-11-23 00:17:28 +00:00
Cole Faust
1ddb8125d3 Sandbox libbssl_sys_src_nostd 
go/roboleaf-busy-beavers-sandboxing

gensrcs should require output_extension to be set, when it's not,
you get some weird filename like `lib.`. Switch to genrules for
simplicity.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py libbssl_sys_src_nostd
Change-Id: I4ec2686c560439c3150b74b14e313ed6b688720c
 2023-11-22 15:23:50 -08:00
Cole Faust
1ba492856c Merge "Sandbox trout genrules" into main am: 954ef637e9 am: 4c03effb1c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843839

Change-Id: I358649aec604f1de7af424061f324894b60d1bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 22:54:18 +00:00
Cole Faust
c84f082e5a Merge "Sandbox trout genrules" into main am: 954ef637e9 am: c7cb39b22a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843839

Change-Id: If95a893d5ea7a23faa8be0fa67b2d706e27995f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 22:53:58 +00:00
Cole Faust
4c03effb1c Merge "Sandbox trout genrules" into main am: 954ef637e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843839

Change-Id: I0eb1b90c6fe385d58336fd8621624d313b8444c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 22:17:57 +00:00
Cole Faust
c7cb39b22a Merge "Sandbox trout genrules" into main am: 954ef637e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843839

Change-Id: Ie7d3fe9e65fd5a6fb00525dd5884bc422ca7aa82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 22:14:53 +00:00
Cole Faust
954ef637e9 Merge "Sandbox trout genrules" into main 2023-11-22 22:05:42 +00:00
Matthew Maurer
db0be340bc Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main am: b103659c0b am: 52c4c1fb09 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839054

Change-Id: I3693c6fdbf769436fb8a194398113ac44cd7526a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 21:42:02 +00:00
Treehugger Robot
0b51bee9a6 Merge "Enable sandboxing for pigweed gnerules" into udc-dev-plus-aosp am: afd6ab2142 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25453393

Change-Id: I2f6b49e576ce5587c7f0c5b80d988b319f46167c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 21:34:49 +00:00
Cole Faust
f0bdebff0e Sandbox atest_integration_fake_src am: f7474880a1 am: e58afa3c97 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842066

Change-Id: I7b9a55c0bd49d94f28acfaf533e7c37ac4d79ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 21:27:57 +00:00
Treehugger Robot
0b10f181d0 Merge "Enable sandboxing for pigweed gnerules" into aosp-main-future am: 6b7fff1b54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25453413

Change-Id: Ibf41b048ef22b7236d37ce9245d2ff261835a8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 21:27:12 +00:00
Matthew Maurer
57d0141cbe Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main am: b103659c0b am: 7a9add567b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839054

Change-Id: I21b1e3ca0ee72f59dce175671691ba5a28da6727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 21:25:37 +00:00
Cole Faust
15beff1ad5 Sandbox atest_integration_fake_src am: f7474880a1 am: 58de780771 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842066

Change-Id: Iaffe42d87e4aee43e8a56fac225a9afe9dd5b398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 21:08:56 +00:00
Treehugger Robot
6b7fff1b54 Merge "Enable sandboxing for pigweed gnerules" into aosp-main-future 2023-11-22 20:53:27 +00:00
Matthew Maurer
52c4c1fb09 Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main am: b103659c0b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839054

Change-Id: Ie743ed76d307a7993371ade2e12ea40380a5196e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 20:53:08 +00:00
Matthew Maurer
7a9add567b Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main am: b103659c0b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839054

Change-Id: Iee1f31750001f2f7b6b2f23c9368380c7d95bf96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 20:51:18 +00:00
Matthew Maurer
b103659c0b Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main 
* changes:
  rust: Resolve crate roots outside rust-project
  rust: Cache crateRootPath to avoid ctx
  rust: internalize srcPathFromModuleSrcs
  rust: move crateRootPath to compiler
  rust: Privatize Cargo* methods on compiler
  rust: Move compiler interface to compiler.go
 2023-11-22 20:37:27 +00:00
Treehugger Robot
afd6ab2142 Merge "Enable sandboxing for pigweed gnerules" into udc-dev-plus-aosp 2023-11-22 20:31:28 +00:00
Cole Faust
e58afa3c97 Sandbox atest_integration_fake_src am: f7474880a1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842066

Change-Id: I9d69c1ddbea72523921fd6e5bd343f63aa22b273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 20:19:57 +00:00
Cole Faust
58de780771 Sandbox atest_integration_fake_src am: f7474880a1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842066

Change-Id: Ib1dceb07294f3b9077d36dc569be7a5de3695dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 20:18:14 +00:00
Cole Faust
28e46107cf Sandbox trout genrules 
These were fixed in aosp/2838463, aosp/2839595, pa/2668052, and
pa/2668054.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py TracingVMProtoStub_cc TracingVMProtoStub_h VehicleServerProtoStub_cc@default-grpc VehicleServerProtoStub_cc@2.0-grpc-trout VehicleServerProtoStub_h@2.0-grpc-trout VehicleServerProtoStub_h@default-grpc
Change-Id: I9d21d608773e2974f8fca8af4dd16a654e8eb128
 2023-11-22 12:09:27 -08:00
Cole Faust
eda7420e0e Enable sandboxing for pigweed gnerules 
go/roboleaf-busy-beavers-sandboxing

Ignore-AOSP-First: these modules only exist on internal
Bug: 307824623
Test: m pw_log_log_proto_pwpb_h pw_log_log_raw_rpc_h pw_log_log_rpc_pwpb_h pw_tokenizer_proto_options_pwpb_h
Change-Id: I5f4c68657a9440a3db339e7a51a4714c3bc5df55
(cherry picked from commit 50005b08c2)
 2023-11-22 19:30:18 +00:00
Cole Faust
cf829793bc Enable sandboxing for pigweed gnerules 
go/roboleaf-busy-beavers-sandboxing

Ignore-AOSP-First: these modules only exist on internal
Bug: 307824623
Test: m pw_log_log_proto_pwpb_h pw_log_log_raw_rpc_h pw_log_log_rpc_pwpb_h pw_tokenizer_proto_options_pwpb_h
Change-Id: I5f4c68657a9440a3db339e7a51a4714c3bc5df55
(cherry picked from commit 50005b08c2)
 2023-11-22 19:29:41 +00:00
Cole Faust
f7474880a1 Sandbox atest_integration_fake_src 
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py atest_integration_fake_src
Change-Id: Ib3ae70b877227df794fec5516a754a9c32b06637
 2023-11-22 11:07:06 -08:00
Inseob Kim
746874efec Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378df am: d5ffaacc98 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836495

Change-Id: I9536bd38d4fc4ed51b77f85b2d4be23d40f6bdc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 08:09:49 +00:00
Inseob Kim
acb2a71012 Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378df am: fb1d783e07 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836495

Change-Id: I6f13620f38f0f820f6a0a4ee6e8af326ffa6049a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 08:08:36 +00:00
Inseob Kim
d5ffaacc98 Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836495

Change-Id: I19119e695684ae64cd9035af8beeca1d9824cf0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 07:55:44 +00:00
Inseob Kim
fb1d783e07 Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836495

Change-Id: I02084dd3d6c5e9039ce9b9f53942c21422c84d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 07:55:30 +00:00
Inseob Kim
6a4bb378df Merge "Allow apex to use generated file_contexts" into main 2023-11-22 07:45:53 +00:00
Yi Kong
4edc2e1e8d Merge "Remove unneeded MLGO cflag" into main am: 78a456e771 am: 32da1ff3b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839803

Change-Id: Ib536fb06c717c4c2ecaec44f3ca4ea6255723e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 07:00:59 +00:00
Treehugger Robot
3026208e02 Merge "Sandbox MultiDexLegacyTestApp_genrule and android-cts-verifier" into main am: 917ea12077 am: 4f402a0ef6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841997

Change-Id: Id6ae4ebaa0aae3aab51df0a95da9a3be2a238daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 07:00:47 +00:00
Yi Kong
32da1ff3b3 Merge "Remove unneeded MLGO cflag" into main am: 78a456e771 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839803

Change-Id: Ic7e9677491bcb5d87588111dccc81fb3d96dd2e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 06:47:28 +00:00
Treehugger Robot
4f402a0ef6 Merge "Sandbox MultiDexLegacyTestApp_genrule and android-cts-verifier" into main am: 917ea12077 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841997

Change-Id: I77f88e103566e661ff5f51b5020a8ff8e38afbe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 06:46:34 +00:00