Commit Graph

79704 Commits

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

Change-Id: If8b932e404bb6a76a6648950cbee3a97f973e82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27 17:16:59 +00:00
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
Paul Duffin
7a8de0d0cb [automerger skipped] Allow module SDK snapshot build to hide flagged APIs am: 8d6ba4367d -s ours
am skip reason: Merged-In I4967376c0236bad729398af80fa59b48dbab5f21 with SHA-1 c831389625 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25470057

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

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

Change-Id: I8b3129ada4d74c3b7561515fdeeed1d67f58d8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27 12:24:47 +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
Paul Duffin
8d6ba4367d Allow module SDK snapshot build to hide flagged APIs
Temporary workaround to allow module SDK snapshot builds to hide
flagged APIs until such time as development moves to `main` and
the build in `main` can handle that properly.

Bug: 299570421
Test: UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_sdks.sh
      # Check that flagged APIs are excluded from everything but
      # for-latest-build.
Change-Id: I5b133b98aab91b2ad5ba717dd663c60a5ed90c9d
Merged-In: I4967376c0236bad729398af80fa59b48dbab5f21
2023-11-27 08:23:24 +00:00
Seungjae Yoo
7c81146fc0 Merge "Support adding AVB properties into vbmeta module" into main am: 55edc0cd2d am: 78dc82ef19 am: f6045e44d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842913

Change-Id: I4473119419e163dbeeba66440c0eb87b656789ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-24 03:44:22 +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
bb9089bd12 Merge "Support adding AVB properties into vbmeta module" into main am: 55edc0cd2d am: f259847179 am: 5e537631d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842913

Change-Id: Ic77df4925eee54f6ef204ba1a6325d01e7cb9229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-24 03:26:49 +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
f24ed7e3a9 Merge "Sandbox r8retrace genrules" into main am: d766a44530 am: 6bafd299ba am: c6c73ab8ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839048

Change-Id: I39056806572e1c6e4f836f2ceda519420722b70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23 01:31:18 +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
d9243dd7f0 Merge "Sandbox r8retrace genrules" into main am: d766a44530 am: 9d711fd36b am: fe422a7c8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839048

Change-Id: I359081c84928d44b6fecdf91b257732cc8d9b3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23 01:29:51 +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
c6d29ffdb2 Merge "Sandbox trout genrules" into main am: 954ef637e9 am: 4c03effb1c am: 1ba492856c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843839

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

Change-Id: Ie87a533784b05170eb4f03817cb8ff6c7b4dd3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 23:31:16 +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
f780b55f03 Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main am: b103659c0b am: 52c4c1fb09 am: db0be340bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839054

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

Change-Id: I16925903a588b1629af70ef1380575e8bd5ed485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 21:42:13 +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
Cole Faust
73e2236f6a Sandbox atest_integration_fake_src am: f7474880a1 am: e58afa3c97 am: f0bdebff0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842066

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

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

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

Change-Id: I4f44135f6d28f4cd8d60755388bce3c43594eca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 21:41:12 +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