Commit Graph

98501 Commits

Author SHA1 Message Date
Lokesh Kumar Goel
c4baa3aa72 Allow PLATFORM_BASE_OS override from product config
PLATFORM_BASE_OS is used to set value for
ro.build.version.base_os which is used to qualify
a device build as SMR (Security Maintenance Release)
during APFE (Android Partner Approval) to optimize the test span.
See ag/26859560 on how we plan to use this variable.

Add PRODUCT_BASE_OS that can be used to override
PLATFORM_BASE_OS value before making it read_only.

Plan is to set the value for PRODUCT_BASE_OS using build flags.
This way, it can be easily set per device when making on-demand
SMR releases. In future, move it to be set via soong variable
during build process once build system side is ready.

Test: None
Bug: 155105803

Change-Id: I7c4a1f291bb426ad599e1dc937e6ecd3889b5820
2024-08-01 15:38:12 -07:00
Yurii Zubrytskyi
7575d3f967 Merge "Revert^2 "Fix signing failure for split APKs"" into main 2024-08-01 15:59:31 +00:00
ELIYAZ MOMIN
10e47e3723 Revert^2 "Fix signing failure for split APKs"
This reverts commit d06e5a83ba.

Reason for revert: <It's not a culprit any more.>

Change-Id: I405c418e6da88774b174fcb3508eb54039fbdf8e
2024-08-01 15:43:31 +00:00
Treehugger Robot
80a07d6870 Merge "Added a basic prober script to test code completion." into main 2024-08-01 12:00:01 +00:00
ELIYAZ MOMIN
8a3f6256fc Merge "Revert "Fix signing failure for split APKs"" into main 2024-08-01 10:19:11 +00:00
Ilshat Aliyev
8e13493d4d Added a basic prober script to test code completion.
Run tests locally

Change-Id: Id8b8b6b4d9b1fae9d7cd5f04a20c239628351b16
2024-08-01 08:11:45 +00:00
Treehugger Robot
ff301aa3a9 Merge "Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk" into main 2024-08-01 07:01:29 +00:00
Pechetty Sravani (xWF)
d06e5a83ba Revert "Fix signing failure for split APKs"
This reverts commit 6871779d9b.

Reason for revert: Potential culprit for b/356752725- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I4c29b27f0318901130036dbe8ab9edef37f08875
2024-08-01 05:54:13 +00:00
Inseob Kim
0c7915558e Merge changes from topic "revert-3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP-XOXPVYPSBJ" into main
* changes:
  Revert^6 "Use Soong-built system/build.prop"
  Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..."
  Revert^2 "Conditionally pass kernel version to build.prop"
2024-08-01 00:02:58 +00:00
Treehugger Robot
787d933f87 Merge "Fix signing failure for split APKs" into main 2024-07-31 21:06:37 +00:00
Liana Kazanova
d0b03dd868 Merge "Revert "Add variables for init.environ.rc"" into main 2024-07-31 20:49:29 +00:00
Liana Kazanova
f2289bfdd2 Revert "Add variables for init.environ.rc"
Revert submission 3197177-init_environ_rc_soong

Reason for revert: DroidMonitor: Potential culprit for b/356587212 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3197177-init_environ_rc_soong

Change-Id: I7cfe54a994179577a7f3e3f86618ff04980aaf35
2024-07-31 17:56:40 +00:00
Kelvin Zhang
6871779d9b Fix signing failure for split APKs
Test: th
Bug: 353837347
Change-Id: Ifed9746c1e1d053a97860de3bab4380d6e207412
2024-07-31 10:36:47 -07:00
Treehugger Robot
44b3f9eb39 Merge "Add variables for init.environ.rc" into main 2024-07-31 05:37:30 +00:00
Inseob Kim
b97c96b4b3 Revert^6 "Use Soong-built system/build.prop"
0b2f48f0b2

Change-Id: I5d89d26945a3ab94f102633ccffa7622b5f99469
2024-07-31 02:00:41 +00:00
Inseob Kim
774a6dbbe8 Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..."
Revert submission 3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Reason for revert: fixed breakage with aosp/3200730, verified with ABTD

Reverted changes: /q/submissionid:3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Change-Id: I19163de97c397b9c171362d221389a1d66a5712a
2024-07-31 02:00:41 +00:00
Inseob Kim
b186331478 Revert^2 "Conditionally pass kernel version to build.prop"
ff77e22213

