Commit graph

348 commits

Author SHA1 Message Date
Spandan Das
d9d72c46ba Prevent implicit outputs created during dexpreopt_config.zip
$PRODUCT_OUT/dexpreopt_config.zip is created by zipping all the
dexpreopt configs of individual apps. These config files are created in
$PRODUCT_OUT/dexpreopt_config, and this dir is as used as -C for
soong_zip.

In the current implementation, this build action also implicitly copies
global configuration files dexpreopt.config and dexpreopt_soong.config
into $PRODUCT_OUT/dexpreopt_config with the intent of being included in
the resultant zip file. These implicit outputs are unknown to ninja.

This CL prevents creation of these implicit outputs.
out/soong/dexpreopt_soong.config and
out/soong/dexpreopt_<arch>/dexpreopt.config is now passed directly to
soong_zip via -f.

Bug: 333316620
Test: m out/target/product/vsoc_x86_64/dexpreopt_config.zip # no longer
bit identical since the relative order changes, dexpreopt(_soong).config
now appears at the bottom of the zip
Test: zipcmp dexpreopt_config.zip.before dexpreopt_config.zip.after # no
diffs

Change-Id: Ib30c9a5c436e263231f9688129ab94664277b841
2024-06-07 17:45:19 +00:00
Jihoon Kang
b09bead297 Remove obsolete java compilation artifacts
Please note that this is an addition on top of  https://r.android.com/3078030.

Test: TH
Bug: 332785297
Change-Id: I1ee21398c72d8ee152e569626868eea3716af1bd
2024-05-08 17:52:52 +00:00
Jihoon Kang
d01ea714e2 Revert^2 "Remove obsolete java compilation artifacts"
This reverts commit 132fceec4c.

Reason for revert: CleanSpec.mk files are not meant to be reverted.

Change-Id: I72ad8d1b610f67525c905634f77b4d12849dbe30
2024-05-08 01:01:12 +00:00
Jihoon Kang
132fceec4c Revert "Remove obsolete java compilation artifacts"
Revert submission 3070882-sdk_lib_remove_compilation

Reason for revert: Potential culprit for build breakage of barbet-ap2a-userdebug in git_main

Reverted changes: /q/submissionid:3070882-sdk_lib_remove_compilation

Change-Id: I53b229137a8ba45e32209dbe69ab0cf698084377
2024-05-06 22:40:24 +00:00
Jihoon Kang
cffe6c2c01 Remove obsolete java compilation artifacts
Test: TH
Bug: 332785297
Change-Id: I114bb4139c08e595c3c5b03a4dc8d39df93262c3
2024-05-06 17:46:22 +00:00
Colin Cross
42f5a6bb6a Clean out old rustc compiler intermediates
The CL that splits rust complation and linking into separate actions
is being reverted to save disk space.  Delete the intermediates that
are no longer needed in order to immediately free the disk space.

Bug: 293349612
Test: builds
Change-Id: I1e9f015bf9b6ffe8ba3ccd11ac3075e90640e9b3
2023-10-03 10:35:32 -07:00
Liz Kammer
c4d9d32fe8 Cleanspec to remove tools/metalava subdir
Test: CI
Change-Id: I412a093ef3964fcecf2b726cbfe0f78032242e95
2023-09-15 14:09:09 -04:00
Colin Cross
da166c5ad4 Make SOONG_HOST_OUT an alias for HOST_OUT
Soong now installs to the same directory as Make, point SOONG_HOST_OUT
at HOST_OUT.

Bug: 204136549
Test: m checkbuild
Change-Id: I49bfc0466056d270c8023288a6fe778c3445a900
2021-11-18 16:26:58 -08:00
Colin Cross
47cfffea79 Move java install rules into Soong
Remove the copy rules for LOCAL_SOONG_BUILT_INSTALLED, they will already
be created by Soong.

Also clean the soong host tools directory to remove any old copies of
java binaries.

