tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
76297 commits 1 branch 0 tags 115 MiB
Commit graph

76297 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cole Faust
122767d27c Merge "Sandbox apexd test genrules" into main 2023-11-28 17:58:28 +00:00
Jooyung Han
9ffbe83028 Add non_apex.exclude_shared_libs to cc 
This can be used to add apex-specific shared_libs to a CC module. It
would be nice if we could have apex.shared_libs. But it would make code
much harder to follow because we need to record the shared_libs list as
"exclude list" for non-apex anyway.

Bug: 312510312
Test: m libhardware libhardware.vendor libhardware.vendor.com.google.cf.ir
  # check DTNEEDED for libapexsupport
  # only apex-variant should have the dependency
Change-Id: I56a3dc280127d8ba44337707444ea226a49ccf0f
 2023-11-28 22:42:23 +09:00
Jiakai Zhang
db93553b02 Remove PreoptExtractedApk. 
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.

Bug: 313505540
Test: m
Change-Id: I605b7569c17ee715cd4df167768e25aaf51bcd37
 2023-11-28 13:40:58 +00:00
Søren Gjesse
b82a2a278b Enable dex container (DEX v41) for the whole system 
Bug: b/249922554
Test: device boots
Change-Id: Idc63034cc7d5f4bc4533d1f580eeffe1494b56a6
 2023-11-28 13:24:21 +00:00
Treehugger Robot
f6a132e0a5 Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main am: 130079c893 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849235

Change-Id: Iefe8dfbf1f372021abe10b26e9b5bdd448e8b046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 09:53:13 +00:00
Treehugger Robot
130079c893 Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main 2023-11-28 09:11:46 +00:00
Herbert Xue
caadada423 Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk 
Update androidmk to enable parsing of 'LOCAL_TARGET_SDK_VERSION' from
an Android.mk and translating it to target_sdk_version in an Android.bp.

Bug: 313336240
Test: m androidmk
Test: androidmk vendor/xts/gts-tests/tests/assist/Android.mk
Change-Id: I465aba3ea7d22a9978fc370a6718a2cfc43dce36
 2023-11-28 17:01:00 +08:00
Treehugger Robot
caf25476a0 Merge "Sandbox checkIn-service-stub-lite" into main am: a4291d572a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848757

Change-Id: I3ff90bac2a5d6246784ebf986d11e58d1568e87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 02:38:48 +00:00
Treehugger Robot
a4291d572a Merge "Sandbox checkIn-service-stub-lite" into main 2023-11-28 02:21:56 +00:00
Treehugger Robot
034251de5e Merge "Add defaults modules for avb modules" into main am: 0edba2a37e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842914

Change-Id: Ie9cd3c1d28bd34b38c865e00ff2c3dabd4e86d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 02:15:24 +00:00
Treehugger Robot
0edba2a37e Merge "Add defaults modules for avb modules" into main 2023-11-28 01:36:35 +00:00
Cole Faust
9de49502af Sandbox checkIn-service-stub-lite 
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py checkIn-service-stub-lite
Change-Id: If64ca165eed121b536f566a4fc36c9e6597784fd
 2023-11-27 17:31:13 -08:00
Yi-Yo Chiang
04e00f621e Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main am: 62093cf7fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2845654

Change-Id: I99dc9f93d1e0005e928b6bddddc328bef15e87fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 01:03:00 +00:00
Cole Faust
585f54c6e4 Sandbox ue_unittest_erofs_imgs am: fc1e0cec4c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848755

Change-Id: I01c0691c1acd689b4400923b9cd36d5ae874a436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 01:02:19 +00:00
Yi-Yo Chiang
62093cf7fc Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main 2023-11-28 00:38:44 +00:00
Cole Faust
44850e04ae Sandbox ScriptGroupTest-rscript 
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py ScriptGroupTest-rscript
Change-Id: I335634c0a0a74d35967f540070112888758ae0ca
 2023-11-27 15:15:44 -08:00
Cole Faust
fc1e0cec4c Sandbox ue_unittest_erofs_imgs 
This already works with sandboxing, I'm not sure why it was added.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py ue_unittest_erofs_imgs
Change-Id: I8d2c151e3bc6ed87e1d147e0ae316397ad56c4c8
 2023-11-27 14:55:06 -08:00
Cole Faust
2769238611 Sandbox seller-frontend-service-stub-lite 
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py seller-frontend-service-stub-lite
Change-Id: Ibb68124b613cc6b43fcacdfb8447d25d8577945b
 2023-11-27 14:32:46 -08:00
Charisee
67b2923cd0 rustc-1.73.0 Build 11110309 
bug: http://b/303252546
Test: m rust
Change-Id: Ic8f99af411665b7eaef81d9ca15342e1ea396fc3
 2023-11-27 22:30:13 +00:00
Treehugger Robot
19169c90b7 Merge "Remove google_clockwork list of soong plugins" into main am: 63e3ecbaa3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847995

Change-Id: I9c524388e8f18199879e6236d5659828445a1bcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 22:25:29 +00:00
Treehugger Robot
5c3d19f7eb Merge "Sandbox libc_musl_sysroot_bits" into main am: ae4cad3cda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847249

Change-Id: I05c16f35712544a2be6fe2a620de77829b486af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 22:25:15 +00:00
Treehugger Robot
639a094825 Merge "Sandbox pvmfw_fdt_template_rs" into main am: 1f294415f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847250

Change-Id: I209b02d3d176b92717bff42d1800e9d197ac9ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 22:24:54 +00:00
Treehugger Robot
328f58ac89 Merge "rust: rust-project.json: Skip disabled modules" into main am: 359611c1df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847243

