Commit graph

313 commits

Author SHA1 Message Date
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
Bowgo Tsai
9ecb6b704c Merge "Moving GSI-specific files to system_ext" am: a6c80c1117 am: 478bda0122 am: 3c3db483a1 am: 832f700223
am: 85a542a3f3

Change-Id: Ie5fbd5d2483af9a1e11b578256e7365ec6db5546
2019-09-04 08:54:42 -07:00
Bowgo Tsai
832f700223 Merge "Moving GSI-specific files to system_ext" am: a6c80c1117 am: 478bda0122
am: 3c3db483a1

Change-Id: I5d62bfb03a26881b2dd9e8d70987fd95a4cb5380
2019-09-04 08:40:44 -07:00
Bowgo Tsai
478bda0122 Merge "Moving GSI-specific files to system_ext"
am: a6c80c1117

Change-Id: Ibba7d959d3e8a3e2b97c9138d067f9b6d0593d60
2019-09-04 08:22:42 -07:00
Bowgo Tsai
8ef0ffe7e8 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
Change-Id: Ida7c2d1b0152c7ef77fa9aeb5d0766d17aec59c5
2019-09-04 14:54:53 +08:00
Justin Yun
751f697381 Merge "Revert "Add product and system_ext partition for emulator"" am: 0c55b6d2cb am: 66a0d43db2 am: b3162c117e am: ac3686da61
am: 6bd7903b8a

Change-Id: I26e652ea3621078990647854440514e56df277de
2019-08-07 17:44:58 -07:00
Justin Yun
ac3686da61 Merge "Revert "Add product and system_ext partition for emulator"" am: 0c55b6d2cb am: 66a0d43db2
am: b3162c117e

Change-Id: Iaa4eca2de01460aea205c45b91c2c3bbb4ebc55a
2019-08-07 17:24:42 -07:00
Justin Yun
66a0d43db2 Merge "Revert "Add product and system_ext partition for emulator""
am: 0c55b6d2cb

Change-Id: I112c27402c00276f2442daeb233ceee73814fe0e
2019-08-07 16:58:49 -07:00
Justin Yun
b5570cf17b Revert "Add product and system_ext partition for emulator"
This reverts commit ef7e3f2623.

The configuration affects GSI to have separate partitions for product
and system_ext which was not intended.

Bug: 138742524
Bug: 138382074
Test: emulator; check boot
Change-Id: Ie621d6b49f22ee2775adf1c1497e812f840f8ba7
2019-08-07 23:44:41 +00:00
Dan Willemsen
541f86efc4 Merge "Remove import_includes/export_includes" am: 6240872250 am: 0c5a068d02 am: baa4704f97 am: 823ab5d846
am: dce8646ed9

Change-Id: I8da292fe990c717cc78ce267048ef1fec059a9b6
2019-08-05 11:21:12 -07:00
Dan Willemsen
823ab5d846 Merge "Remove import_includes/export_includes" am: 6240872250 am: 0c5a068d02
am: baa4704f97

Change-Id: Iac1feccdf16968ed465c5c4bad748244832dcc19
2019-08-05 11:01:08 -07:00
Dan Willemsen
0c5a068d02 Merge "Remove import_includes/export_includes"
am: 6240872250

Change-Id: Idf487156730321d4172a057697ac3585497de13f
2019-08-05 10:44:05 -07:00
Dan Willemsen
b4cc811e98 Merge changes from topic "rm_ONE_SHOT_MAKEFILE" am: 8b8b9b6bf8 am: 58be946140 am: bc838a4887 am: 9e18f1a939
am: bd385d8106

Change-Id: I6ca7d53ddf84969b37c341905e253bd5bf131ac9
2019-08-01 15:31:09 -07:00
Dan Willemsen
18ffd5891e Remove import_includes/export_includes
Now that ONE_SHOT_MAKEFILE no longer exists, we don't have to rely on
the filesystem to store this informtion.

This removes ~16.7k files from our build graph
(aosp-master/aosp_arm64-eng), though only about 600 of them were being
used in a normal build.

Test: treehugger
Change-Id: I3ac12f5ea7f11d25064109a0599bc5be1976fba5
2019-08-01 14:56:45 -07:00
Dan Willemsen
9e18f1a939 Merge changes from topic "rm_ONE_SHOT_MAKEFILE" am: 8b8b9b6bf8 am: 58be946140
am: bc838a4887

Change-Id: Ib88f71fe579d6e5372c44b45974e50097ddb4309
2019-08-01 14:52:48 -07:00
Dan Willemsen
58be946140 Merge changes from topic "rm_ONE_SHOT_MAKEFILE"
am: 8b8b9b6bf8

Change-Id: I5764b2ce848710584d2d837e9e33fb9fb71c8d33
2019-08-01 14:31:32 -07:00