Bug: 204136549
Test: m checkbuild
Change-Id: Ib6b5362ad59aa48770e48541430d6857846926c2
2021-11-08 15:23:32 -08:00
Colin Cross
cf5c18aa8e Clean SOONG_HOST_OUT for moving rust and sh_binary modules
Bug: 204136549
Bug: 205530905
Test: m checkbuild
Test: m && acloud create --local-instance --local-image
Change-Id: I51c2b94bccff3893b9b7c88f08a798a5daccb0f5
2021-11-08 13:31:28 -08:00
Colin Cross
bca6483b07 Move tools compiled by Soong to HOST_OUT_EXECUTABLES
Soong now installs native tools to HOST_OUT_EXECUTABLES instead
of SOONG_HOST_OUT_EXECUTABLES.

Also add a cleanspec for SOONG_HOST_OUT to remove old files from
SOONG_HOST_OUT_EXECUTABLES.

Bug: 204136549
Test: m checkbuild
Change-Id: Id18213b9294b6d2cf78f657740c6d5a02733b8ad
2021-11-01 15:03:01 -07:00
Treehugger Robot
a42ea23d40 Merge "Remove pre-aidegen IDE support logic" am: 818e6c0579 am: 55ac7fd6d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1764131

Change-Id: Ia69e9aac511ed9a40c28d453f3abf2bd0cb2c490
2021-07-13 17:01:00 +00:00
Dan Willemsen
b349e4e04a Remove pre-aidegen IDE support logic
This has apparently been racy ever since
https://android-review.googlesource.com/c/platform/build/+/971925
and isn't generally useful anymore, as aidegen has taken over.

Bug: 193095826
Test: treehugger
Change-Id: I09b6b340b84d1476a574b302db520210561a4e5e
2021-07-12 21:57:33 -07:00
Petri Gynther
423c46da1a Merge "Rename vendor-ramdisk to vendor_ramdisk" am: b10f7d2a9c am: 2c789cf026 am: be8682a693
Original change: https://android-review.googlesource.com/c/platform/build/+/1613866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53d8f3c749de28770dc49c1391fc2af2663a9092
2021-03-04 06:53:52 +00:00
Petri Gynther
dc24d88aa9 Rename vendor-ramdisk to vendor_ramdisk
Rename to get consistent ramdisk directory naming in
out/target/product/<name>:
  debug_ramdisk
  ramdisk
  vendor_debug_ramdisk
  vendor_ramdisk

Test: build and inspect out/target/product/<name>
Change-Id: I81d8f2cafe5e1b9024196cd74772b78d4a4aec58
2021-03-03 13:56:48 -08:00
Pete Bentley
bebf62c402 Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" am: f00bfe0105 am: c8acaa6f82 am: a8fb0f2d0d am: ccd5bc2b1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1455015

Change-Id: I5b3635143544c618a19a149b11bba868a5ce97e1
2020-10-09 12:04:31 +00:00
Pete Bentley
4c9c891fc4 Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so
An ABI incompatible change along with inability to
express the JNI dependency can result in build failures, see
b/170311371#comment8 for how to reproduce.  Tested by using that
repro and verifying this clean step fixes it.  Hopefully the
path being removed is correct for all host platforms.

Fixes: 170311371
Bug: 170389375
Test: As described above
Change-Id: I95ea952bf31d8e9caa8c42d21f2db1968cbe9097
2020-10-09 08:42:13 +00:00
Chen Xu
35a3a5eb79 Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev am: 99e317ce2d am: 3af5f639bb am: 24a87ba928 am: bc9322142c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002

Change-Id: If7e3e2211ab265ab116b99e018dd19e6c4190a69
2020-06-19 07:01:40 +00:00
Chen Xu
24a87ba928 Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev am: 99e317ce2d am: 3af5f639bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002

Change-Id: I1221abd1e4a786b7f843ff58a7205fe83eaf9a17
2020-06-19 06:17:59 +00:00
Chen Xu
d61b863b3d Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev am: 99e317ce2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002

Change-Id: I753539b51ea295128d5fde0f13989bdcb0899812
2020-06-19 06:00:10 +00:00
Chen Xu
ced4dd2d99 Do not include CellBroadcastLegacy for Go devices
CellBroadcastLegacy app is for migrating data from pre-mainline world.
Go devices do not take mainline module, thus excluding this apk
from build. Otherwise, both CellBroadcastLegacy app and
CellBroadcastAppPlatform will have the same package name
com.android.cellbroadcastreceiver

