StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,106 Commits 1 Branch 0 Tags
b159c5c419c220caa46ff32d11d3c49fd6c7894e
Commit Graph

96106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jeff Sharkey
91412af6e2 Basic ParcelFileDescriptor on Ravenwood. 
One of the final foundational building blocks, which wraps a Java
`FileDescriptor` object.  Since many of the existing APIs here offer
to work with "raw" int FD values, we need to reach "behind the
curtain" to read/write the internal value.  Thankfully `SharedSecrets`
already offers a way to gain access without requiring us to open
up the entire `java.io` area of the `java.base` module.

Bring along `android.util.CloseGuard` as a no-op wrapper.

Bug: 324417456
Test: atest CtsOsTestCasesRavenwood
Merged-in: I8af63d1c5a4bb2ef76bd43594a1072f2ca537d68
Change-Id: I8af63d1c5a4bb2ef76bd43594a1072f2ca537d68
 2024-02-08 11:33:58 -08:00
Jeff Sharkey
4416313943 Update XML template to reflect null device. 
Ravenwood doesn't need a device, so add a "null" filter so that
atest doesn't hang waiting for one.

Bug: 292141694
Test: atest-dev CtsOsTestCasesRavenwood CtsOsTestCases
Merged-in: I10ceeae92c7622ea44ecbc315e23babe8b36516a
Change-Id: I10ceeae92c7622ea44ecbc315e23babe8b36516a
 2024-02-08 11:33:45 -08:00
Makoto Onuki
e406793f57 Add ravenwood test config template 
Modeled after robolectric_test_config_template.xml

Bug: 292141694
Test: m nothing --no-skip-soong-tests
Test: m hoststubgen ravenwood-runtime tradefed atest && atest-dev HostStubGenTest-framework-test
Merged-in: I9ef906074df65c93d9e1a4b4998e6137196075ed
Change-Id: I9ef906074df65c93d9e1a4b4998e6137196075ed
 2024-02-08 11:33:37 -08: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
Ikjoon Jang
6e9bd101e8 Merge "Revert "Use vFRC version as-is for ToT sepolicy version"" into main am: 96b16f654d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2954994

Change-Id: If24356b1d7244ef9a76578dbdd9ea7b9f89d12d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-08 04:50:47 +00:00
Ikjoon Jang
96b16f654d Merge "Revert "Use vFRC version as-is for ToT sepolicy version"" into main 2024-02-08 04:47:21 +00:00
Ikjoon Jang
fb3a97fc7d Revert "Use vFRC version as-is for ToT sepolicy version" 
Revert submission 2952245-vfrc_as_tot_sepolicy

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=mainline_modules_arm64-mainline-userdebug&lkgb=11421838&lkbb=11421957&fkbb=11421841, b/324335916

Reverted changes: /q/submissionid:2952245-vfrc_as_tot_sepolicy

Bug: 324335916
Change-Id: I573db8b1a7f7874e146eea1135594eb0f1b6658f
 2024-02-08 02:53:55 +00:00
Inseob Kim
bff91ad0d1 Merge "Use vFRC version as-is for ToT sepolicy version" into main am: b9835251d1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2911567

Change-Id: I8fe81865d57796f806b00b06420b3c153ef685b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-08 01:22:38 +00:00
Inseob Kim
b9835251d1 Merge "Use vFRC version as-is for ToT sepolicy version" into main 2024-02-08 01:12:47 +00:00
Richard Coles
a468160ee0 Add the WebViewBootstrap module to the base system. 
When the flag is enabled, add the module to the base system.

Bug: 318717084
Test: build with/without flag
Change-Id: Ifd8c7cc85c711786f491a76d452ad1cac18b655b
 2024-02-07 06:27:27 -05:00
Ziwei Zhang
77d1f60f0c Merge "Generate 2.0 config for Mobly test." into main am: a8de90ce4c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2943045

Change-Id: I88b7a6a8d41a13316efd3ff768653fc51e5be929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-07 08:25:01 +00:00
Ziwei Zhang
a8de90ce4c Merge "Generate 2.0 config for Mobly test." into main 2024-02-07 07:38:39 +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
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
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
0dc4e61753 Merge "aconfig: move all tests to presubmit" into main 2024-02-06 12:36:48 +00:00
Alice Ryhl
10292e1338 Merge "Add kcmdlinectrl to base system" into main am: dc7efff9f6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2908358

Change-Id: I2453f9e1b43b3bf11391825b5095b4634c132a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-06 08:29:08 +00:00
Alice Ryhl
dc7efff9f6 Merge "Add kcmdlinectrl to base system" into main 2024-02-06 07:52:10 +00:00