tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
96529 commits 1 branch 0 tags 119 MiB
Commit graph

9134 commits

Author SHA1 Message Date
Jihoon Kang
f8177e2a8a Merge "Modify dependencies of fake_device_config" into main am: c7521afdc5 am: ba548ee8f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2960622

Change-Id: Iee77e556766bf638cc148ed1a9fbb98be7657019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-14 19:07:13 +00:00
Jihoon Kang
ba548ee8f3 Merge "Modify dependencies of fake_device_config" into main am: c7521afdc5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2960622

Change-Id: If440352406c8976d220092fb9be58db5f273764e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-14 18:28:07 +00:00
Jihoon Kang
c7521afdc5 Merge "Modify dependencies of fake_device_config" into main 2024-02-14 17:38:15 +00:00
Ivan Lozano
1d626b110e Merge "Revert "aconfig: remove libcxx dependency for now"" into main am: 6a04d1e5de am: 51f8db5df5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2962082

Change-Id: I75dc3ff8d13320a40f7a84e675710c2ae2baefeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-14 15:32:59 +00:00
Ivan Lozano
51f8db5df5 Merge "Revert "aconfig: remove libcxx dependency for now"" into main am: 6a04d1e5de 
Original change: https://android-review.googlesource.com/c/platform/build/+/2962082

Change-Id: I53c8f7b73da7cf885865e1479e89c3f8bbc5537d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-14 14:53:32 +00:00
Ivan Lozano
6a04d1e5de Merge "Revert "aconfig: remove libcxx dependency for now"" into main 2024-02-14 14:17:13 +00:00
Treehugger Robot
a0d19a3017 Merge "Test modules should always be last" into main am: ae025131ba am: 4ef1e380f4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2957436

Change-Id: I03f4404dfaf7997ed4a5f341eb5a5349ea24c582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-13 23:07:59 +00:00
Treehugger Robot
4ef1e380f4 Merge "Test modules should always be last" into main am: ae025131ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2957436

Change-Id: I258155cd440e7908d6954a05b7583b3210c3b9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-13 22:23:59 +00:00
Treehugger Robot
ae025131ba Merge "Test modules should always be last" into main 2024-02-13 22:04:05 +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
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
Dennis Shen
e5833d644b Merge "aconfig: remove libcxx dependency for now" into main am: fc14608190 am: d39f53486b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2959066

Change-Id: Iaa6513150e15c9293432333ee0b69bc50e5ca14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-13 02:06:07 +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
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
Michael Merg
526b540581 Merge "Create IDE query script" into main am: 7fa165b044 am: 88ad1d4ebc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2944325

Change-Id: If96349719d2d78a1a89e60feb58ab231e787e1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-12 17:57:50 +00:00
Treehugger Robot
9292413f7c Merge "Use full path for sepolicy finalization script" into main 2024-02-12 17:30:46 +00: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
Treehugger Robot
5b3039d132 Merge "Use existing script to create new compatibility matrix" into main 2024-02-12 16:03:06 +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
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
Dennis Shen
11ea4537a3 Merge "aconfig: add storage api rust test on the host" into main am: 91ba7d56ea am: a283b1674f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2955288

Change-Id: Ie4d3facdfcbe0ae08ba20020e7188ef3ee364a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-09 22:21:45 +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
62499c39c2 Merge "aosp: reenable the filtered out test point in atest" into main am: 2ea228ef70 am: 74df2cef18 
Original change: https://android-review.googlesource.com/c/platform/build/+/2956634

Change-Id: I7f3897a8f2b8fcd03cfba7fc7d5bf46d90a273ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-09 21:20:00 +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
edeec779e0 Merge "aconfig: create c++ interlop from rust flag apis" into main am: 997e65779a am: 9280d8480a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2956395

Change-Id: Ic5dc6fc384b1dc1598b7aa686332dd62e092b7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-09 18:12:21 +00:00
Devin Moore
56f8a77012 Use existing script to create new compatibility matrix 
During vintf finalization we need to create a new compatibility matrix
and kernel configs for that new level. There is an existing script that
can already do this! Use it!

Ignore-AOSP-First: b/304316873#comment10

https://android-build.corp.google.com/builds/abtd/run/L07600030001757459

Test: ./finalize-vintf-resources.sh
Bug: 279809333
Change-Id: Ie97c762943445c8c95a8ebf0ea1b8c6610dc69b2
 2024-02-09 18:10:40 +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
1b68f01c93 Merge "aconfig: turn off the offending test point" into main am: 0b0f11fecb am: 073ff98735 
Original change: https://android-review.googlesource.com/c/platform/build/+/2955388

Change-Id: Ie0b4a70274d7d39173cd7c19d62a792bff7247ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-09 16:48:43 +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
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
Dennis Shen
dc5d793a89 Merge "aconfig: add top level flag read lib api" into main am: e7fde3a86f am: ac57e6e8fc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2941627