Change-Id: I846175bb9dc2b0e000fc39c7faf2e24167b4a513
2024-07-31 02:00:41 +00:00
Zhi Dou
3d960c5638 Merge "aconfig: make java cached indicator volatile" into main 2024-07-30 23:35:45 +00:00
Zhi Dou
39020e05c6 Merge "close file stream" into main 2024-07-30 23:35:42 +00:00
Inseob Kim
aac9b8d04f Merge changes from topic "revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP" into main
* changes:
  Revert "Conditionally pass kernel version to build.prop"
  Revert "Revert "Revert "Revert^2 "Add more variables for system/..."
  Revert^5 "Use Soong-built system/build.prop"
2024-07-30 23:30:29 +00:00
Ryan Prichard
7428bc438d Merge "Revert "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilt..."" into main 2024-07-30 21:42:23 +00:00
Liana Kazanova
ff77e22213 Revert "Conditionally pass kernel version to build.prop"
Revert submission 3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Change-Id: Icba8f01ef59ce969206c20981fcc17ea10378f5e
2024-07-30 19:14:30 +00:00
Liana Kazanova
dd3d5c1f3d Revert "Revert "Revert "Revert^2 "Add more variables for system/..."
Revert submission 3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Change-Id: Ic1c52133c80484b318f1ae72e2fd5b5fe199f9ab
2024-07-30 19:14:30 +00:00
Liana Kazanova
0b2f48f0b2 Revert^5 "Use Soong-built system/build.prop"
82b8062a90

Change-Id: I25acc66023397e67c009bea26623260f828fc0b9
2024-07-30 19:14:30 +00:00
Zhi Dou
97d02148b9 close file stream
Close file stream, since the in the restrict mode the runtime will check
whether all the resource is closed when it is out of scope.

Test: ABTD ImsStackJavaTests
Bug: 349874828
Change-Id: Ib297622bae730bf99e4d5d1b3adeff3fee805a93
2024-07-30 19:05:14 +00:00
Zhi Dou
36589bc318 aconfig: make java cached indicator volatile
Test: atest aconfig.test.java
Bug: 356201402
Change-Id: I1127a4092536fe199f4a7256dea0c2b289e837da
2024-07-30 18:21:43 +00:00
Luca Farsi
b67ff3e17e Merge "Properly log in build_test_suites.py" into main 2024-07-30 18:19:11 +00:00
Inseob Kim
6808b94f6d Add variables for init.environ.rc
Bug: 353429422
Test: boot cuttlefish
Change-Id: If46706c6fd89b5da2e56a84f1f7de946bdc74cb9
2024-07-30 17:48:06 +09:00
Inseob Kim
e72dcd549a Merge changes from topic "revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA" into main
* changes:
  Revert^4 "Use Soong-built system/build.prop"
  Revert "Revert "Revert^2 "Add more variables for system/build.pr..."
2024-07-30 03:51:03 +00:00
Inseob Kim
fa8586c3bb Merge "Conditionally pass kernel version to build.prop" into main 2024-07-30 03:51:03 +00:00
Ryan Prichard
6699bee8b9 Revert "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilt..."
Revert submission 3198506-revert-3195358-ndk-libcxx-UOZAIZERUU

Reason for revert: reland topic

Reverted changes: /q/submissionid:3198506-revert-3195358-ndk-libcxx-UOZAIZERUU

Bug: http://b/332594828
Test: treehugger
Change-Id: I36c9f825cccd02fdd5fc1cd67e5123fc9f84f6b1
2024-07-30 02:06:59 +00:00
Liana Kazanova
0a7e037a9a Merge "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang"" into main 2024-07-29 23:05:00 +00:00
Liana Kazanova
27cd53422f Revert "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang"
Revert submission 3195358-ndk-libcxx

Reason for revert: Droidmonitor created revert due to b/356220894. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3195358-ndk-libcxx

