Commit graph

96331 commits

Author SHA1 Message Date
Nikita Ioffe
3ce74d19b0 Remove unused PRODUCT_AVF_KERNEL_MODULES_ENABLED
Test: presubmit
Change-Id: I5742c94376e8d31ff1fe74ef6da6e5ae67e9ef5c
2024-02-13 19:16:23 +00:00
Nikita Ioffe
19b5d66747 Propagate RELEASE_AVF_MICRODROID_KERNEL_VERSION to Soong
Bug: 298011555
Test: builds
Change-Id: I69a895318ea13fb1bee7bf0aec8893672b7bdf49
2024-02-13 19:13:04 +00:00
Ivan Lozano
4304694312 Revert "aconfig: remove libcxx dependency for now"
This reverts commit 248510a659.

Reason for revert: aosp/2959366

Change-Id: Ib3a0e584f24f2a3ab51ca0b48e4c4897ed0d8174
Bug: 324826914
Test: SANITIZE_HOST=address m aconfig
2024-02-13 19:02:06 +00:00
Greg Kaiser
c26ea1995a Remove TARGET_VNDK_USE_CORE_VARIANT
We introduced this in
https://android-review.googlesource.com/c/platform/build/+/1087517
but now with VNDK deprecated, this is no longer in use so we
remove it for clarity.

Bug: 319529309
Test:  TreeHugger skipped running mokey_go32 boot test because there were no changes in the artifacts.  Additionally, built a Go device, booted, and /linkerconfig/ld.config.txt is the same and things run as normal.
Change-Id: Ifba30d7cc30c641f265abe52ed2cf7c02660a5ec
2024-02-13 15:52:21 +00:00
Treehugger Robot
d8c04fd026 Merge "Move setting default BOARD_VNDK_VERSION value" into main am: 9b3d6f91aa
Original change: https://android-review.googlesource.com/c/platform/build/+/2960351

Change-Id: I066fb29a388a0311fc9170dbe10a1c810deef71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:57:49 +00:00
Jihoon Kang
fee2a4b65e Merge "Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA" into main am: 7d2c5ff02d
Original change: https://android-review.googlesource.com/c/platform/build/+/2953878

Change-Id: I6f9f256ac5f17fad19c81ddcfa5b365a806ae61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:56:46 +00:00
Inseob Kim
31051a565d Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main am: 5fd1645f11
Original change: https://android-review.googlesource.com/c/platform/build/+/2960347

Change-Id: Id99bd029aac84e6fa3c0790bec0488787f19787d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:55:25 +00:00
Jihoon Kang
9c1450e0d2 Modify dependencies of fake_device_config
This change modifes the dependencies of fake_device_config by setting
the sdk_version to none instead of core_current, and setting the
appropriate system_modules in order to resolve circular dependencies.

Test: m fake_device_config && BUILD_FROM_SOURCE_STUB m fake_device_config
Change-Id: I497e2db9ea3456057a1e3f5c624cbd2042da6837
2024-02-13 06:54:49 +00:00
Treehugger Robot
9b3d6f91aa Merge "Move setting default BOARD_VNDK_VERSION value" into main 2024-02-13 06:46:37 +00:00
Kiyoung Kim
09aaa26c06 Move setting default BOARD_VNDK_VERSION value
Current BOARD_VNDK_VERSION is being set from config.mk, but this is
before build system loads release config and checks if VNDK is
deprecated or not. Move this to envsetup so it can set up
BOARD_VNDK_VERSION only when VNDK is not deprecated with flag.

Bug: 324976878
Test: mainline release target build succeeded

Change-Id: I490cc431038f5cebc40d03c98d2666eaba906664
2024-02-13 13:40:40 +09:00
Jihoon Kang
7d2c5ff02d Merge "Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA" into main 2024-02-13 04:27:21 +00:00
Inseob Kim
5fd1645f11 Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main 2024-02-13 04:02:36 +00:00
Inseob Kim
4e72d5e4da Revert^2 "Use vFRC version as-is for ToT sepolicy version"
fb3a97fc7d

