157 Commits

Author SHA1 Message Date
shuixx
a2f63d21f0 strix 2025-07-14 03:06:44 +00:00
Chirayu Desai
c3a7fada7e Don't set PRODUCT_ENABLE_UFFD_GC by default
* Overriding this from devices doesn't work
* Using ?= here doesn't work either
* It still defaults to "default" based on other places
  and works the same, so let's just remove this

Change-Id: Ie9d732796a46770c11a7608e7c0990653d59fbd0
Signed-off-by: RITEFANG <1721985272@qq.com>
2025-02-05 20:41:13 +08:00
Shreshta Manu
dad619fb93 Merge "[Ranging] Add service-ranging to build" into main 2024-09-19 18:33:16 +00:00
Shreshta Manu
d3f628f084 Merge "[Ranging] Add ranging to build" into main 2024-09-19 18:32:51 +00:00
Shreshta Manu
420237dc41 [Ranging] Add service-ranging to build
Bug: 364930449
Test: compiles
Change-Id: Ib14d0434a3e40e8dee76eea647051816dc8a740c
2024-09-18 03:27:54 +00:00
Shreshta Manu
1e9faa2bc9 [Ranging] Add ranging to build
Bug: 364930449
Test: compiles
Change-Id: I35af9f96715be1366fba7041b65094e5a8c04eb0
2024-09-18 03:25:55 +00:00
Ankita Vyas
d51b2e3edd Add new framework-photopicker inside MediaProvider module
Bug: 359548801
Test: presubmit and m

Change-Id: Ic29a1097bf73657973174769973e50e7dd985cc6
Merged-In: Ic29a1097bf73657973174769973e50e7dd985cc6
2024-09-06 09:37:50 +00:00
Alyssa Ketpreechasawat
06c53db3e5 Use build flag to control the apex boot jars to be excluded.
Different prebuilts might have different contents and thus, different
boot jars to be removed from the existing apex boot jar lists e.g. next
using U prebuilts would need to remove framework-pdf while ap31 with V
prebuilts must not remove such. The existing mechanism will always
remove framework-pdf whenever prebuilts are enabled regardless of
release config, which is not correct in context of multiple prebuilt
support.

Ignore-AOSP-First: for successful build, we need to submit this togther with ag/26332775. this cl will get cp'ed into aosp later on
Bug: 327022391
Test: build device in next and trunk
Change-Id: I9949fb7075ab6c207a292f13fd75e010a4958f87
2024-02-28 21:21:10 +00:00
Carmen Jackson
4889c99c39 Use Profiling flag at build time
This change puts base_system and default_art_config references to
the profiling module behind the build flag.

It also adds the flag to soong_config_vars so it can be referenced
from the Profiling module and from platform_bootclasspath.

Bug: 293957254
Bug: 325523640
Test: Built locally on trunk_food (where flag is disabled) and
trunk_staging (where flag is enabled.)
Ignore-AOSP-First: Must be submitted in topic with internal-only
changes.

Change-Id: I51cfa65ff607753cc8c588793ea381419ac99260
2024-02-27 06:43:55 +00:00
Nishant Panwar
8eaf2d496d Merge "Add SDK library framework-pdf-v in MediaProvider" into main am: 4070731507 am: 04d3711835
Original change: https://android-review.googlesource.com/c/platform/build/+/2954779

Change-Id: Ia7e0717a0985fbf3f662a747420847c1f64aa61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 07:43:42 +00:00
Nishant Panwar
04d3711835 Merge "Add SDK library framework-pdf-v in MediaProvider" into main am: 4070731507
Original change: https://android-review.googlesource.com/c/platform/build/+/2954779

Change-Id: I133868720f662e4d465bf02fa7381df144619ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 07:02:26 +00:00
Nishant Panwar
6d0576122a Add SDK library framework-pdf-v in MediaProvider
SDK library for pdf related bootclasspath classes that were part of the non-updatable API before V, and were moved to the module in V. Other pdf related bootclasspath classes in mediaprovider should go to framework-pdf.

