Commit Graph

68122 Commits

Author SHA1 Message Date
Zyan Wu
d1f548a19d Don't panic if no certificates found
Getting the first certificate will panic if there are no certificates,
which can happen when AllowMissingDependencies is set and the
certificate property is a module reference to a missing module.
Only get the first certificate if the list is not nil.

Use mainCertificate since it handles the logic already.

Test: TestAppMissingCertificateAllowMissingDependencies
Bug: 283102635
Merged-In: : I8b27f65aa7d071041171ad45ac52bf47fa31bf2b
Change-Id: Icaaa45d48ca4edb876687c0813165d107d28ef8a
2023-05-18 15:58:20 +08:00
Treehugger Robot
0bd58ceeec Merge "Update clang version to clang-r487747c" into udc-dev 2023-05-15 21:01:41 +00:00
Jiakai Zhang
5f5a17fd6b Dexpreopt ART jars and framework jars together.
Bug: 280776428
Test: atest art_standalone_dexpreopt_tests
Test: -
  1. m
  2. Check .invocation file (http://gpaste/6498044089466880)
  3. Check files in $ANDROID_PRODUCT_OUT/system/framework/x86_64
Test: -
  1. m dist
  2. Check files in out/dist/boot.zip
Test: -
  1. art/tools/buildbot-build.sh --host
  2. m test-art-host-gtest
  3. art/test/testrunner/testrunner.py --host
Test: m build-art-target-golem
(cherry picked from https://android-review.googlesource.com/q/commit:c08c162b5a82ddfc44e9944d798636b2241308de)
Merged-In: I89490252e56a05edab03fdddc6539fa4d7f79756
Change-Id: I89490252e56a05edab03fdddc6539fa4d7f79756
2023-05-12 11:16:31 +00:00
Jiakai Zhang
7ba1ca0ac3 Unify installDirOnHost and installDirOnDevice.
These two fields never do what they are described to do. This CL unifies
them to avoid the confusion.

Bug: 280440941
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:09d88df0407263e846b01c226184b262f2e36678)
Merged-In: I3652d73a50832a2e494d9f5cae750f5fc38293b4
Change-Id: I3652d73a50832a2e494d9f5cae750f5fc38293b4
2023-05-12 11:16:22 +00:00
Jiakai Zhang
4e9eb1ae46 Remove the ability to install boot images by bootclasspath_fragments.
We don't need this anymore because we are going to compile ART jars and
framework jars together.

Bug: 280776428
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:b47caccbc037b65462f757c462a99732ad6dd51c)
Merged-In: I070157530449a1bb5779e25984c367df3dde7b36
Change-Id: I070157530449a1bb5779e25984c367df3dde7b36
2023-05-12 11:16:10 +00:00
Jiakai Zhang
c67528bf7e Prepare tests for dexpreopt changes.
After this change, there is a clear separation between tests that are
related to dexpreopt and tests that are not. The former uses
PrepareForTestWithDexpreopt, while the latter uses
PrepareForTestWithJavaDefaultModules. The benefit is that the latter
will no longer affected by any dexpreopt changes.

Bug: 280776428
Test: m nothing
(cherry picked from https://android-review.googlesource.com/q/commit:b95998be731406209f18fab764b96421a17ab4c9)
Merged-In: Ib957765b9287d51c082e0a33cee17a6bb56daeef
Change-Id: Ib957765b9287d51c082e0a33cee17a6bb56daeef
2023-05-12 11:16:01 +00:00
Jeongik Cha
bc9256b531 Get rid of DeviceName() from path related to dexpreopt
As-is, dexpreopt config and bootjar is in the dir including
DeviceName(). It causes unnecessary dexpreopt invocation when target is
changed repeatly. To avoid it, rename dir to common name.

Bug: 278833696
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:4753b39ccaaf573910e6b7a4200e9ca03ec8d96d)
Merged-In: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c
Change-Id: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c
2023-05-12 11:15:51 +00:00
Yi Kong
e3a5103cba Update clang version to clang-r487747c
Test: presubmit
Bug: 279955553
Change-Id: Ibe3b5e81f7850560b340c89a1f83d5ebdf4fc25f
Merged-In: Ibe3b5e81f7850560b340c89a1f83d5ebdf4fc25f
(cherry picked from commit 1c22301735)
2023-05-11 16:52:11 +01:00
Jiakai Zhang
51babf3c4c Merge changes from topic "cherrypicker-L72800000960451564:N93200001365390015" into udc-dev
* changes:
  Generate app profiles even if dexpreopt is disabled.
  Generate boot image profiles even if dexpreopt is disabled.