Change-Id: I13612dee1ebc6aabbd3bc46fb4c30568dc23a6da
2024-02-13 02:20:00 +00:00
Dennis Shen
d39f53486b Merge "aconfig: remove libcxx dependency for now" into main am: fc14608190
Original change: https://android-review.googlesource.com/c/platform/build/+/2959066

Change-Id: I12b895794a562d8629b0756a112767beb5a90268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 01:47:04 +00:00
Dennis Shen
fc14608190 Merge "aconfig: remove libcxx dependency for now" into main 2024-02-13 01:30:49 +00:00
Kiyoung Kim
f74c3b5fe8 Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main am: 1d952f82a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2949648

Change-Id: I3b47559ad8182f8c8c04e345c8ef18bcc90c459a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 01:24:47 +00:00
Kiyoung Kim
1d952f82a5 Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main 2024-02-13 00:51:53 +00:00
Treehugger Robot
b159c5c419 Merge "envsetup: fix path to build/bazel/bin tools" into main am: 1348d34e4c
Original change: https://android-review.googlesource.com/c/platform/build/+/2957816

Change-Id: I942ddc6f6397b0dea7c1339581c9b80a5de8b2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12 20:57:51 +00:00
Treehugger Robot
1348d34e4c Merge "envsetup: fix path to build/bazel/bin tools" into main 2024-02-12 20:20:37 +00:00
Dennis Shen
248510a659 aconfig: remove libcxx dependency for now
Contenxt: b/324826914, libcxx is the culprit of the linking failure.
Remove libcxx dependency for now.

Bug: b/324826914
Test: atest aconfig_storage_file.test
Change-Id: I55b1a41efbf4486715f465a8d56a4e2e6ab0254a
2024-02-12 20:09:51 +00:00
LaMont Jones
e8a3be2ea2 envsetup: fix path to build/bazel/bin tools
Bug: None
Test: manual
Change-Id: If0124eb5f5d85064e0063403cca477b98d42a922
2024-02-12 09:55:41 -08:00
Michael Merg
88ad1d4ebc Merge "Create IDE query script" into main am: 7fa165b044
Original change: https://android-review.googlesource.com/c/platform/build/+/2944325

Change-Id: Ie9379db7c37d18444fb4cba181188d8b46716b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12 17:18:08 +00:00
Michael Merg
7fa165b044 Merge "Create IDE query script" into main 2024-02-12 16:28:58 +00:00
Michael Merg
6bafd75d51 Create IDE query script
This will be the integration point to provide build artifacts to Cider G.

NOTE FOR REVIEWERS - original patch and result patch are not identical.
PLEASE REVIEW CAREFULLY.
Diffs between the patches:
 	files := flag.Args()