Bug: b/324667310
Test: presubmit and m
Change-Id: I92aabf297508f2c885a721d11d40b5262b6847fe
2024-02-17 05:09:00 +00:00
Nikita Ioffe
8d72201be9 Merge "Add service-virtualization.jar to PRODUCT_APEX_SYSTEM_SERVER_JARS" into main am: 65146d24b0 am: 40cb5a1d84
Original change: https://android-review.googlesource.com/c/platform/build/+/2946229

Change-Id: I69022ed42a763bfdf8eb870c18bc82d89c2765ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 23:52:28 +00:00
Nikita Ioffe
40cb5a1d84 Merge "Add service-virtualization.jar to PRODUCT_APEX_SYSTEM_SERVER_JARS" into main am: 65146d24b0
Original change: https://android-review.googlesource.com/c/platform/build/+/2946229

Change-Id: Iacf5799a384d4f6bfeea68905d4416c2a6c789be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 23:10:45 +00:00
Nikita Ioffe
441d359c7b Add service-virtualization.jar to PRODUCT_APEX_SYSTEM_SERVER_JARS
This jar is part of the com.android.virt non-updatable APEX.

Bug: 323339759
Test: build
Test: boot device
Change-Id: I8090b8bf22d647d5f6c1dd1bf68a6e468b4ac694
2024-02-05 13:15:12 +00:00
Harshit Mahajan
08a4f790d3 Merge "Revert^2 "[CrashRecovery] Add module to BCP and SSCP"" into main 2024-02-02 10:58:17 +00:00
Yisroel Forta
1d9b23b43e Merge "Add Profiling module" into main 2024-02-01 20:02:40 +00:00
Yisroel Forta
f64e1b27e7 Add Profiling module
Ignore-AOSP-First: in topic with internal first project
Test: service successfully starts
Bug: 293957254
Change-Id: Id9ef203544bb0ffe6caa2ee8ccf98876112aee81
2024-01-31 15:59:16 +00:00
Harshit Mahajan
f39abd6ceb Revert^2 "[CrashRecovery] Add module to BCP and SSCP"
1b22a8e7dd

Bug: b/289203818
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:7b6a18c4bd9d195f2e0da5469c0d56751cd4dd51)
Merged-In: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
Change-Id: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
2024-01-31 14:39:07 +00:00
Xin Li
e693b5037e Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b
Change-Id: I42210485ad8f07e19408bef0e5a2af23f6a0e596
2024-01-30 10:33:42 -08:00
Harshit Mahajan
7b6a18c4bd Revert^2 "[CrashRecovery] Add module to BCP and SSCP"
1b22a8e7dd

Bug: b/289203818
Test: m
Change-Id: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
2024-01-17 15:01:24 +00:00
Roshan Pius
7d26fd45c3 build: Set soong variable for enabling NFC apex bootclasspath fragment
Bug: 303286040
Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=NfcNci)
Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=com.android.nfcservices)
Change-Id: Ibd1e28c7b6bcbff81c98e6be91d6a11b1e3ab1ae
2024-01-13 14:53:41 -08:00
Roshan Pius
dbaddabffb build: Allow NFC stack to be delivered as a mainline module or APK
These changes are necessary to allow NFC stack delivery to be properly
trunk stable flagged:
1. Delivered as NfcNci.apk and framework-nfc.jar for Android
U based builds (existing).
2. Delivered as com.android.nfcservices.apex which embeds NfcNci.apk &
framework-nfc.jar for Android V based builds (new).

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:046c1816091f9150c91953b8571dc946b0a59f86)
Merged-In: Ib2170146d07763ff6c852ce810497ebe1ac2eead

