Commit Graph

92890 Commits

Author SHA1 Message Date
Aditya Choudhary
c35ca4de22 Merge "Split filepaths on ' ' in metadata generator" into main 2023-11-21 16:09:23 +00:00
Aditya Choudhary
93cd9f6791 Split filepaths on ' ' in metadata generator
Test: go test

Change-Id: I5063c5a0b93501010b38aea91e8648cf5960ee6e
2023-11-21 14:02:43 +00:00
Inseob Kim
aa9a4a4907 Add CHECK_DEV_TYPE_VIOLATIONS
If PRODUCT_CHECK_DEV_TYPE_VIOLATIONS is set or vendor api level is
greater than V (35), sepolicy dev type test will be run which checks if
all /dev nodes have dev_type attribute.

Bug: 303367345
Test: set PRODUCT_CHECK_DEV_TYPE_VIOLATIONS, see
sepolicy_dev_type_test's build command

Change-Id: Ibf25c1dacb5132ccda5265d6d2ce9fe655ffbc87
2023-11-21 13:01:40 +00:00
Treehugger Robot
bc2fe4f526 Merge "Add HIDL support services to telephony_system_ext" into main am: 99ec4c5bff
Original change: https://android-review.googlesource.com/c/platform/build/+/2838551

Change-Id: I28bab7429533874f22f2130982c568e0aab39500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:56:31 +00:00
Treehugger Robot
99ec4c5bff Merge "Add HIDL support services to telephony_system_ext" into main 2023-11-21 04:15:59 +00:00
Treehugger Robot
f7f3b97748 Merge "Add HIDL support services to handheld system_ext" into main am: 9955a2ca6c
Original change: https://android-review.googlesource.com/c/platform/build/+/2838469

Change-Id: I87701abca5d9f2b1b8646de5b94ad76552b8dc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:32:58 +00:00
Devin Moore
e80691f1c7 Add HIDL support services to telephony_system_ext
Some devices don't use base_system_ext.mk and instead use
telephony_system_ext.mk.
These also need the HIDL support services for devices launched before V.

Test: m
Bug: 305873288
Change-Id: I9a92c274291f547f607556eacf9f3d641350aa87
2023-11-21 02:58:57 +00:00
Treehugger Robot
9955a2ca6c Merge "Add HIDL support services to handheld system_ext" into main 2023-11-21 02:54:37 +00:00
Treehugger Robot
924762e4a9 Merge "Add --boot-image-dir-path arg" into main am: fdd0c0cdde
Original change: https://android-review.googlesource.com/c/platform/build/+/2821038

Change-Id: I4e2775ff6dddf7b6a4845521d6f21b77dc402c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:44 +00:00
Treehugger Robot
fdd0c0cdde Merge "Add --boot-image-dir-path arg" into main 2023-11-21 02:09:17 +00:00
Devin Moore
97cb15a1f5 Add HIDL support services to handheld system_ext
Some devices don't use base_system_ext.mk and instead use
handheld_system_ext.mk.
These also need the HIDL support services for devices launched before V.

Test: m
Bug: 305873288
Change-Id: Ic482216fa49c12f52668a499dedaa1ed19c0c4a7
2023-11-21 02:03:59 +00:00
Devin Moore
5a2b449c31 Merge "Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker" into main am: ca2c656091
Original change: https://android-review.googlesource.com/c/platform/build/+/2838539

Change-Id: I5314dea9486a040f24882de5048b4b7e675c1701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 22:34:36 +00:00
Devin Moore
ca2c656091 Merge "Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker" into main 2023-11-20 21:49:35 +00:00
Oriol Prieto Gasco
0b9d289e2a Add is_exported field to aconfig.proto
When a flag is exported, it can be read by code built in other containers. By
default flags are not exported. Set this to true if your flag is gating
a public API which may be called from other containers (typically, a
flag used in @FlaggedAPI annotations).

Test: atest aconfig.test
Bug: 311152500
Change-Id: I53e3ed18b96c1518f04172d5933ef96b41ccda7e
2023-11-20 21:30:18 +00:00
Devin Moore
d47e194115 Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker
Test: lunch gsi_tv_arm-userdebug  && m
Bug: 299166571
Change-Id: Ic2ceab29967ef5343dc924c52e0928ada06671f8
2023-11-20 20:45:58 +00:00
Wonsik Kim
d4d952f9d2 aconfig: move cache_ as a memeber
provider_ object relies on cache_ vector to be alive, but the order
of destruction between these objects at exit are not guaranteed.
This can lead to crash at the exit especially on ASAN build.
By putting cache_ as a member it is guaranteed that cache_ is not
destructed until provider_ is destructed.