> -
> -			if prev, ok := modules[f]; ok && !strings.HasSuffix(prev.Name, ".impl") {
> -				log.Printf("File %q found in module %q but is already part of module %q", f, m.Name, prev.Name)
> +			if modules[f] != nil {
> +				log.Printf("File %q found in module %q but is already covered by module %q", f, m.Name, modules[f].Name)
> -		var genFiles []*pb.GeneratedFile
> +		var generated []*pb.GeneratedFile
> -				// Note: Contents will be filled below.
> -				genFiles = append(genFiles, &pb.GeneratedFile{Path: relPath})
> +				contents, err := os.ReadFile(d)
> +				if err != nil {
> +					fmt.Printf("Generated file %q not found - will be skipped.\n", d)
> +					continue
> +				}
> +
> +				generated = append(generated, &pb.GeneratedFile{
> +					Path:     relPath,
> +					Contents: contents,
> +				})
> -		file.Generated = genFiles
> +		file.Generated = generated
> -	for _, s := range sources {
> -		for _, g := range s.GetGenerated() {
> -			contents, err := os.ReadFile(path.Join(env.OutDir, g.GetPath()))
> -			if err != nil {
> -				fmt.Printf("Failed to read generated file %q: %v. File contents will be missing.\n", g.GetPath(), err)
> -				continue
> -			}
> -			g.Contents = contents
> -		}
> -	}
> -
> -		if strings.HasSuffix(name, "-jarjar") {
> +		if strings.HasSuffix(name, "-jarjar") || strings.HasSuffix(name, ".impl") {

Original patch:
 diff --git a/tools/ide_query/ide_query.go b/tools/ide_query/ide_query.go
old mode 100644
new mode 100644
--- a/tools/ide_query/ide_query.go
+++ b/tools/ide_query/ide_query.go
@@ -1,3 +1,5 @@
+// Binary ide_query generates and analyzes build artifacts.
+// The produced result can be consumed by IDEs to provide language features.
 package main

 import (
@@ -34,10 +36,10 @@

 var _ flag.Value = (*LunchTarget)(nil)

-// Get implements flag.Value.
-func (l *LunchTarget) Get() any {
-	return l
-}
+// // Get implements flag.Value.
+// func (l *LunchTarget) Get() any {
+// 	return l
+// }

 // Set implements flag.Value.
 func (l *LunchTarget) Set(s string) error {
@@ -64,13 +66,12 @@
 	env.RepoDir = os.Getenv("TOP")
 	flag.Var(&env.LunchTarget, "lunch_target", "The lunch target to query")
 	flag.Parse()
-	if flag.NArg() == 0 {
+	files := flag.Args()
+	if len(files) == 0 {
 		fmt.Println("No files provided.")
 		os.Exit(1)
 		return
 	}
-
-	files := flag.Args()

 	ctx := context.Background()
 	javaDepsPath := pa
[[[Original patch trimmed due to size. Decoded string size: 2916. Decoded string SHA1: 5d8fd4a92cc403da51c9ddb8442da2e391e6fcb1.]]]

Result patch:
 diff --git a/tools/ide_query/ide_query.go b/tools/ide_query/ide_query.go
index 2e76738..0fdb6de 100644
--- a/tools/ide_query/ide_query.go
+++ b/tools/ide_query/ide_query.go
@@ -1,3 +1,5 @@
+// Binary ide_query generates and analyzes build artifacts.
+// The produced result can be consumed by IDEs to provide language features.
 package main

 import (
@@ -34,10 +36,10 @@

 var _ flag.Value = (*LunchTarget)(nil)

-// Get implements flag.Value.
-func (l *LunchTarget) Get() any {
-	return l
-}
+// // Get implements flag.Value.
+// func (l *LunchTarget) Get() any {
+// 	return l
+// }

 // Set implements flag.Value.
 func (l *LunchTarget) Set(s string) error {
@@ -64,14 +66,13 @@
 	env.RepoDir = os.Getenv("TOP")
 	flag.Var(&env.LunchTarget, "lunch_target", "The lunch target to query")
 	flag.Parse()
-	if flag.NArg() == 0 {
+	files := flag.Args()
+	if len(files) == 0 {
 		fmt.Println("No files provided.")
 		os.Exit(1)
 		return
 	}

-	files := flag.Args()
-
 	ctx := context.Background()
 	javaDepsPath := path
[[[Result patch trimmed due to size. Decoded string size: 3022. Decoded string SHA1: a8824749eafbbb8d09c4e95fe491a16e3ea82569.]]]

NOTE FOR REVIEWERS - original patch and result patch are not identical.
PLEASE REVIEW CAREFULLY.
Diffs between the patches:
 	var javaFiles []string
> +	for _, f := range files {
> +		switch {
> +		case strings.HasSuffix(f, ".java") || strings.HasSuffix(f, ".kt"):
> +			javaFiles = append(javaFiles, f)
> +		default:
> +			log.Printf("File %q is supported - will be skipped.", f)
> +		}
> +	}
> +
> -	modules := make(map[string]*javaModule) // file path -> module
> -	for _, f := range files {
> +	fileToModule := make(map[string]*javaModule) // file path -> module
> +	for _, f := range javaFiles {
> -			if modules[f] != nil {
> -				log.Printf("File %q found in module %q but is already covered by module %q", f, m.Name, modules[f].Name)
> +			if fileToModule[f] != nil {
> +				// TODO(michaelmerg): Handle the case where a file is covered by multiple modules.
> +				log.Printf("File %q found in module %q but is already covered by module %q", f, m.Name, fileToModule[f].Name)
> -			modules[f] = m
> +			fileToModule[f] = m
> -	for _, m := range modules {
> +	for _, m := range fileToModule {
> +	type depsAndGenerated struct {
> +		Deps      []string
> +		Generated []*pb.GeneratedFile
> +	}
> +	moduleToDeps := make(map[string]*depsAndGenerated)
> -		m := modules[f]
> +		m := fileToModule[f]
> +		file.Status = &pb.Status{Code: pb.Status_OK}
> +		if moduleToDeps[m.Name] != nil {
> +			file.Generated = moduleToDeps[m.Name].Generated
> +			file.Deps = moduleToDeps[m.Name].Deps
> +			continue
> +		}
> +
> -
> +		moduleToDeps[m.Name] = &depsAndGenerated{deps, generated}
> -		file.Status = &pb.Status{Code: pb.Status_OK}

Original patch:
 diff --git a/tools/ide_query/ide_query.go b/tools/ide_query/ide_query.go
old mode 100644
new mode 100644
--- a/tools/ide_query/ide_query.go
+++ b/tools/ide_query/ide_query.go
@@ -72,6 +72,16 @@
 		os.Exit(1)
 		return
 	}
+
+	var javaFiles []string
+	for _, f := range files {
+		switch {
+		case strings.HasSuffix(f, ".java") || strings.HasSuffix(f, ".kt"):
+			javaFiles = append(javaFiles, f)
+		default:
+			log.Printf("File %q is supported - will be skipped.", f)
+		}
+	}

 	ctx := context.Background()
 	javaDepsPath := path.Join(env.RepoDir, env.OutDir, "soong/module_bp_java_deps.json")
@@ -85,22 +95,23 @@
 		log.Fatalf("Failed to load java modules: %v", err)
 	}

-	modules := make(map[string]*javaModule) // file path -> module
-	for _, f := range files {
+	fileToModule := make(map[string]*javaModule) // file path -> module
+	for _, f := range javaFiles {
 		for _, m := range javaModules {
 			if !slices.Contains(m.Srcs, f) {
 				continue
 			}
-			if modules[f] != nil {
-				log.Printf("File %q found in
[[[Original patch trimmed due to size. Decoded string size: 2629. Decoded string SHA1: 4517ba713fdb898ba9d77c4acbe934c08a2d9fe0.]]]

Result patch:
 diff --git a/tools/ide_query/ide_query.go b/tools/ide_query/ide_query.go
index 0fdb6de..7335875 100644
--- a/tools/ide_query/ide_query.go
+++ b/tools/ide_query/ide_query.go
@@ -73,6 +73,16 @@
 		return
 	}

+	var javaFiles []string
+	for _, f := range files {
+		switch {
+		case strings.HasSuffix(f, ".java") || strings.HasSuffix(f, ".kt"):
+			javaFiles = append(javaFiles, f)
+		default:
+			log.Printf("File %q is supported - will be skipped.", f)
+		}
+	}
+
 	ctx := context.Background()
 	javaDepsPath := path.Join(env.RepoDir, env.OutDir, "soong/module_bp_java_deps.json")
 	// TODO(michaelmerg): Figure out if module_bp_java_deps.json is outdated.
@@ -85,22 +95,23 @@
 		log.Fatalf("Failed to load java modules: %v", err)
 	}

-	modules := make(map[string]*javaModule) // file path -> module
-	for _, f := range files {
+	fileToModule := make(map[string]*javaModule) // file path -> module
+	for _, f := range javaFiles {
 		for _, m := range javaModules {
 			if !slices.Contains(m.Srcs, f) {
 				continue
 			}

[[[Result patch trimmed due to size. Decoded string size: 2717. Decoded string SHA1: 5e5223251ebdc548258bc27daf3528d662c39410.]]]

Change-Id: Ibe5d386399affd2951206bb5a714972e0e2fee92
2024-02-12 13:57:59 +00:00
Luca Stefani
15260e9dad Add custom images in fastboot-info
Test: m fastboot_info; m && fastboot flashall
Change-Id: I9a828d35992d684dfaacffd04006d420b7088736
2024-02-10 19:26:43 +01:00
Stephen Hines
68a4bdb3eb Test modules should always be last
```
error: items after a test module
   --> build/make/tools/aconfig/aconfig/src/test.rs:18:1
    |
18  | pub mod test_utils {
    | ^^^^^^^^^^^^^^^^^^
...
345 | pub use test_utils::*;
    |         ^^^^^^^^^^
    |
    = help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#items_after_test_module
    = note: `-D clippy::items-after-test-module` implied by `-D
warnings`
    = help: to override `-D warnings` add
`#[allow(clippy::items_after_test_module)]`
```

Bug: http://b/321303117
Test: toolchain/android_rust/test_compiler.py --prebuilt-path dist/rust-dev.tar.xz --target aosp_cf_x86_64_phone --all-rust
Change-Id: I2c95af50a5d389fc37e1abc677e9b4d34b6562b4
2024-02-09 16:46:48 -08:00
Treehugger Robot
8aad1e80a7 Merge "proguard: add keep rules for @TestApi" into main am: 6b11584633
Original change: https://android-review.googlesource.com/c/platform/build/+/2956677

Change-Id: If2642bf2556c23143add3120397d2562401b2c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 23:05:52 +00:00
Treehugger Robot
6b11584633 Merge "proguard: add keep rules for @TestApi" into main 2024-02-09 22:15:07 +00:00
Dennis Shen
a283b1674f Merge "aconfig: add storage api rust test on the host" into main am: 91ba7d56ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2955288

Change-Id: Ia819c456c4e371c95de1d83eeda99afe40050b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 21:42:28 +00:00
Dennis Shen
8b5244c841 aconfig: aconfig storage cpp api on device integration test
Bug: 321077378
Test: atest aconfig_storage.test.cpp
Change-Id: I99532e9288f411d6025868341883fdbef600cfd7
2024-02-09 21:10:43 +00:00
Dennis Shen
91ba7d56ea Merge "aconfig: add storage api rust test on the host" into main 2024-02-09 21:00:16 +00:00
Dennis Shen
74df2cef18 Merge "aosp: reenable the filtered out test point in atest" into main am: 2ea228ef70
Original change: https://android-review.googlesource.com/c/platform/build/+/2956634

Change-Id: I3820ba9b3bec18e9d149cf9476eea5c6a81521da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 20:40:48 +00:00
Dennis Shen
2ea228ef70 Merge "aosp: reenable the filtered out test point in atest" into main 2024-02-09 20:09:28 +00:00
Dennis Shen
9280d8480a Merge "aconfig: create c++ interlop from rust flag apis" into main am: 997e65779a
Original change: https://android-review.googlesource.com/c/platform/build/+/2956395

Change-Id: I57d454f32497c3b84a2c5ffd8cfdf61ee3ac44fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 17:34:45 +00:00
Dennis Shen
997e65779a Merge "aconfig: create c++ interlop from rust flag apis" into main 2024-02-09 16:53:53 +00:00
Dennis Shen
4f6f12841c aosp: reenable the filtered out test point in atest
A more systematic fix. Now for each test point, we create temp file
copies at temp dir and explicitly set the file permission of these temp
files. This should bypass the issue that test build artifact file
permission are not guaranteed. Because we will generate these test
storage files on the fly at run time.

Bug: b/324459233
Test: atest aconfig_storage_file.test
Change-Id: Iaa7083be6cc49421090ab4c74e54c4bcf8e35801
2024-02-09 16:51:17 +00:00
Dennis Shen
073ff98735 Merge "aconfig: turn off the offending test point" into main am: 0b0f11fecb
Original change: https://android-review.googlesource.com/c/platform/build/+/2955388

Change-Id: I64c07b709ab695c7a7319ede8fa5ece4088bac7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 16:08:38 +00:00
Dennis Shen
213dbb71a5 aconfig: add storage api rust test on the host
Bug: 321077378
Test: atest aconfig_storage.test.rust
Change-Id: I3301834909441dea471c0d4b1aae0a117af7dc29
2024-02-09 15:54:22 +00:00
Dennis Shen
0b0f11fecb Merge "aconfig: turn off the offending test point" into main 2024-02-09 15:07:21 +00:00
Dennis Shen
2f0929d867 aconfig: turn off the offending test point
Bug: b/324459233
Test: atest aconfig_storage_file.test and the test point is no longer executed.
Change-Id: I34b5da7a1b152f213926cc2e1f9511785e9d384f
2024-02-09 12:48:52 +00:00
Dennis Shen
618e66a28b aconfig: create c++ interlop from rust flag apis
Using cxx to generate c++ code for the apis that are marked to exported
in the ffi mod in src/lib.rs. For generated code simplicity, it returns
a new flag struct for each rust api.

Create a cc_library to wrap around generated c++ code. See the created
aconfig_storage.hpp for the exported header. Note there is a nested
aconfig_storage::test_only_api namespace, where we place test only apis.
The production apis are placed under aconfig_storage namespace.

Bug: 321077378
Test: m libaconfig_storage_cc
Change-Id: I73a85a26d3749908abc461362f5e0bfc3f85bf4d
2024-02-09 02:51:08 +00:00
Makoto Onuki
d6ed17a010 Merge changes I8af63d1c,I10ceeae9 into main am: af0a5d71cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2955783

Change-Id: I96584448c05f5a74a8c9cbdf6331974c1e0a3ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 00:42:57 +00:00
Jeff Sharkey
b7b9d465c2 [automerger skipped] Update XML template to reflect null device. am: 4416313943 -s ours
am skip reason: Merged-In I10ceeae92c7622ea44ecbc315e23babe8b36516a with SHA-1 987ae3d2ec is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2955782

Change-Id: Id0ea37187f22661c0ae1fd7a988eeced601c563e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 00:42:53 +00:00
Yifei Zhang
f0581e65be proguard: add keep rules for @TestApi
Test: build
Bug: 319319578
Change-Id: I739a80c66de57d0ce68624246613722edf2d106f
2024-02-08 16:15:56 -08:00
Makoto Onuki
af0a5d71cd Merge changes I8af63d1c,I10ceeae9 into main
* changes:
  Basic `ParcelFileDescriptor` on Ravenwood.
  Update XML template to reflect null device.
2024-02-08 23:40:51 +00:00
Treehugger Robot
66a5221c65 Merge "Add the WebViewBootstrap module to the base system." into main am: 9689e9007d
Original change: https://android-review.googlesource.com/c/platform/build/+/2955127

Change-Id: Ib7b413d394423ace0824bf99cd892e78c69027a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 22:56:15 +00:00
Treehugger Robot
9689e9007d Merge "Add the WebViewBootstrap module to the base system." into main 2024-02-08 22:17:07 +00:00
Treehugger Robot
9531e0e0f5 [automerger skipped] Merge "Add ravenwood test config template" into main am: 1d0e62cd5d -s ours
am skip reason: Merged-In I9ef906074df65c93d9e1a4b4998e6137196075ed with SHA-1 0fee92dc93 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2823150

Change-Id: Id97947d988cee5d8f9eed4ffe86a6cbcd47baac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 21:53:27 +00:00
Makoto Onuki
6a41e8d987 [automerger skipped] Add ravenwood test config template am: e406793f57 -s ours
am skip reason: Merged-In I9ef906074df65c93d9e1a4b4998e6137196075ed with SHA-1 0fee92dc93 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2823150

Change-Id: I7835becaf6d880f83cb8f1e3f3c62778395cada3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 21:53:23 +00:00
Treehugger Robot
1d0e62cd5d Merge "Add ravenwood test config template" into main 2024-02-08 21:21:48 +00:00