Commit Graph

85321 Commits

Author SHA1 Message Date
Spandan Das
309a612c9f Remove prebuilt_apex_module_creator mutator
prebuilt apex modules no longer create internal modules, so this
mutator is not necessary.

Test: go build ./apex
Change-Id: I12c08b8f36efab8a9898341052b6f3cd26a0e803
2024-09-23 23:06:53 +00:00
Liana Kazanova
5c1283460c Merge "Revert "pass read new storage parameter to java codegen"" into main 2024-09-23 22:51:13 +00:00
Liana Kazanova
df1c59a657 Revert "pass read new storage parameter to java codegen"
This reverts commit 9cf2e8e140.

Reason for revert:DroidMonitor - Potential culprit for http://b/369200837 - Verifying through ABTD before submission. 

Change-Id: I635ba732fba40b7c73b5c419ef204fb14e857cb2
2024-09-23 21:54:04 +00:00
Spandan Das
9d6e209f44 Remove the internal extractor module created by apex_set
The build actions will be generated by the top-level apex.

Test: go test ./apex
Test: lunch cf_x86_64_phone-next-userdebug (uses mainline prebuilts)
Test: verified no diff in file_list.txt
Bug: 368337090
Change-Id: I170cf4beec18b54cd950560ea0991bc6f1455d76
2024-09-23 20:56:12 +00:00
Spandan Das
e350e36e7b Remove the internal selector module created by prebuilt_apex
Since the deapex actions have been moved to the top-level apex, this
internal module is no longer neessary.

Test: go test ./apex
Test: lunch cf_x86_64_phone-next-userdebug (uses mainline prebuilts)
Test: verified no diff in file_list.txt
Bug: 368337090

Change-Id: I53695e028a36a689fd1b026f5783de7d8567be76
2024-09-23 20:46:36 +00:00
Spandan Das
e2860d9db6 Merge changes I0edb681b,I0ea2327f into main
* changes:
  Remove internal deapexer module
  Remove deapex support from java_*_import
2024-09-23 20:28:36 +00:00
Zhi Dou
168b3f8581 Merge "pass read new storage parameter to java codegen" into main 2024-09-23 19:49:07 +00:00
Zhi Dou
9cf2e8e140 pass read new storage parameter to java codegen
When RELEASE_READ_FROM_NEW_STORAGE is true, enable reading from new
storage. So that we can ensure nextfood is not impacted.

Test: m and check cf
Bug: 349874828
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c98032785339de11e34ee3d4f94b3ec3ed70d324)
Merged-In: Id12816206a16b17c23e3a53832d268f1600107b3
Change-Id: I95ad9457e6d9c07a5a5b3074045a383f004113a9
2024-09-23 19:29:41 +00:00
Yu Liu
480c0e5af9 Add an incremental parity test.
This is to ensure the incremental enabled clean
build generates the equivalent ninja statements
as the normal build.

Bug: 358428180
Test: Run the test locally.
Change-Id: I2ecbffb125eced73bd59b63da8ad2a9504ae7cb8
2024-09-23 17:34:15 +00:00
Jihoon Kang
1a7d900c78 Merge changes Ica0cb5a5,If432cdc6,Idb4b0b0a into main
* changes:
  Revert^2 "Remove java_sdk_library "magic""
  Revert^2 "Restrict java_sdk_library in libs of java_import and droidstubs modules"
  Revert^2 "Restrict java_sdk_library in libs"
2024-09-23 17:09:43 +00:00
Spandan Das
52c01a1897 Remove internal deapexer module
The build ations will be created by the top-level apex.

Details
1. In GenerateAndroidBuildActions, do a graph walk to determine if the
   apex has exported deps.
2. If there are exported deps, call the newly introduced `deapex`
   function. This registers the build rules and returns a DeapexerInfo