Bug: 157702986
Test: build go target:  walleye_svelte-userdebug
Change-Id: I254a8af334580b79ffdbc9e8bfa95b23500f507e
2020-06-18 15:41:23 -07:00
Treehugger Robot
aac3183d42 Merge changes from topic "remove_default_prop" am: 4e0bce688c am: 09dd92a862 am: 8e8444d4fe am: f609e203c4 am: 345cd28fbb
Change-Id: I5b7f077f17973ba021a3ad894b4fa4c34522808e
2020-05-15 03:51:03 +00:00
Treehugger Robot
8e8444d4fe Merge changes from topic "remove_default_prop" am: 4e0bce688c am: 09dd92a862
Change-Id: If12633a2be57ffbb42d0306193a226164e77e2d4
2020-05-15 02:51:58 +00:00
Jiyong Park
09153e244e Remove /system/etc/prop.default
Contents that were in /system/etc/prop.default are now in
/system/build.prop.

The content is placed at the top of build.prop to keep the existing
order between the two files.

Caveat: /prop.default still remains for non-Treble devices.

Bug: 117892318
Test: TH passes
Test: inspect  /system/build.prop and check if it has contents from
the old /system/etc/prop.default file

Change-Id: Ibc74edb88904f953a1e5e6ceef44c461f381c9cf
2020-05-14 16:28:19 +09:00
Jiyong Park
b894d4bb68 Remove /vendor/default.prop
Contents that were in /vendor/default.prop are now in /vendor/build.prop

The content is placed at the top of build.prop to keep the existing
order between default.prop and builld.prop.

Bug: 117892318
Test: TH passes
Test: inspect  /vendor/build.prop and check if it has contents from
the old /vendor/default.prop file

Change-Id: Ifa1f1dca3b4f4a5fa87d26b8ee058ee706dc54bb
2020-05-14 16:19:32 +09:00
Dan Shi
b4ef8e92aa Cleanup VTS-Core and VTS10 related artifacts
Bug: 151896491
Test: none
Change-Id: I5a42dcbe34866751a54f059d363f1866bff7d47a
Merged-In: I5a42dcbe34866751a54f059d363f1866bff7d47a
(cherry picked from commit c5e98d405f)
2020-04-03 11:21:15 -07:00
Dan Shi
4fd493dae1 Cleanup VTS-Core and VTS10 related artifacts
Bug: 151896491
Test: none
Change-Id: I5a42dcbe34866751a54f059d363f1866bff7d47a
Merged-In: I5a42dcbe34866751a54f059d363f1866bff7d47a
2020-04-03 10:16:21 -07:00
Dan Shi
c5e98d405f Cleanup VTS-Core and VTS10 related artifacts
Bug: 151896491
Test: none
Change-Id: I5a42dcbe34866751a54f059d363f1866bff7d47a
2020-04-02 18:04:25 -07:00
Hai Zhang
15fd20f873 Remove PermissionController from base_system after moving into APEX.
Bug: 136503238
Test: m mts && mts-tradefed run mts-permission
Change-Id: Ic6194402adfa1d0b8bd55e337e3b573ea37f7fba
2020-01-09 12:39:30 -08:00
Colin Cross
78f86aa083 Remove Soong intermdiates after moving image mutator
Bug: 142286466
Test: m
Change-Id: I76f19a4504b8231755009ab200447613f02b85cf
Merged-In: I76f19a4504b8231755009ab200447613f02b85cf
(cherry picked from commit 559ab613ae)
2019-12-17 14:53:49 -08:00
Colin Cross
559ab613ae Remove Soong intermdiates after moving image mutator
Bug: 142286466
Test: m
Change-Id: I76f19a4504b8231755009ab200447613f02b85cf
2019-12-17 11:17:56 -08:00
Dario Freni
d5ed6019c9 Move CtsShim and CtsPrivShim APKs out of system.
These packages are now available in the shim apex package, which is made
available in both flattened and unflattened apex configurations.

