Commit graph

328 commits

Author SHA1 Message Date
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
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
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
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
Anton Hansson
bde786ca70 Merge "Document SYSTEM_OTHER_ODEX_FILTER matching"
am: 3cc4fa6394

Change-Id: I6e243dc057ce23913a9a33f97a7ecd35c9714de1
2019-10-14 02:40:35 -07:00
Anton Hansson
73dc6c9aba Fix CleanSpec.mk diff
Add a line to match the last AOSP line, to make
auto-merging between the two possible.

Test: No
Change-Id: If3a7130efcf14f19decd48cfa25fe8ef22dc52b8
2019-10-07 16:21:21 +01:00
Anton Hansson
3c5a18fc16 Document SYSTEM_OTHER_ODEX_FILTER matching
...and add a CleanSpec for the moving preopt files.

Bug: 141707536
Test: N/A
Change-Id: I2f5bc4e2c8e6a9fa4c562d55623c13682d3f93ba
2019-10-07 14:29:58 +01:00
Yo Chiang
db7529d009 Merge "Re-submit "Make mainline device use apex""
am: 491966fb7f

Change-Id: I32e950b118863ddfcfcb621cff664eb860345dc1
2019-10-04 20:44:15 -07:00
Anton Hansson
b8205595c0 Re-submit "Make mainline device use apex"
The build system default was changed to not support apex, but
we want the mainline device to enable it.

Test: make mainline_system
Merged-In: I9f29e8354acffb1856dfd8a173b80a3f9324630c
Change-Id: I9f29e8354acffb1856dfd8a173b80a3f9324630c
2019-10-04 20:25:14 +08:00
Anton Hansson
643a55b87f Merge "CleanSpec for new system_other layout" am: f89f29d669 am: 5a6cf80073 am: 73852ff056
am: 4830773d73

Change-Id: I1d75cf3720f4567ab708ab60d7ba18c4e286039f
2019-10-04 00:11:23 -07:00
Anton Hansson
5a6cf80073 Merge "CleanSpec for new system_other layout"
am: f89f29d669

Change-Id: I3eca4ad6cd59b3f2c03d391eae94cea3c45b07f6
2019-10-03 23:52:35 -07:00
Anton Hansson
8db2605038 CleanSpec for new system_other layout
Bug: 141707536
Test: m
Change-Id: I120362a230eb08863311a9c0d8aeb2f0ab6c81c7
2019-10-03 14:19:58 +01:00
Mitch Phillips
9b32a4ec5f Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict." am: 30e613a48d am: c9a79eb8e8 am: 7e7e685e22
am: 2a7996ac0b

Change-Id: I2c0f43521040589e2eaeb293fc2e28282fdea768
2019-09-19 07:29:54 -07:00
Mitch Phillips
c9a79eb8e8 Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict."
am: 30e613a48d

Change-Id: I3606b86577ba2c498cae44f51c1e89076c5fc8d0
2019-09-19 07:08:42 -07:00
Mitch Phillips
fd6d9022fe Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict.
Adds the backend makefile parser for the LOCAL_FUZZ_DATA vars generated
by the cc_fuzz target.

Bug: 141026328
Test: m example_fuzzer, fuzz target should have adjacent corpus/dict
files.

Change-Id: Ide2c34318f11be132992650ce5cc1fd27895915c
2019-09-18 18:58:28 -07:00
Xin Li
abf6afdce6 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ib7d2f7c5a8aef5c6c3e8f74c6c32d5092f32a166
Merged-In: I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd
2019-09-08 13:11:47 -07:00
Bowgo Tsai
00f0d9464a Merge "Reland: Moving GSI-specific files to system_ext" am: 2fc007eba5 am: ab38d47d5a am: 5493629216 am: a93e381076
am: 7599e0abbf

Change-Id: I84c36107c4729641128274ba0d3974decde03ecd
2019-09-05 06:29:29 -07:00
Bowgo Tsai
a93e381076 Merge "Reland: Moving GSI-specific files to system_ext" am: 2fc007eba5 am: ab38d47d5a
am: 5493629216

Change-Id: I30d1808006ad64fe636a45d3b1c93ed4c2bcafc6
2019-09-05 06:14:32 -07:00
Bowgo Tsai
ab38d47d5a Merge "Reland: Moving GSI-specific files to system_ext"
am: 2fc007eba5

Change-Id: I2fae8961887e6fa0e9a8d3815e953a6f687fb2a8
2019-09-05 06:00:50 -07:00
Bowgo Tsai
ac3c65b7bb Reland: Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Test: rm -rf out && build/soong/soong_ui.bash --make-mode \
      TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug droid
Change-Id: Iae9f5fb688f49497563864eb882d5f0ae33c744a
2019-09-05 17:11:07 +08:00
Ian Kasprzak
8809335740 Merge "Revert "Moving GSI-specific files to system_ext"" am: 414108c6c1 am: b5195f128d am: c1b6e703a9 am: 303eaac2c0
am: 40448f262e

Change-Id: I75810255c2523e38fb35506b222b425198018139
2019-09-04 19:02:43 -07:00
Ian Kasprzak
303eaac2c0 Merge "Revert "Moving GSI-specific files to system_ext"" am: 414108c6c1 am: b5195f128d
am: c1b6e703a9

Change-Id: I26d6c5d665d1a5d2df516d720d466b7f7d6ed240
2019-09-04 18:48:09 -07:00
Ian Kasprzak
b5195f128d Merge "Revert "Moving GSI-specific files to system_ext""
am: 414108c6c1

Change-Id: I289dddfc62ee165c9857eace3d703983da32b695
2019-09-04 18:34:31 -07:00
Ian Kasprzak
cba65a9c92 Revert "Moving GSI-specific files to system_ext"
This reverts commit 8ef0ffe7e8.

Reason for revert: b/140499897 - Breaking multiple builds across branches.
Test: Forrest - go/forrest_run/L78500000361846284

Change-Id: I618e0d051fdcd7a7afcc09408e20c53f38566e94
2019-09-05 01:03:17 +00:00