Commit Graph

68482 Commits

Author SHA1 Message Date
Gurpreet Singh
16f72e84be Merge "Add genrule to build *.latest.version build target." into udc-mainline-prod 2023-05-15 16:31:40 +00:00
Gurpreet Singh
ed885bb7dd Add genrule to build *.latest.version build target.
Build a new target *.latest.version which will contain a text file
containing the last finalized version.

Bug: 242316893, 282140551
Test: atest prebuilt_apis_test
(cherry picked from https://android-review.googlesource.com/q/commit:daa314ac97d5ab8076113ee7f269b4e4cc3cf620)
Merged-In: I41fa91c9ec273f342b7807c66c4d65ba13260124
Change-Id: I41fa91c9ec273f342b7807c66c4d65ba13260124
2023-05-13 06:02:59 +00:00
Jiakai Zhang
04e70bc85d Dexpreopt ART jars and framework jars together. am: 5f5a17fd6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208462

Change-Id: I0fc79a2abb0f4c3aaebd60e2b262a72b51260230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:55 +00:00
Jiakai Zhang
6c7f9464d9 Unify installDirOnHost and installDirOnDevice. am: 7ba1ca0ac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208461

Change-Id: I1e4df4385046b3f5d4ccf6feacc3500414268c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:53 +00:00
Jiakai Zhang
4d8badb6fe Remove the ability to install boot images by bootclasspath_fragments. am: 4e9eb1ae46
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208460

Change-Id: I3acf79fa37df6c6b97de0b79d44a948e1d1a5b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:51 +00:00
Jiakai Zhang
087f594948 Prepare tests for dexpreopt changes. am: c67528bf7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23206714

Change-Id: I468d89ed0ec9eec3a24a9d0e4e85f597370057ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:48 +00:00
Jeongik Cha
120ff02b72 Get rid of DeviceName() from path related to dexpreopt am: bc9256b531
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208459

Change-Id: Id0dca9aa443c8ca8155e24ba61dd6e8c0b914799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:45 +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
Jiakai Zhang
1d2252d686 Merge changes from topic "cherrypicker-L72800000960451564:N93200001365390015" into udc-dev am: 51babf3c4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23043873

Change-Id: I57147254371a1695aff9973e0846807e53180550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:20:22 +00:00
Jiakai Zhang
9875d6311c Generate boot image profiles even if dexpreopt is disabled. am: 1d99986d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23043872

Change-Id: I9e61b59fb1ccfbaae0ab4950b724a1551e5fede8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:20:20 +00: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
93d4662a48 Merge "VSDK: use relative install path when generating snapshots" into udc-dev am: 1dd392b123
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22980276

Change-Id: Ia3da01309bb64d34f8c039b90d1a8ae39d8af889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:33:07 +00:00
Justin Yun
978be6f8eb APEX can use any Prebuilt libraries am: 6bd266b3ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23101375

Change-Id: Ifa210f1270a5b030e628d779ec3beabaf4242b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:32:37 +00:00
Jooyung Han
210aba78c0 Mark LLNDK prebuilts as LLNDK am: c21c1e4dbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23101374

Change-Id: I9f9cb95a162be1ec6bf8a977e6e500b39727c189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:32:36 +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
e9b1c4662f Merge "Enable HWASan for multiple modules in one place(Soong)" into udc-dev am: 70811b4030
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22953989

Change-Id: Iea481a40a2fcec03adef872e7786057e322c4f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:31:13 +00:00
Alexei Nicoara
20f23ff39c Merge "Revert "DO NOT MERGE: Changing the udc-dev version to 345990000"" into udc-dev am: eb6c2a2fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22994519

Change-Id: I09b67b13181943c6ee17118ba8c1dc6b5640f28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:30:09 +00:00
Alexei Nicoara
7208705153 [automerger skipped] Revert "DO NOT MERGE: Changing the udc-dev version to 345990000" am: 1240f28d09 -s ours
am skip reason: skipped by user ancr

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22994519

Change-Id: I0ea1818a720b4ba51b59f99f74ba68ef975fae0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:30:08 +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
dec734e253 Merge "16k: Align shared libraries and executables to 4k by default" into udc-dev am: e03c3bb67c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22934316

Change-Id: Ieb5f9f83efaa12354449fffec4e4ee89d5f9f647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:50:31 +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
5c9e39d551 Merge "target_sdk_version replacement should respect REL branches" into udc-dev am: e792debb72
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22942821

Change-Id: Id73d4e24ab6bf681a0a561ac4518309e38d20cf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 19:53:35 +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
bcd606cf7c Merge "Add license visibility to prebuilt vsdk" into udc-dev am: 00a3591cc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22903780

Change-Id: I16a7bff27581839f93bef4441e9dcbb8c0da4c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 14:06:09 +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
Alexei Nicoara
de89175690 [automerger skipped] DO NOT MERGE: Changing the udc-dev version to 345990000 am: ec0e5a3e97 -s ours
am skip reason: skipped by user ancr

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22905956

Change-Id: I036557e83af236899bc9457edd1480d7a41ec640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 08:32:11 +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
8e37d02e36 Merge "Remove deps from Soong intermediate to symbols" into udc-dev am: fef2ccb868
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22874471

Change-Id: I22186a3f02c213e5864468f418e115ef0adeef43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 01:19:43 +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
75653fbc77 Include license information for vendor and host snapshots am: 2b6b7af8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22869963

Change-Id: I9fd8141736988aebc2fd27a384801abd6a217d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 01:00:15 +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
43e9797788 Merge "Enable -funique-internal-linkage-names when afdo=true" into udc-dev am: 07d931980b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22795266

Change-Id: Id1a2052954826859cf6a64aea0fb721a4b7c04af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 18:16:44 +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
Alex Buynytskyy
67c438f089 UpsideDownCake/34 is now REL am: e9184d757e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22790313

Change-Id: Ia9103256bcc93ff47414f2b7c78e85f83b89a4e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 16:24:40 +00:00