Change-Id: Ieef179e2ef669dd609fa640bfa657178e76f491e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-08 19:45:20 +00:00
Dennis Shen
ac57e6e8fc Merge "aconfig: add top level flag read lib api" into main am: e7fde3a86f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2941627

Change-Id: Ifa7578b3f4e26750c0eeb9b56f665b77cd84b385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-08 19:05:43 +00:00
Dennis Shen
e7fde3a86f Merge "aconfig: add top level flag read lib api" into main 2024-02-08 18:17:27 +00:00
Dennis Shen
1452104995 aconfig: add top level flag read lib api 
1, update android build soong targets as now libmemmap2 has been
introduced to android code base.

2, add three public apis for package offset query, flag offset query,
and flag value query. These apis assume the stoarge location pb file is
at /metadata/aconfig/aconfig_storage.pb. This file will be created by
storage daemon. For testing purposes, we also expose impl version of
these apis that accept a custom storage location pb file.

Bug: 321077378
Test: atest aconfig_storage_file.test
Change-Id: I91b284e2dfcdb8ff3674d463ed1c13696d9ae020
 2024-02-08 14:57:51 +00:00
Dennis Song
2e3858d85a Merge "Allow merging target files without framework ab_partitions.txt" into main am: 150fbac783 am: 459b05f749 
Original change: https://android-review.googlesource.com/c/platform/build/+/2943049

Change-Id: I50b1fdc43e38b050854e5c4dded974a5aefcd231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-07 04:11:01 +00:00
Dennis Song
459b05f749 Merge "Allow merging target files without framework ab_partitions.txt" into main am: 150fbac783 
Original change: https://android-review.googlesource.com/c/platform/build/+/2943049

Change-Id: I378f6f4983902a2868c38ab37a793360b0960a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-07 03:30:53 +00:00
Dennis Song
150fbac783 Merge "Allow merging target files without framework ab_partitions.txt" into main 2024-02-07 03:00:00 +00:00
Treehugger Robot
acdba924e2 Merge "Define step-0 for vintf finalization" into main 2024-02-06 17:45:35 +00:00
Dennis Song
bc7e0a9f25 Allow merging target files without framework ab_partitions.txt 
Introduce a new option `--allow-partial-ab` in merge_target_files,
which allows merging a non-AB framework with an AB vendor.

The reason for adding this option is to support merging a real
device framework with a cuttlefish vendor. Cuttlefish enables AB
partition by default; however, some real devices do not.

Bug: 318326532
Test: merge_target_files
Test: atest --host releasetools_test
Change-Id: Iaebd06796153fe82fbf56e86fcc8c500b6d60771
 2024-02-06 14:40:57 +00:00
Mårten Kongstad
25cb1eef72 Merge "aconfig: move all tests to presubmit" into main am: 0dc4e61753 am: 3b8c60a208 
Original change: https://android-review.googlesource.com/c/platform/build/+/2950434

Change-Id: I6b5f3a477e6434283506965e5f6e58ae1415f8de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-06 13:47:44 +00:00
Mårten Kongstad
3b8c60a208 Merge "aconfig: move all tests to presubmit" into main am: 0dc4e61753 
Original change: https://android-review.googlesource.com/c/platform/build/+/2950434

Change-Id: I431bb0e4e0dda1b4afd9a69c42db25dd9690be56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-06 13:05:46 +00:00
Mårten Kongstad
36402f1c35 aconfig: move all tests to presubmit 
The tests added to TEST_MAPPING in aosp/2870454 have now soaked in
postsubmit long enough to be allowed to advance to presubmit.

Bug: N/A
Test: atest --test-mapping $(gettop)/build/tools/aconfig
Test: Treehugger
Change-Id: Ia75c76ae114c16a57c26aafa159560639baea707
 2024-02-06 08:21:32 +01:00
Justin Yun
7c28c2327d Define step-0 for vintf finalization 
Define `vintf` state that have completed vintf finalization only.
Only if FINAL_STATE is 'unfinalized' run the vintf finalization
process to finalize vintf.
The new step-0 only runs the vintf finalization.

Ignore-AOSP-First: trunk-stable changes (b/304316873)

Bug: 318883690
Test: build-step-0.sh && build/soong/soong_ui.bash \
    --make-mode TARGET_PRODUCT=cf_x86_64_phone TARGET_RELEASE=fina_0 \
    TARGET_BUILD_VARIANT=userdebug droid dist
Change-Id: If3525f38204fa546744b9ccf8dc9e63711823abd
 2024-02-06 11:56:00 +09:00
Oriol Prieto Gascó
90bb2f8648 Merge "Set the container field of aconfig flags" into main am: 0151f72e00 am: 4366c21615 
Original change: https://android-review.googlesource.com/c/platform/build/+/2947281

Change-Id: I03784301119c7622bb29a4cdc3b0e95ce4b8823c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-06 01:57:43 +00:00