object. This was previously provided by the internal deapexer
dependency.
3. Update `dexpreoptSystemServerJars and `provideApexExportsInfo` to use
   the DeapexerInfo object from (2).

A lot of unit tests that relied on the legacy mechanism of deapexing
have been updated.

Test: go test ./apex
Test: lunch cf_x86_64_phone-next-userdebug (uses mainline prebuilts)
Test: verified no diff in file_list.txt
Bug: 368337090
Change-Id: I0edb681beccac4d2a9ceb73f9a506c081a8a96e0
2024-09-20 23:47:36 +00:00
Spandan Das
a326b320ab Remove deapex support from java_*_import
prebuilt_apex/apex_set currently supports its deapexed contents to be
returned via a sibling java_import/java_sdk_import module. This is
necesssary for
1. dexpreopt/hiddenapi processing
2. usage as shared library

(1) is no longer necessary. this information is provided by the
top-level prebuilt apexes now

(2) is no longer possible since `exported_java_libs` has been removed in
https://r.android.com/3272110

This CL uses a hack for java_sdk_library_improt. Even though (1) is
provided by the top-level apex, there are still some places where
dexpreopt/hiddenapi processing visits the import modules. This CL uses
a bogus path to make analysis work. If this bogus path gets used, there
will be an error during ninja execution

Test: go test ./apex
Test: in internal lunch cf_x86_64_phone-next-userdebug (uses mainline
prebuilts)
Test: verified that file_list.txt is same
Bug: 368337090

Change-Id: I0ea2327f648f0fc60e337b232f7265e140772ffd
2024-09-20 23:33:09 +00:00
Treehugger Robot
29c267af2d Merge "Fix m ndk." into main 2024-09-20 22:25:31 +00:00
Jihoon Kang
da923b0ae3 Revert^2 "Remove java_sdk_library "magic""
This change removes the java_sdk_library to submodule calculus logic,
i.e. the "magic". The "magic" is no longer being used, as all existing
usages have been fixed to specify the submodule that it actually depends
on.

Test: m nothing --no-skip-soong-tests
Bug: 368144555
Change-Id: Ica0cb5a51d7a8192c2402c0c50ac35cb0b4df0a2
2024-09-20 21:57:19 +00:00
Jihoon Kang
c4db1092a8 Revert^2 "Restrict java_sdk_library in libs of java_import and droidstubs modules"
These are all remaining usages of "magic", which are being removed with
this change. The follow up change will remove the "magic".

Test: m nothing --no-skip-soong-tests
Bug: 366069293
Change-Id: If432cdc6621ac00564e14acbaefca53db1723686
2024-09-20 21:56:08 +00:00
Jihoon Kang
28c9657e24 Revert^2 "Restrict java_sdk_library in libs"
Instead, the module should specify the submodule it actually depends on.
This is a prereq change to removing the java_sdk_library "magic"

Test: m nothing --no-skip-soong-tests
Bug: 366069293
Change-Id: Idb4b0b0a953f5391c24e50294c940522b73c34f2
2024-09-20 21:55:23 +00:00
Krzysztof Kosiński
877a59e2eb Merge "Add ARMv9.2-A support for Rust." into main 2024-09-20 19:06:43 +00:00
Wei Li
6eff4e34f4 Merge "Revert "Revert "Add new module type notice_xml which is used to ..."" into main 2024-09-20 18:03:06 +00:00
Jihoon Kang
6c0a5d9d30 Merge changes from topic "revert-3271699-IARRNEVQHI" into main
* changes:
  Revert "Restrict java_sdk_library in libs of java_import and dro..."
  Revert "Remove java_sdk_library "magic""
2024-09-20 17:17:32 +00:00
Jihoon Kang
46e0613992 Merge "Revert "Restrict java_sdk_library in libs"" into main 2024-09-20 17:17:32 +00:00
Liana Kazanova
6a32dfdb86 Revert "Restrict java_sdk_library in libs of java_import and dro..."
Revert submission 3271699

Reason for revert: DroidMonitor: Potential culprit for http://b/368606825 - verifying through ABTD before submission. 

Reverted changes: /q/submissionid:3271699

Change-Id: I65f0e10eb775fd08dd958b699ce1191da7ce0669
2024-09-20 17:09:21 +00:00
Liana Kazanova
4340863ed9 Revert "Remove java_sdk_library "magic""
Revert submission 3271699

Reason for revert: DroidMonitor: Potential culprit for http://b/368606825 - verifying through ABTD before submission. 

Reverted changes: /q/submissionid:3271699

Change-Id: If40f7956e699246cf1d72ffc50ffffa4696504df
2024-09-20 17:09:21 +00:00
Jihoon Kang
33cbd37c00 Revert "Restrict java_sdk_library in libs"
This reverts commit 125efc6c30.

Reason for revert: b/368606825

Change-Id: Ia24f637db202f24be2ee13c7fe78e19a69576ffa
2024-09-20 17:09:09 +00:00
Treehugger Robot
96f04689a9 Merge changes I653bd734,I4762682c into main
* changes:
  Remove java_sdk_library "magic"
  Restrict java_sdk_library in libs of java_import and droidstubs modules
2024-09-20 15:23:12 +00:00
Treehugger Robot
37b288262e Merge "Restrict java_sdk_library in libs" into main 2024-09-20 15:23:12 +00:00
Inseob Kim
b33154033a Merge "Make init_rc property configurable" into main 2024-09-20 08:01:57 +00:00
Treehugger Robot
f771470d8c Merge "Fixes host_required_modules for test_module_config" into main 2024-09-20 02:29:51 +00:00
Ronald Braunstein
5c647d8d97 Fixes host_required_modules for test_module_config
We weren't emitting the needed .mk variable for host_required modules.

Test: atest -c CtsLibcoreTestCases_dalvik_system
Test: CtsBackupTestCases_cts_permissiontest
Bug: b/368357047
Change-Id: I6ed7bd6d64dba0ed93f3eead74752911f63276b2
2024-09-19 23:20:23 +00:00
Yu Liu
d37ccb7765 Add some log to the build action caching test.
Bug: 358428180
Test: Run the test locally.
Change-Id: I74c941381956b149a9595c69cbfe2ba7ec402cca
2024-09-19 22:16:27 +00:00
Jihoon Kang
25dc02902a Remove java_sdk_library "magic"
This change removes the java_sdk_library to submodule calculus logic,
i.e. the "magic". The "magic" is no longer being used, as all existing
usages have been fixed to specify the submodule that it actually depends
on.

Test: m nothing --no-skip-soong-tests
Bug: 368144555
Change-Id: I653bd734959c3366a40f003274c921b012be24ca
2024-09-19 21:45:01 +00:00
Jihoon Kang
0d28fd30e5 Restrict java_sdk_library in libs of java_import and droidstubs modules
These are all remaining usages of "magic", which are being removed with
this change. The follow up change will remove the "magic".

Test: m nothing --no-skip-soong-tests
Bug: 366069293
Change-Id: I4762682cb8696b435b9f0fb0f4c55ba2fa865f05
2024-09-19 21:44:40 +00:00
Jihoon Kang
125efc6c30 Restrict java_sdk_library in libs
Instead, the module should specify the submodule it actually depends on.
This is a prereq change to removing the java_sdk_library "magic"

Test: m nothing --no-skip-soong-tests
Bug: 366069293
Change-Id: I9137c079afc7abf201e597e323ae7de415eea0dc
2024-09-19 21:44:20 +00:00
Florian Mayer
d72360f84b Merge "Use -target-feature for MTE" into main 2024-09-19 20:39:55 +00:00
Wei Li
faf198a728 Revert "Revert "Add new module type notice_xml which is used to ..."
Revert submission 3272666-revert-3273112-soong-notice-xml-XKFAUDLTXP

Reason for revert: reland it

Reverted changes: /q/submissionid:3272666-revert-3273112-soong-notice-xml-XKFAUDLTXP

Change-Id: I02434af6cb2af235cf26fad43cc890d14dbd8d64
2024-09-19 19:57:49 +00:00
Treehugger Robot
37842ac3b1 Merge "Make dexpreopt properties configurable" into main 2024-09-19 19:06:37 +00:00
Cole Faust
eb03246f6f Make dexpreopt properties configurable
Spurred by ag/27778860

Test: m nothing --no-skip-soong-tests
Change-Id: I0e48144172eee1c589f46875cd94e3aa19d43873
2024-09-19 11:12:54 -07:00
Priyanka Advani (xWF)
21ebba6196 Merge "Revert "Add new module type notice_xml which is used to define m..."" into main 2024-09-19 17:53:20 +00:00
Priyanka Advani (xWF)
8a696acfa7 Revert "Add new module type notice_xml which is used to define m..."
Revert submission 3273112-soong-notice-xml

Reason for revert: Droidmonitor created revert due to b/368348129.

Reverted changes: /q/submissionid:3273112-soong-notice-xml

Change-Id: I832601982bc314365ee0aaf0ff9ffc4ad99f9cf3
2024-09-19 17:43:38 +00:00
Wei Li
2a9d408e9a Merge "Add new module type notice_xml which is used to define modules that generate NOTICE.xml.gz for partitions." into main 2024-09-19 17:37:06 +00:00
Treehugger Robot
fc79aabd84 Merge "Add default_visibility for soong modules" into main 2024-09-19 02:14:55 +00:00
Inseob Kim
713b87da61 Make init_rc property configurable
Bug: 331320802
Test: build
Change-Id: Id9c85f2f80381febf360fe320ee43017ec9948b1
2024-09-19 10:13:21 +09:00
Cole Faust
16d227a725 Add default_visibility for soong modules
So that we don't get surprise usages.

Bug: 348717861
Test: m nothing
Change-Id: I47319a727092c1bd936cca88f5713ee977a48b48
2024-09-18 17:41:30 -07:00
Krzysztof Kosiński
9aa9838004 Add ARMv9.2-A support for Rust.
Bug: 364383722
Test: presubmit, internal build for relevant device
Change-Id: I6e9db98fa2b31349484f83baef612527fbe7c15a
2024-09-19 00:08:16 +00:00
Treehugger Robot
e2aeb50e49 Merge "Add a unit test for class loader context with java_sdk_library impl lib" into main 2024-09-18 23:51:25 +00:00
Wei Li
68c165c145 Add new module type notice_xml which is used to define modules that generate NOTICE.xml.gz for partitions.
Bug: 330949782
Bug: 338342381
Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng && m, and check that system/etc/NOTICE.xml.gz have all the XML elements.
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-eng && m, and check that system/etc/NOTICE.xml.gz has root element only.
Change-Id: I82e90bd9aa3dabc605acfe8da697ab1f7e7ecf9b
2024-09-18 23:44:52 +00:00
Treehugger Robot
c5459aa57f Merge "Remove exported_java_libs from prebuilt_apex/apex_set module types" into main 2024-09-18 22:59:25 +00:00
Jihoon Kang
e246bb7eca Add a unit test for class loader context with java_sdk_library impl lib
This test case tests the behavior added with aosp/3267383

Test: m nothing --no-skip-soong-tests
Bug: 366572133
Change-Id: Id7df3b76e6ef4880ac14e55bf8e0d81597d10055
2024-09-18 22:26:22 +00:00
Spandan Das
1896fd6006 Remove exported_java_libs from prebuilt_apex/apex_set module types
`exported_java_libs` provide information to soong about which .jars in a
prebuilt .apex need to be deapexed. This property is not used today,
since the only use case for deapexing is for dexpreopt, and dexpreopt is
done using bootjars (encapsulated using
`exported_bootclasspath_fragments`) and systemserver jars (encapsulated
using `exported_systemserverclasspath_fragments`)

Test: go test ./apex
Change-Id: I4ceec74aa11d8e32ccfb0bab29a4489cf8b3fc3d
2024-09-18 21:49:14 +00:00
Florian Mayer
94d296d3d7 Use -target-feature for MTE
This combines with other features.

Bug: 366222162
Change-Id: Ia560e34ec8b83e075cef863d2a7f84fb01882049
2024-09-18 21:18:15 +00:00
Dan Albert
9c8e0c4e64 Fix m ndk.
Apparently treehugger doesn't cover this, and autosubmit fired before
I had a chance to upload the second PS.

Bug: None
Test: m ndk
Change-Id: I292f7349b98d5f9132ea41729933c1462e100a69
2024-09-18 20:45:44 +00:00