Bug: 138429615
Test: atest CtsPrivilegedUpdateTests CtsPermissionTestCases
CtsStagedInstallHostTestCases; (on both flattened and unflattened
configurations)
Merged-In: I03939f6c3e711d5887da201e32173f86a6b0289e
Change-Id: I03939f6c3e711d5887da201e32173f86a6b0289e
2019-12-17 13:47:17 +00:00
Dario Freni
3e41a7f856 Move CtsShim and CtsPrivShim APKs out of system.
These packages are now available in the shim apex package, which is made
available in both flattened and unflattened apex configurations.

Bug: 138429615
Test: atest CtsPrivilegedUpdateTests CtsPermissionTestCases
CtsStagedInstallHostTestCases; (on both flattened and unflattened
configurations)
Exempt-From-Owner-Approval: approved in
https://android-review.googlesource.com/c/platform/build/+/1180943
Change-Id: I03939f6c3e711d5887da201e32173f86a6b0289e
2019-12-17 10:11:01 +00:00
Sungsoo Lim
96504cfeb5 Remove media command
Use media-session shell command instead.

Bug: 144453231
Test: manually
Change-Id: I69e877d25621d4f77f40a676d1511cbb9e6af83d
2019-12-16 11:17:26 +09:00
Colin Cross
66ce55d90d Remove Soong intermediates after renaming core variant
Bug: 142286466
Test: m
Change-Id: Ib10a9cf8a8c9109279523f811764afff34969368
Merged-In: Ib10a9cf8a8c9109279523f811764afff34969368
(cherry picked from commit c293f9583e4ac726c1c44406725e2bbf7d3efdad)
2019-12-13 20:46:35 -08:00
Colin Cross
c9ea2ffc78 Remove Soong intermediates after renaming core variant
Bug: 142286466
Test: m
Change-Id: Ib10a9cf8a8c9109279523f811764afff34969368
2019-12-11 11:39:17 -08:00
Jeff Sharkey
5a4593c9d7 Structure MediaProvider as an APEX.
Based on guidance from the Mainline team, we're placing the
MediaProvider APK inside a new APEX, as this will allow us to
move MediaStore.java inside the module boundary in a future CL.

As part of this restructuring, we need the pre-Mainline APK to
remain intact to preserve the user's media database.  There is
already logic in place from previous CLs that will migrate data
from the pre-Mainline to the post-Mainline world, including tests
to verify that the migration works.

Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I571eccbb2950a7c518a682eae3350ba7ef9bd804
2019-12-05 10:08:56 -07:00
Chen Xu
52da1247a4 cleanup com.android.cellbroadcast apex for Go devices
Bug: 144301029
Bug: 135956699
Test: build walleye_svelte-userdebug
Change-Id: Ide0a375cffcfc9ce40288e1dad6fd6863535a334
2019-11-14 22:54:04 +00:00
Henry Fang
3d86a2cf4c Enable cas@1.2
Turn on cas@1.2 service
Test: Manual
bug: 141783130

Change-Id: I4966dcc83d8ab31223b634987726a0a3f0e706ce
2019-11-06 16:48:28 -08:00
Roland Levillain
275adbd65d Merge "Reland "Remove Core Library JARs from /system/framework."" am: 3596fc60c8 am: 6dc4d94f1f
am: a3f6fa20aa

Change-Id: I67a86287a3bdc4cc61712ee9e40a0db52f2c8b75
2019-10-31 06:34:11 -07:00
Roland Levillain
c7c4a766f0 Reland "Remove Core Library JARs from /system/framework."
These JARs are part of the ART APEX, and are now located in
`/apex/com.android.art/javalib`. Remove the supernumerary copies in
`/system/framework` and save ~11 MiB on the system partition.

This change no longer breaks coverage builds, as module
`jacocoagent` has been removed from `TARGET_CORE_JARS` in CL
https://android-review.googlesource.com/c/platform/build/+/1151464.

This reverts commit 7c39368927.