Change-Id: Ib2170146d07763ff6c852ce810497ebe1ac2eead
2024-01-12 18:17:26 -08:00
Roshan Pius
a6d8073bcf build: Allow NFC stack to be delivered as a mainline module or APK
These changes are necessary to allow NFC stack delivery to be properly
trunk stable flagged:
1. Delivered as NfcNci.apk and framework-nfc.jar for Android
U based builds (existing).
2. Delivered as com.android.nfcservices.apex which embeds NfcNci.apk &
framework-nfc.jar for Android V based builds (new).

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
Change-Id: Ib2170146d07763ff6c852ce810497ebe1ac2eead
2024-01-12 18:15:34 -08:00
Roshan Pius
999d9a1924 Merge "build(nfc): Create framework-nfc sdk library" into main 2023-12-01 17:12:39 +00:00
Roshan Pius
1da63a9bd7 Merge "build(nfc): Create framework-nfc sdk library" into main 2023-11-17 22:43:32 +00:00
Roshan Pius
1cbdc45437 build(nfc): Create framework-nfc sdk library
Using `framework-location` as reference.

Ignore-AOSP-First: Submitting separately to avoid merge conflicts. See
aosp/2828697
Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases

Change-Id: I4b9901d2b3924157caebad0d083c4beacbad9749
2023-11-17 14:40:47 -08:00
Roshan Pius
58f0337f22 build(nfc): Create framework-nfc sdk library
Splits out the NFC API classes that are going to be part of NFC mainline
module. Uses `framework-location` as reference.

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
Merged-In: I4b9901d2b3924157caebad0d083c4beacbad9749
Change-Id: I4b9901d2b3924157caebad0d083c4beacbad9749
2023-11-17 22:37:47 +00:00
Alyssa Ketpreechasawat
995fb11297 Merge "Revert "Revert "Added new framework-pdf jar inside MediaProvider..."" into main am: 35fd025c5c am: d87eef3862 am: de9c5ef71f
Original change: https://android-review.googlesource.com/c/platform/build/+/2822536

Change-Id: Ibd57d2c1c45eb42b6b5722e7d1bf7d9646515566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 11:40:04 +00:00
Alyssa Ketpreechasawat
35fd025c5c Merge "Revert "Revert "Added new framework-pdf jar inside MediaProvider..."" into main 2023-11-17 10:30:17 +00:00
Treehugger Robot
a463723f16 Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main 2023-11-15 11:43:29 +00:00
Harshit Mahajan
1b22a8e7dd Revert "[CrashRecovery] Add module to BCP and SSCP"
Revert submission 2789412-cherrypicker-L65800000963076834:N61100001405784943

Reason for revert: Leading to merge conflict
Bug: b/311082270

Reverted changes: /q/submissionid:2789412-cherrypicker-L65800000963076834:N61100001405784943

Change-Id: I2cbe26499ad5ce938db7cdd3ebaf9c2e48982de9
Merged-In: I39dfab62897d907023720b594d6929397403d314
2023-11-15 08:26:47 +00:00
Alyssa Ketpreechasawat
82f52a7cfc Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d am: 566f69178c am: b02812d84c
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531

Change-Id: Ia37497d25763fcd2ef563f2cc6097a9cae65737b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 20:42:55 +00:00
Alyssa Ketpreechasawat
ba231d2084 Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled.
framework-pdf is newly added framework jar which is not yet included in
the actual prebuilt apex. Thus, we add it PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY. The APEX_BOOT_JARS_EXCLUDED will be created based on PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY and will be removed from ApexBootJars.

Bug: 304719212
Test: lunch cf_x86_phone-next-userdebug & m
Test: lunch cf_x86_phone-trunk-userdebug & m
Change-Id: I9902131629900fbd629b8560a422ed8c2b06073c
2023-11-13 13:22:32 +00:00
Alyssa Ketpreechasawat
7b64118d72 Revert "Revert "Added new framework-pdf jar inside MediaProvider..."
Revert submission 2775627-revert-2759049-framework-pdf-UAOVGTHHXO

Reason for revert: submit together with the fix to allow this new jar to coexist w/ mainline prebuilts

Reverted changes: /q/submissionid:2775627-revert-2759049-framework-pdf-UAOVGTHHXO