Change-Id: I1850b091bad11cc09a0164b5ace9d639d2effd8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 22:24:00 +00:00
Cole Faust
962ee8be34 Sandbox apexd test genrules 
Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py gen_corrupt_rebootless_apex gen_key_mismatch_capex
Change-Id: I558f0b856f80bfebbb9b68b8c95c587d4e13ac84
 2023-11-27 14:11:05 -08:00
Treehugger Robot
63e3ecbaa3 Merge "Remove google_clockwork list of soong plugins" into main 2023-11-27 21:49:39 +00:00
Treehugger Robot
ae4cad3cda Merge "Sandbox libc_musl_sysroot_bits" into main 2023-11-27 21:32:58 +00:00
Treehugger Robot
1f294415f5 Merge "Sandbox pvmfw_fdt_template_rs" into main 2023-11-27 21:32:57 +00:00
Treehugger Robot
359611c1df Merge "rust: rust-project.json: Skip disabled modules" into main 2023-11-27 21:12:11 +00:00
Cole Faust
77beb6f12a Remove google_clockwork list of soong plugins 
The only plugin in that list has been removed.

Bug: 307824623
Test: Presubmits
Change-Id: Ieceb8610cfb2425500659a009703895a4f499cb1
 2023-11-27 12:29:55 -08:00
Cole Faust
c115217249 Sandbox pvmfw_fdt_template_rs 
This already works with sandboxing, I'm not sure why it was added.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py pvmfw_fdt_template_rs
Change-Id: I43390274740144122aae2a225807a6e1100c85c1
 2023-11-27 12:28:14 -08:00
Cole Faust
eb9028d240 Sandbox libc_musl_sysroot_bits 
Sandboxing it produces this diff:

  $ diff <(zipinfo -l out_not_sandboxed/soong/.intermediates/external/musl/libc_musl_sysroot_bits/linux_glibc_x86_64/gen/  libc_musl_sysroot_bits.zip) <(zipinfo -l out/soong/.intermediates/external/musl/libc_musl_sysroot_bits/linux_glibc_x86_64/gen/  libc_musl_sysroot_bits.zip)
  1,3c1,2
  < Archive:  out_not_sandboxed/soong/.intermediates/external/musl/libc_musl_sysroot_bits/linux_glibc_x86_64/gen/  libc_musl_sysroot_bits.zip
  < Zip file size: 8535 bytes, number of entries: 16
  < -rw-r--r--  2.0 unx      421 bl      225 defN 08-Jan-01 00:00 include/bits/alltypes.h.in
  ---
  > Archive:  out/soong/.intermediates/external/musl/libc_musl_sysroot_bits/linux_glibc_x86_64/gen/libc_musl_sysroot_bits.zip
  > Zip file size: 5358 bytes, number of entries: 14
  17d15
  < -rw-r--r--  2.0 unx    10384 bl     2666 defN 08-Jan-01 00:00 include/bits/syscall.h.in
  19c17
  < 16 files, 21039 bytes uncompressed, 6439 bytes compressed:  69.4%
  ---

So the alltypes.h.in and syscall.h.in are removed from the zip after
sandboxing. This seems good, because those two files are handled
separately already in that Android.bp file, and are not regular header
files like the rest of the zip file.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py libc_musl_sysroot_bits
Change-Id: I46b6340046ad7df85ea4fc9c54b46ade305661e6
 2023-11-27 12:18:52 -08:00
Treehugger Robot
a65a60a64c Merge "Sandbox tflite-support genrules" into main am: 4e788f2456 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842067

Change-Id: I69156d05da1f0c2f03dc776bf3359314bf722be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 19:30:49 +00:00
Treehugger Robot
4e788f2456 Merge "Sandbox tflite-support genrules" into main 2023-11-27 18:41:42 +00:00
Matthew Maurer
5a3c71c1aa rust: rust-project.json: Skip disabled modules 
Disabled modules may not have a valid root path.

Bug: 313410568
Test: SOONG_GEN_RUST_PROJECT=1 m nothing
Change-Id: I253cca18493193245aa198adfce5fd75cf27cefb
 2023-11-27 17:54:03 +00:00
David Srbecky
efb785c929 Merge "Change position of R8/D8 flags on the command line." into main am: ea5bb25378 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2845918

Change-Id: Ib2480ac6ccc8ac459cbc9f38bc8c909bf8dfc109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 16:28:40 +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
David Srbecky
ea5bb25378 Merge "Change position of R8/D8 flags on the command line." into main 2023-11-27 15:44:04 +00:00
David Srbecky
bda964cf90 Change position of R8/D8 flags on the command line. 
The wrapper script requires that all -J* options are passed first.

Test: m
Change-Id: Idd1da394c8a46db3485a1b31284eb6f398e3ba27
 2023-11-27 14:27:45 +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
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
Yi Kong
9c3f433426 Remove PGO build support 
We have removed our final PGO enabled project, time to remove PGO build
support.

Test: presubmit
Change-Id: I14ccd0fc8e3fbb8b3015072245fafd0eebe3ec08
 2023-11-24 17:14:27 +09:00
Yi-Yo Chiang
939fe1a751 Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK 
These variables are no longer used. We don't build GKI in the platform
tree anymore. Remove these vars as we are not maintaining these.

Bug: 229701033
Test: presubmit
Change-Id: I7551aa37a049f3bc9252559a18feb0f6bdf0a548
 2023-11-24 15:07:21 +08: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
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
d766a44530 Merge "Sandbox r8retrace genrules" into main 2023-11-23 00:17:28 +00:00
Cole Faust
1ddb8125d3 Sandbox libbssl_sys_src_nostd 
go/roboleaf-busy-beavers-sandboxing

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

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py libbssl_sys_src_nostd
Change-Id: I4ec2686c560439c3150b74b14e313ed6b688720c
 2023-11-22 15:23:50 -08:00
Cole Faust
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