Test: Device boot test
Test: Check that:
        export EMMA_INSTRUMENT=true
        && unset EMMA_INSTRUMENT_STATIC
        && m installclean
        && m systemimage
      generates a system image that contains these files:
        /system/framework/apex-jacocoagent.vdex
        /system/framework/boot-jacocoagent.vdex
        /system/framework/jacocoagent.jar
        /system/framework/<arch>/apex-jacocoagent.art
        /system/framework/<arch>/apex-jacocoagent.oat
        /system/framework/<arch>/apex-jacocoagent.vdex
        /system/framework/<arch>/boot-jacocoagent.art
        /system/framework/<arch>/boot-jacocoagent.oat
        /system/framework/<arch>/boot-jacocoagent.vdex
Test: Run test ATP test avd/avd_boot_health_check on build target
      cf_x86_phone-userdebug_coverage
Bug: 142944799
Bug: 143304991
Change-Id: Ifdb2331c5dcb992adbfd6c5a3983d8b9b13d16b2
2019-10-30 16:25:19 +00:00
Jooyung Han
7dea8e620e Merge "CleanSpec for VNDK APEX" am: 1be2490d3b am: 30d0d7640e
am: a5b494576c

Change-Id: Idabe67ebc495b1432e11f825c46fd146c20eba68
2019-10-29 21:50:34 -07:00
Jooyung Han
5c2e9f921f Merge "CleanSpec for symlinks to VNKD APEX" am: 016f3027ed am: 6f6811bc7c am: 0acaa1ce23
am: 7d4d58b95a

Change-Id: I6902a71a108859034780b790e0fc7ce4312d4164
2019-10-28 22:59:08 -07:00
Jooyung Han
407ed319ab CleanSpec for VNDK APEX
/system/lib/vndk(-sp) are replaced with symlinks to VNDK APEX

Bug: 141451661
Test: m
Change-Id: I71a4cef516d57866a7be8cc8cad02aedabf727df
2019-10-29 14:50:57 +09:00
Jooyung Han
60c493f9c7 CleanSpec for symlinks to VNKD APEX
VNDK APEX was reverted.

Bug: 143374795
Test: m
Change-Id: I09fb28b72765dbe5a781001d8ddf53644fc45154
2019-10-29 11:19:06 +09:00
Roland Levillain
e517577a45 Merge "Remove Core Library JARs from /system/framework."
am: 047f2fd43e

Change-Id: Ic25531c16a71452e659776765185adf8feac5eac
2019-10-22 10:51:10 -07:00
Roland Levillain
3ec9ff6b72 Remove Core Library JARs from /system/framework.
These JARs are part of the ART APEX, and are now located in
`/apex/com.android.art/javalib`. Remove the supernumerary copies in
`/system/framework` and save ~11 MiB on the system partition.

(cherry picked from commit d4f09f7752)

Test: Device boot test
Bug: 142944799
Change-Id: Ia6f58d858ecdb80c9701696b8f20d5fa2de0c2c7
Merged-In: Ia6f58d858ecdb80c9701696b8f20d5fa2de0c2c7
2019-10-22 16:42:53 +00:00
Roland Levillain
d4f09f7752 Remove Core Library JARs from /system/framework.
These JARs are part of the ART APEX, and are now located in
`/apex/com.android.art/javalib`. Remove the supernumerary copies in
`/system/framework` and save ~11 MiB on the system partition.

Test: Device boot test
Bug: 142944799
Change-Id: Ia6f58d858ecdb80c9701696b8f20d5fa2de0c2c7
2019-10-21 15:22:51 +01:00
Anton Hansson
eaf2b7e582 CleanSpec for system_other
Bug: 142537657
Test: m
Change-Id: I9206a2b8540ec49889b9e8210eae3b64b0fa2d81
2019-10-14 16:55:03 +01:00
Anton Hansson
dffd81b9d5 Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" am: 3cc4fa6394 am: bde786ca70 am: 2ce82aea1a
am: 9cef3e597e

Change-Id: I5fe8bfc84e02538f41fe404105369e56501c2de9
2019-10-14 02:58:17 -07:00