Change-Id: I191f33fa932173140ab8fd4062514c7e082aec5e
2023-11-08 16:04:05 +00:00
Harshit Mahajan
d9199eb8ed Revert "[CrashRecovery] Add module to BCP and SSCP"
Revert submission 24444827-crashrecovery

Reason for revert: Since the module is not behind any flags, it is getting included in 24Q1 Beta release.

Reverted changes: /q/submissionid:24444827-crashrecovery
Bug: b/305826937
Change-Id: I39dfab62897d907023720b594d6929397403d314
2023-10-30 17:47:26 +00:00
Harshit Mahajan
99e1e71e47 [CrashRecovery] Add module to BCP and SSCP
Adding framework-crashrecovery to Bootclasspath and
service-crashrecovery to System Server Classpath.

Bug: b/289203818
Test: NA

Merged-In: I488730c04ba361955344f2c41a265836923307a6
Change-Id: I488730c04ba361955344f2c41a265836923307a6
2023-10-18 11:26:47 +00:00
Alyssa Ketpreechasawat
a3a597890e Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: b89b3f6108 am: f67da95b8c am: 7c247aa7a4 am: 01126a5b38 am: ca064c455a
Original change: https://android-review.googlesource.com/c/platform/build/+/2775631

Change-Id: I125bfc66070889ef894b83bed865ca1993fc48e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:47:33 +00:00
Alyssa Ketpreechasawat
b89b3f6108 Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main 2023-10-06 10:56:29 +00:00
Alyssa Ketpreechasawat
0a86673d46 Revert "Added new framework-pdf jar inside MediaProvider module"
Revert submission 2759049-framework-pdf

Reason for revert: it blocks us from enabling prebuilts in next target in main (go/stale-mainline-prebuilts for more info)

Reverted changes: /q/submissionid:2759049-framework-pdf

Change-Id: I7765daebf6a85f0c8d737c0cf163b1fdbe29f969
2023-10-05 16:09:51 +00:00
Mark White
48153e18ce Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 am: 23e70c67ad am: 032c4c62b8 am: 3f3f035f16 am: 0ced72aa62
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: I9f1f58bbebfd22aec316599a0ee33732cbeef108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 17:39:37 +00:00
Mark White
23e70c67ad Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: I6c7e02dbe20d457e5f63a2304665bca400879f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 13:26:48 +00:00
Mark White
ca047da45c Added new framework-pdf jar inside MediaProvider module
Bug: 301574837
Test: presubmit and m framework-pdf
Change-Id: Id9f5ae58d57c77fdaf4babee58430e75656e923f
2023-09-22 13:33:05 +00:00
Xin Li
be1435290d Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
2023-08-25 13:25:26 -07:00
Mark White
e3de809931 Merge "Created empty framework-location non-updatable module" into main 2023-08-23 17:25:38 +00:00
Kangping Dong
a06b145287 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 am: fcafc708a0 am: 5e0b44c76d am: 34aa3b1946
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: Ie08fae42b1ee474d2736087b373c52e07c84cf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 11:01:02 +00:00
Kangping Dong
fcafc708a0 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: I1122148b13710be4c9bd90ba253d7ddf1834b1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:44:27 +00:00
Kangping Dong
2a8b64271d Merge "Revert "add service-threadnetwork to system_server jars"" into main 2023-08-23 08:37:38 +00:00
Mark White
d7d9884f17 Created empty framework-location non-updatable module
Ignore-AOSP-First: Change in topic with internal-first projects
Bug: 289776578
Test: presubmit
Change-Id: I4955fdb127830fecf1f24e027c9bfaeaa87fc8c2
2023-08-16 23:22:50 +00:00
Kangping Dong
53adc11e69 Revert "add service-threadnetwork to system_server jars"
This reverts commit a1a7046533.

Reason for revert: the com.android.threadnetwork module is merged to com.android.tethering module

Bug: 296211911
Change-Id: I33195990307715315a3877910de0cf4582399d6c
2023-08-16 13:56:57 +00:00