2023-05-10 13:38:14 +00:00
Treehugger Robot
1dd392b123 Merge "VSDK: use relative install path when generating snapshots" into udc-dev 2023-05-10 06:00:16 +00:00
Jiakai Zhang
1b2f306db8 Generate app profiles even if dexpreopt is disabled.
Bug: 280440941
Test: -
  1. Patch ag/22302622 to disable dexpreopt.
  2. lunch aosp_cf_x86_64_phone-userdebug && m
  3. See app profiles still generated.
Test: -
  1. Patch ag/20592051 to enable profile for service-art.
  2. banchan com.android.art x86_64 && m
  3. See the profile for service-art generated.
(cherry picked from https://android-review.googlesource.com/q/commit:cf61e3c59133227894ac7d72091b48451a3e6761)
Merged-In: I6090b4b74cedb6d129fcbeef58d075c8ccdcc4e2

Change-Id: I4e721b475b84a2f667bbccc030a8947078f26bb0
2023-05-09 21:47:33 +01:00
Jiakai Zhang
1d99986d30 Generate boot image profiles even if dexpreopt is disabled.
Bug: 280440941
Test: -
  1. Patch ag/22302622 to disable dexpreopt.
  2. See boot image profiles still generated.
(cherry picked from https://android-review.googlesource.com/q/commit:bc698cd28aa2ee17af208bfd56f003347116ddb0)
Merged-In: I5f7f746ca1d4da660fe0c40115e6c71750dfdccc

Change-Id: I1bf05ade53fa83f3dba46f28a8f9246ba1fdf664
2023-05-09 21:47:31 +01:00
Justin Yun
6bd266b3ec APEX can use any Prebuilt libraries
Vendor snapshot libraries generated from prebuilt libraries set
"apex_inherit" to their min_sdk_version property to allow them to be
used by vendor APEXes.

Bug: 277403349
Test: m vendor-snapshot
Merged-In: Idd9e5f8e94b3fa2adf47a04507bf0c50c59edfb7
Change-Id: Idd9e5f8e94b3fa2adf47a04507bf0c50c59edfb7
(cherry picked from commit 3cc7846b58)
2023-05-09 07:48:33 +00:00
Jooyung Han
c21c1e4dbf Mark LLNDK prebuilts as LLNDK
so that Vendor APEXes don't embed the LLNDK prebuilts (which are just
stubs of LLNDK libraries).

Bug: 280697209
Bug: 277403349
Test: m nothing (soong test)
Merged-In: I9e6c123e73fa0ab56d8494a01652ee32a9b6a6cd
Change-Id: I9e6c123e73fa0ab56d8494a01652ee32a9b6a6cd
(cherry picked from commit e3f0281b88)
2023-05-09 07:47:42 +00:00
Treehugger Robot
70811b4030 Merge "Enable HWASan for multiple modules in one place(Soong)" into udc-dev 2023-05-03 18:44:39 +00:00
Alexei Nicoara
eb6c2a2fba Merge "Revert "DO NOT MERGE: Changing the udc-dev version to 345990000"" into udc-dev 2023-05-03 16:51:16 +00:00
Alexei Nicoara
1240f28d09 Revert "DO NOT MERGE: Changing the udc-dev version to 345990000"
This reverts commit ec0e5a3e97.

Reason for revert: b/280553936

Change-Id: Iad9079f026f46da35f36723937db9bf5771580d1
2023-05-03 16:43:37 +00:00
Justin Yun
38dfc1d7c1 VSDK: use relative install path when generating snapshots
Without respecting the relative install path, the snapshot install
path may collide when they use the same stem name.
To avoid this, respect the relative install path when generating the
snapshots.

Bug: 279652606
Test: RECOVERY_SNAPSHOT_VERSION=current m recovery-snapshot
Merged-In: Ic70a5855aeb2a6eda397b4dd06113dddb6ef70f4
Change-Id: Ic70a5855aeb2a6eda397b4dd06113dddb6ef70f4
(cherry picked from commit 17d0ee2160)
2023-05-03 09:13:20 +09:00
Hang Lu
88086621d1 Enable HWASan for multiple modules in one place(Soong)
Environment variables HWASAN_INCLUDE_PATHS and
PRODUCT_HWASAN_INCLUDE_PATHS can be used to enable HWASan for multiple
modules, by just adding the module directory to the env variable.

Bug: b/271948407
Test: Set specific module directory to above env variable and check the
assembly codes of output elf files after building, finding hwasan
related symbols inside.

Merged-In: Ic49b515830c4469ca5fa94f547b26c0fb602fc54
Change-Id: Ic49b515830c4469ca5fa94f547b26c0fb602fc54
(cherry picked from commit a98aab98c4)
2023-05-02 22:44:03 +00:00
Kalesh Singh
e03c3bb67c Merge "16k: Align shared libraries and executables to 4k by default" into udc-dev 2023-05-02 16:12:52 +00:00
Treehugger Robot
e792debb72 Merge "target_sdk_version replacement should respect REL branches" into udc-dev 2023-05-01 18:41:27 +00:00
TreeHugger Robot
00a3591cc6 Merge "Add license visibility to prebuilt vsdk" into udc-dev 2023-04-29 13:40:49 +00:00
Spandan Das
f902b8af82 target_sdk_version replacement should respect REL branches
Currently, target_sdk_version of MTS tests were being set to 10000 even
in release branches. This should only happen in active branches.

Test: Unit test
Test: aapt2 on CtsContentTestCases in udc-dev and verified
targetSdkVersion is 34
Bug: 279507428

Change-Id: Ib79318febc0f6e771b3679c0281a97357930ec56
Merged-In: Ib79318febc0f6e771b3679c0281a97357930ec56
(cherry picked from commit fb6a1ee68b)
2023-04-29 03:50:01 +00:00
Juan Yescas
e6979a102c 16k: Align shared libraries and executables to 4k by default
The default ELF segment alignment will be 4096. This alignment
can be overriden by setting the desired alignment in
PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag. The alignment has to be
a multiple of the configured kernel page size.

Test: Built changes for Pixel 4a, 6 and checked alignment.
Bug: 276963698
Bug: 276801883
(cherry picked from https://android-review.googlesource.com/q/commit:05d4d901146d96634ad0ff3a9982c9c87c394f18)
Merged-In: Icb380041a5b27da1fa0d86b302e1e7cde9a236d7
Change-Id: Icb380041a5b27da1fa0d86b302e1e7cde9a236d7
2023-04-28 18:29:50 +00:00
Justin Yun
c9ef91211e Add license visibility to prebuilt vsdk
libbpf_minimal can be included as a prebuilt vsdk library. This must
include the license_kinds of libbpf_minimal-license from soong.
Add the visibility for the prebuilts.

Bug: 271539873
Test: build against vsdk
Merged-In: Ib1c3e7705e7f234b2b54c2180642d6134c6131ea
Change-Id: Ib1c3e7705e7f234b2b54c2180642d6134c6131ea
(cherry picked from commit 3b23ac0025)
2023-04-27 21:53:03 +09:00
Alexei Nicoara
ec0e5a3e97 DO NOT MERGE: Changing the udc-dev version to 345990000
The udc-dev version is now lower than the prebuilts b/278817494.
Increasing it so it's higher than prebuilts but still low enough, b/231691162 suggested initially to use xx5990000 for x-dev.

I've checked tm-dev and the latest prebuilt was 3318, so 3459 prefix should be enough for udc-dev.

Change-Id: Idc85a121825aea754b258b306660ca71c6b1fdd9
BUG: 278817494
Ignore-AOSP-First: This change is needed in udc-dev only
2023-04-27 11:33:32 +00:00
Jooyung Han
fef2ccb868 Merge "Remove deps from Soong intermediate to symbols" into udc-dev 2023-04-27 01:01:28 +00:00
Justin Yun
2b6b7af8f4 Include license information for vendor and host snapshots
In addition to the license text files, include license kinds
information to json file. Also, use the original paths of license
text files that are copied to NOTICE_FILES directory.
This will be used when generating snapshots from the snapshot build.

Bug: 271539873
Test: m vendor-snapshot
Merged-In: I0c0427bb66f2c1fca322d5554aa66220a3b62fb3
Change-Id: I0c0427bb66f2c1fca322d5554aa66220a3b62fb3
(cherry picked from commit 1db9748805)
2023-04-26 11:27:34 +09:00
Inseob Kim
0548979522 Remove deps from Soong intermediate to symbols
These should be handled by Makefile dependency (LOCAL_REQUIRED_MODULES).

Bug: 278832320
Test: build and see symbol files
(cherry picked from https://android-review.googlesource.com/q/commit:5bedfee4484a8786ccd761212057f8aac9a02eb7)
Merged-In: I80ad9d8e7e8384e2ae3537cc681bc1d1b327d04c
Change-Id: I80ad9d8e7e8384e2ae3537cc681bc1d1b327d04c
2023-04-26 01:19:26 +00:00
Yabin Cui
07d931980b Merge "Enable -funique-internal-linkage-names when afdo=true" into udc-dev 2023-04-25 17:25:14 +00:00
Yabin Cui
a2f41c7695 Enable -funique-internal-linkage-names when afdo=true
We used to enable unique names only when a profile is available.
But A profile generated for a binary without unique names doesn't
work well when building a binary with unique names. To avoid a
chicken-and-egg problem, this CL enables the flag when afdo=true,
whether a profile exists or not.

Bug: 241523910
Test: build
(cherry picked from https://android-review.googlesource.com/q/commit:01c4456ce21ec3aa6693c083d77c0bfe1e7cccdc)
Merged-In: I74d834510d81d2db76e34d0488c74a60e1fcecd5
Change-Id: I74d834510d81d2db76e34d0488c74a60e1fcecd5
2023-04-21 22:27:40 +00:00
Alex Buynytskyy
e9184d757e UpsideDownCake/34 is now REL
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: Iaa3054f3449a5bf6887c24937646d22c79c4af1e
Merged-In: Iaa3054f3449a5bf6887c24937646d22c79c4af1e
2023-04-21 19:36:27 +00:00
Treehugger Robot
8c1abddf2f Merge "Flag off abidw tasks." am: 03e6e00e60 am: f06eb4f259 am: 06efd1a9e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2552910

Change-Id: I5e2a424070eaa113d7c84dc625e4a6c758e7c8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 23:46:34 +00:00
Treehugger Robot
06efd1a9e1 Merge "Flag off abidw tasks." am: 03e6e00e60 am: f06eb4f259
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2552910

Change-Id: I1f144068609e3e8a9f518d9146c55753c9147bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 23:04:47 +00:00
Treehugger Robot
f06eb4f259 Merge "Flag off abidw tasks." am: 03e6e00e60
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2552910

Change-Id: I6c39687202ae180c4152e27956feaab01e9a96ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 22:25:36 +00:00
Liz Kammer
c42483d813 Merge "Don't add apex_set deps in nondeterministic order" am: e5eb5786e2 am: 74447fa446 am: 592ec2ff19
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2550970

Change-Id: I92506cc516becb1ae5baaad0e5e5752c04291dc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 22:23:38 +00:00
Liz Kammer
592ec2ff19 Merge "Don't add apex_set deps in nondeterministic order" am: e5eb5786e2 am: 74447fa446
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2550970

Change-Id: Iefd399de8789c654a687ef0eb30660619e7149c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 21:42:47 +00:00
Treehugger Robot
03e6e00e60 Merge "Flag off abidw tasks." 2023-04-20 21:32:46 +00:00
Liz Kammer
74447fa446 Merge "Don't add apex_set deps in nondeterministic order" am: e5eb5786e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2550970

Change-Id: Id4226d8be3548e0ed0b69f7e6293247a6c347d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:57:19 +00:00
Liz Kammer
e5eb5786e2 Merge "Don't add apex_set deps in nondeterministic order" 2023-04-20 19:51:21 +00:00
Dan Albert
326ab2444b Flag off abidw tasks.
Bug: http://b/277624006
Test: treehugger
Change-Id: I706a4da2d95ac51ad9fc600b3e4e52967b502c2c
2023-04-20 17:38:29 +00:00
Spandan Das
e4001552d9 Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53f5 am: 56797fd547 am: 88b15818b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535121

Change-Id: I3f43bc39e8cc0ea9d37f6ae64ca7993446b084da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 17:23:47 +00:00
Spandan Das
88b15818b5 Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53f5 am: 56797fd547
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535121

Change-Id: I197722f1c9fa8e31d0ddb3deba31fc875f161d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 16:50:41 +00:00
Spandan Das
56797fd547 Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535121

Change-Id: I22ed8397dc756b4bf3da49b8b0ff4cd933bda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 16:10:02 +00:00
Spandan Das
0bf4ea53f5 Merge changes I4129c2a9,I9af06f81
* changes:
  Drop the default apex_available value from BUILD files
  Make //apex_available:platform the default.
2023-04-20 15:30:20 +00:00
Liz Kammer
2dc7244af9 Don't add apex_set deps in nondeterministic order
Test: unit tests
Change-Id: I97a9708cb6e5a4f3aef55697b6127f61e4d17720
2023-04-20 11:30:19 -04:00
Inseob Kim
be9da69fdc Merge "Add min_sdk_version prop to snapshots" am: 0933fd59d7 am: 2f445ce30e am: 7ddf444d4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2542470

Change-Id: I68159f27ee24d2e73e4d7bbbc265d28790a7592f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 09:45:27 +00:00
Inseob Kim
7ddf444d4d Merge "Add min_sdk_version prop to snapshots" am: 0933fd59d7 am: 2f445ce30e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2542470

Change-Id: I0b274470100579b405c10d3ec1e012d593bc8c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 09:04:58 +00:00
Inseob Kim
2f445ce30e Merge "Add min_sdk_version prop to snapshots" am: 0933fd59d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2542470

Change-Id: I4749c4894cd61e4b5267d74a7cb0caed6747d5b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 08:24:24 +00:00
Inseob Kim
0933fd59d7 Merge "Add min_sdk_version prop to snapshots" 2023-04-20 07:36:58 +00:00