Test: m ; m AconfigDemoActivity
Test: atest aconfig.test
Test: observe no crash on _hwasan build
Change-Id: If9e23e99c501bf8f06fcab003622948b9e730352
2023-11-20 09:50:52 -08:00
Devin Moore
61fc96366b Merge changes from topic "reland_hidl_mapper_removal" into main am: 8faa4a5880
Original change: https://android-review.googlesource.com/c/platform/build/+/2828695

Change-Id: I6009b4b6a6f90cd392b5aea970f686f39780bea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18 00:11:51 +00:00
Treehugger Robot
3e3e0eee59 Merge "Disable boot.zip on eng build." into main am: 6b5e766392
Original change: https://android-review.googlesource.com/c/platform/build/+/2835303

Change-Id: Id8f650bccaa9bbbaa4dead6d36ec93ce6d13ead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18 00:11:28 +00:00
Devin Moore
8faa4a5880 Merge changes from topic "reland_hidl_mapper_removal" into main
* changes:
  Reapply "Stop including android.hidl.memory ashmem impl on V+ devices"
  Reapply "Remove android.hidl.memory library from the VNDK"
2023-11-18 00:01:21 +00:00
Treehugger Robot
6b5e766392 Merge "Disable boot.zip on eng build." into main 2023-11-17 23:31:03 +00: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
Jiakai Zhang
5b5ab173ed Disable boot.zip on eng build.
boot.zip is not useful on eng build.

Bug: 310681823
Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng && m dist
Change-Id: I40eb73d1783381bd38b644709769d5ff51397b3e
2023-11-17 22:23:28 +00:00
Colin Cross
a9b72f9311 Merge "Store ALL_DEPS under my_register_name" into main am: 6b35685744
Original change: https://android-review.googlesource.com/c/platform/build/+/2835092

Change-Id: I8c8b7209f11474b11df4ff0391bbb022b238e403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 21:43:14 +00:00
Colin Cross
0dfc051190 Merge "Remove ALL_DEPS.MODULES" into main am: 276d8bdd50
Original change: https://android-review.googlesource.com/c/platform/build/+/2835091

Change-Id: I93095bc7688029335c1106d3ea3535e27a284c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 21:42:28 +00:00
Colin Cross
6b35685744 Merge "Store ALL_DEPS under my_register_name" into main 2023-11-17 21:09:55 +00:00
Colin Cross
276d8bdd50 Merge "Remove ALL_DEPS.MODULES" into main 2023-11-17 21:08:28 +00:00
Colin Cross
187e1ec92e Merge "Revert "Add banner announcing adevice when running builds."" into main am: 3cf51d84af
Original change: https://android-review.googlesource.com/c/platform/build/+/2835048

Change-Id: I19ace902c59293148367d10b5a03660ff9c34d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 19:50:43 +00:00
Colin Cross
3cf51d84af Merge "Revert "Add banner announcing adevice when running builds."" into main 2023-11-17 19:17:08 +00:00
Colin Cross
0fa5af19b9 Revert "Add banner announcing adevice when running builds."
This reverts commit 6d10bbddf9.

Reason for revert: broke exit code from `m`

Bug: 309792999
Change-Id: If0de43003a9c4427d1da941de4afc28723ee0cd3
2023-11-17 18:18:00 +00:00
Treehugger Robot
ec2402da1b Merge "aconfig: rename test flag disabled_rw_2 -> disabled_rw_in_other_namespace" into main am: 085c016934
Original change: https://android-review.googlesource.com/c/platform/build/+/2836475

Change-Id: Id5ac5df89d3d124cb83227ac98c729aef04e7b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 14:56:36 +00:00
Treehugger Robot
085c016934 Merge "aconfig: rename test flag disabled_rw_2 -> disabled_rw_in_other_namespace" into main 2023-11-17 14:20:25 +00:00
Aditya Choudhary
648c965b5c Merge "Handle empty input file case in Metadata generation" into main am: d5e2717e27
Original change: https://android-review.googlesource.com/c/platform/build/+/2835510

Change-Id: Iafefabdfdbe8557f1ffade6dd1f96f3415e0d9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 12:46:48 +00:00
Aditya Choudhary
d5e2717e27 Merge "Handle empty input file case in Metadata generation" into main 2023-11-17 12:19:55 +00:00
Alyssa Ketpreechasawat
d87eef3862 Merge "Revert "Revert "Added new framework-pdf jar inside MediaProvider..."" into main am: 35fd025c5c
Original change: https://android-review.googlesource.com/c/platform/build/+/2822536

Change-Id: I5dcccfe5d7bb5efb16d08b229cde76ca67811bb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 11:09:40 +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
Jihoon Kang
1644e0c15e Merge "Revert^2 "Disable from-text stub build for sdk products"" into main am: 03aa6e725e
Original change: https://android-review.googlesource.com/c/platform/build/+/2836090