Change-Id: If4bac6cca12a4c70bab22ffd310f262ef6f5fb78
2024-07-29 22:58:44 +00:00
Ryan Prichard
56c607b139 Merge "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang" into main 2024-07-29 20:46:39 +00:00
Zhi Dou
5228a6f4a2 Merge "read new stoarge based on flag value" into main 2024-07-29 13:26:35 +00:00
Treehugger Robot
78decbf865 Merge "use smart pointer for fd" into main 2024-07-29 13:15:15 +00:00
Zhi Dou
66ff40c08a read new stoarge based on flag value
This change changes the logic to read the flag value from new storage.
Before it check the existence of a file. Not it will directly check the
flag value from DeviceConfig.

Test: m and presubmit
Bug: 349874828
Change-Id: I4a360564a3b48564057eede9bd893899136b3221
2024-07-26 22:46:47 +00:00
Zhi Dou
8add8e0c9b use smart pointer for fd
Test: presubmit
Bug: 348693143
Change-Id: Ibdb1e132a4840d0c3d82aa5f7546a0fc5f5f528b
2024-07-26 22:25:43 +00:00
Treehugger Robot
e75610b4c7 Merge "core/Makefile: Drop the raw packed desktop image from build artifacts." into main 2024-07-26 19:51:11 +00:00
Alex Klein
50687c3f2d core/Makefile: Drop the raw packed desktop image from build artifacts.
Drop the raw image now to avoid the extra storage usage/costs
before someone starts depending on it.

Bug: b:349581445
Test: None
Change-Id: I8a0ba12d7f00ebad3e85327b00e2f700028658b0
2024-07-26 18:56:24 +00:00
Zhi Dou
8c6ec5a33d Merge "add sdk none version for core lib usage" into main 2024-07-26 15:33:22 +00:00
Zhi Dou
0e5e128034 add sdk none version for core lib usage
Test: m
Bug: 349874828
Change-Id: I412bcf06ca38c862b026715a6a394350eda49b64
2024-07-26 14:03:50 +00:00
Treehugger Robot
e110c68023 Merge "Add HOST_PREFER_32_BIT to Soong Config and move art-tools to product configuration." into main 2024-07-26 06:42:16 +00:00
Ryan Prichard
bc61b3ded6 Switch NDK libc++ from prebuilts/ndk to prebuilts/clang
prebuilts/ndk is still used for the `system` STL.

Bug: http://b/332594828
Test: treehugger
Change-Id: I24db1b93e55745aa1e0ef5fe7899985adfa6223a
2024-07-25 21:58:24 -07:00
Nelson Li
e63be2a724 Add HOST_PREFER_32_BIT to Soong Config and move art-tools to product configuration.
This change accomplishes two things:

Adds `HOST_PREFER_32_BIT` to Soong config variables:
The `HOST_PREFER_32_BIT` environment variable is frequently used in
Android.mk files within the art/ directory. By adding it to
soong_config_variable, we make it accessible to the Soong build system,
which will be essential when converting art modules to Android.bp.

Moves `art-tools` to product configuration:
Originally, `art-tools` was a phony target added to
PRODUCT_HOST_PACKAGES. This approach is incorrect because
PRODUCT_HOST_PACKAGES should only contain actual modules, not phony
targets. We are addressing this by converting the dependencies and
conditional statements (ifeq) within `art-tools` into
PRODUCT_HOST_PACKAGES entries in base_system.mk.

Bug: 346702835
Test: m -j; Then, check related dependencies build in the system.
Change-Id: Iab252dea71c9df9d75f2701b33d3cd4d391e7f5d
2024-07-26 12:57:41 +08:00
Herbert Xue
973d57ce67 Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk
Bug: 348120216
Test: presubmit
Change-Id: Iad21acbbc29c84181646bdafbdb3069a863a098a
2024-07-26 11:21:03 +08:00
Wei Li
31964df630 Merge "Add new SBOM generation tool." into main 2024-07-26 00:45:43 +00:00
Treehugger Robot
afede373c0 Merge "make aconfig_storage_file.test.java use library from framework" into main 2024-07-25 23:50:06 +00:00
Treehugger Robot
2837b5ec07 Merge "core/Makefile: Add dist-for-goals calls for desktop image." into main 2024-07-25 21:30:01 +00:00
Zhi Dou
d6b37c1be7 make aconfig_storage_file.test.java use library from framework
Test: atest aconfig_storage_file.test.java
Bug: 349874828
Change-Id: If6fbf086e889a2c0068a1ca22979db39f5d86448
2024-07-25 19:30:13 +00:00