Change-Id: Id32152443558e7b6c18d8d6d38a424603068bf59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 10:16:57 +00:00
Jihoon Kang
03aa6e725e Merge "Revert^2 "Disable from-text stub build for sdk products"" into main 2023-11-17 09:39:06 +00:00
Mårten Kongstad
bc76a3d9a0 aconfig: rename test flag disabled_rw_2 -> disabled_rw_in_other_namespace
The flag `disabled_rw_2` is used to verify that aconfig can
auto-generate code for flags in different namespaces. Rename the flag to
`disabled_rw_in_other_namespace` to highlight that it belongs to a
different namespace than the other flags.

This CL is a semantic change only.

Bug: None
Test: atest aconfig.test
Change-Id: Ib82fdce0ca3f7cd56b9b3f80e44fe424a03a2ae4
2023-11-17 09:37:06 +01:00
Inseob Kim
5b17e679f6 Merge "Add support for auto-generated characteristics RRO" into main am: 8fc7cf6301
Original change: https://android-review.googlesource.com/c/platform/build/+/2818463

Change-Id: I39101709a273ed25f4588c7d11694daa14a7cc17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 05:43:44 +00:00
Inseob Kim
8fc7cf6301 Merge "Add support for auto-generated characteristics RRO" into main 2023-11-17 05:02:28 +00:00
Jihoon Kang
9e0998b777 Revert^2 "Disable from-text stub build for sdk products"
This change introduces `PRODUCT_BUILD_FROM_SOURCE_STUB` product
variable, which is set to true for sdk targets.

This change resubmits https://r.android.com/2834692.

Test: m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_staging sdk and inspect ninja query to verify that stubs are built from source
Bug: 311203379
Change-Id: I7d9f833ae76ceabbf2ce4df0141688e24ea164c8
2023-11-17 01:52:12 +00:00
Jihoon Kang
b0146455c7 Merge "Revert "Disable from-text stub build for sdk products"" into main am: 3666e601ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2835872

Change-Id: Ifda62b2e985c5e47b7a1f40351b5fb063b51a42c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 01:20:06 +00:00
Jihoon Kang
3666e601ec Merge "Revert "Disable from-text stub build for sdk products"" into main 2023-11-17 01:04:34 +00:00
Treehugger Robot
5d763858eb Merge "Disable from-text stub build for sdk products" into main am: b0d8fafba8
Original change: https://android-review.googlesource.com/c/platform/build/+/2834692

Change-Id: I9cf9c532ae3eb1b94bead4400b0aef1172d818eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 01:04:08 +00:00
Jihoon Kang
608493e0ff Revert "Disable from-text stub build for sdk products"
Revert submission 2832580-sdk-from-source-stub

Reason for revert: Breaking sdk builds
Reverted changes: /q/submissionid:2832580-sdk-from-source-stub

Change-Id: Id2e1bf4b5d513d12bb794405a74dfdbed870c4e1
2023-11-17 00:58:42 +00:00
Treehugger Robot
b0d8fafba8 Merge "Disable from-text stub build for sdk products" into main 2023-11-17 00:29:05 +00:00
Jihoon Kang
3621c914a6 Disable from-text stub build for sdk products
This change introduces `PRODUCT_BUILD_FROM_SOURCE_STUB` product
variable, which is set to true for sdk targets.

Test: m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_staging sdk and inspect ninja query to verify that stubs are built from source
Bug: 311203379
Change-Id: I99ad04fb6b61eebfeee68f23f8865ab55d69cdbd
2023-11-16 23:09:29 +00:00
Aditya Choudhary
70fb37ec11 Handle empty input file case in Metadata generation
Bug: 296873595
Test: Manual test (use go test inside tools/metadata/testdata)

Change-Id: Ib48e88bdad4c870be3ca955abfd64ee8dd74f85d
2023-11-16 20:09:25 +00:00
Colin Cross
9cb51b7446 Store ALL_DEPS under my_register_name
ALL_DEPS was original stored in ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS for
use by the old licensing code.  That has been removed, and it is now
only used by module-info.json.  Storing it with $(LOCAL_MODULE) causes
_32 entries in module-info.json to be missing dependencies, and causes
the dependencies from _32 variants to be squashed into the normal
variants.  Replace ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS with
ALL_MODULES.$(my_register_name).ALL_DEPS.

Test: builds
Change-Id: Ieddfcddd8547b61bd938ae051beb738268aac5af
2023-11-16 11:46:40 -08:00
Ted Bauer
c0e30a22e6 Merge "Revert^2 "Cache Java codegen'd flags in static member variables."" into main am: ca355c09a2
Original change: https://android-review.googlesource.com/c/platform/build/+/2833310

Change-Id: Ibf6ca47d71f4dce8eb84e0b17028bb516b5061c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 19:14:34 +00:00