Commit graph

580 commits

Author SHA1 Message Date
Jeff Vander Stoep
fe91d896ee Make com.android.sepolicy mandatory
Bug: 199914227
Test: aosp/1910032
Change-Id: I23599517b427363e758e6f06763079cc1482cb47
Merged-In: I23599517b427363e758e6f06763079cc1482cb47
2022-01-10 10:28:39 +00:00
Daeho Jeong
99f5c768c7 Add erofs tools in target
Bug: 201685920
Test: mm fsck.erofs
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I43ebe6c40c705526e205a08fe8fcd34d265d0245
2021-12-03 19:37:46 +00:00
Roland Levillain
3fed5bbbab Remove gdbserver from PRODUCT_PACKAGES_DEBUG in base_system.mk.
The `gdbserver` binaries have been removed from Android sources
(https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1748908/).

Test: m
Change-Id: I8e3001508360906f3fe86830b81fb94b01a5ac74
2021-11-29 14:26:10 +00:00
Elliott Hughes
68d2f8ce91 Don't package mdnsd for the host.
I don't think anyone needs this since Brillo died.

Test: treehugger
Change-Id: Iaa7b84375c9d31f443cba4556dc25b9b00bae5f8
2021-10-26 16:38:58 -07:00
Treehugger Robot
ed35e2f153 Merge "Add servicedispatcher to PRODUCT_PACKAGES_DEBUG." am: 5a28a2af48 am: 9d15040d13
Original change: https://android-review.googlesource.com/c/platform/build/+/1727691

Change-Id: Ib1260dc4b90a17802f2c421cba5284e36bb545cf
2021-08-11 04:21:59 +00:00
Treehugger Robot
5a28a2af48 Merge "Add servicedispatcher to PRODUCT_PACKAGES_DEBUG." 2021-08-11 03:52:56 +00:00
Mathew Inwood
65e6a0d3f9 Add libincident. am: e24af74376
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15411834

Change-Id: I43a5b3ba570bd32049b2e15e67e9ead0846843ba
2021-07-30 10:42:59 +00:00
Mathew Inwood
e24af74376 Add libincident.
This library is required by the StatsD apex and including it here ensures
it's always available for use by the apex.

Bug: 192556458
Bug: 160662406
Test: TH
Change-Id: Ia01964d471e4456c05c77c708dee2e71e0121587
2021-07-29 14:59:29 +00:00
TreeHugger Robot
69f66460de Merge "Delete com.android.cronet from base_system" into sc-dev 2021-07-02 09:03:40 +00:00
Neil Fuller
98a2c38a40 Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I460600631dbfecf51534b454143dfe1aa6c4fdbf
2021-06-30 11:07:02 +00:00
Neil Fuller
5ee2173c05 Remove com.android.geotz jar from system server
This commit removes the com.android.geotz apex from the build.

This apex is associated with the "offline" location time zone provider
from the nascent com.android.geotz module, which has been configured as
the "secondary" provider. This module will not to be updatable in S so
needs to be removed before release.

This is effectively a revert of commit
6009a0a38f.

Bug: 178169250
Bug: 172546738
Test: treehugger
Change-Id: I734388383030984d5c3e7a1373a77da013a6cb8e
2021-06-28 14:04:54 +00:00
Luke Huang
bdb359aef5 Delete com.android.cronet from base_system
No concrete plan to ship Cronet for now

Bug: 188872256
Test: TH
Merged-In: I86f659de4a956a3186f21a5333781b92b71e7c17
Change-Id: Ic3deabca3794d1541668b45e8e63d99a7345adfd
2021-06-23 08:46:46 +00:00
Treehugger Robot
291c17c857 Merge "Add libbinder_rpc_unstable to system image" am: 92fb9274d9 am: a3d1f3f4c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1733992

Change-Id: I9539aa91e5933482e06f02eff286c4582db21332
2021-06-17 22:13:51 +00:00
Remi NGUYEN VAN
45e403bd2e Use NetworkStack instead of NetworkStackNext
Now that NetworkStack has bumped its target SDK to 31, use it
instead of the development SDK NetworkStackNext binary.

In practice NetworkStack and NetworkStackNext are currently
identical, as "current" is now SDK 31 in S branches, and
NetworkStackNext does not contain any T-specific code yet.

This change should not be merged in development branches downstream of
AOSP.

Bug: 189581241
Test: device boots, has connectivity
Merged-In: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
Change-Id: I990c76da41d56c8756835b5743e1666d1382f796
2021-06-14 07:59:48 +00:00
Victor Hsieh
b2d86af939 Add libbinder_rpc_unstable to system image
Bug: 190547489
Bug: 189947807
Test: m
Change-Id: Ib3b1d10e6f09de54966ab6c02f170b0feef17241
2021-06-10 09:54:11 -07:00
Yifan Hong
ddf9092b29 Add servicedispatcher to PRODUCT_PACKAGES_DEBUG.
Test: pass
Bug: 182914638
Change-Id: I17ac0a5cd8c2d8afad4360947fcf8ca5eac040e2
2021-06-04 12:15:39 -07:00
Tim Van Patten
e6d2d6c3dd Remove building the ANGLE APK from AOSP
Mark ANGLE as product-specific and remove building the APK. CuttleFish
will continue to build the ANGLE libraries directly.

Bug: b/187342779
Test: launch_cvd --restart_subprocesses=false --start_webrtc=true --gpu_mode=guest_swiftshader
Change-Id: I6cd379a11e0c198ad72636253f1a33f2d1fc798f
2021-05-18 11:58:23 -06:00
Tim Van Patten
ba4d55b905 Remove ro.gfx.angle.supported from base_system.mk
Remove ro.gfx.angle.supported from base_system.mk as a pre-requisite to
moving ANGLE to the CuttleFish-specific build. This fixes a merge
conflict that prevents the AOSP CL from landing.

Bug: 187342779
Test: make
Change-Id: I5c8b6ea71dbc066e125a072689778fe4dda1a686
2021-05-11 01:05:18 +00:00
Paul Duffin
84c8ff4eb2 Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e6511331 am: 2b90008ccd am: 2635f9f869
Original change: https://android-review.googlesource.com/c/platform/build/+/1675809

Change-Id: I34093b009c2a0149fcf159caede6fae18fb9bb6d
2021-04-14 20:39:42 +00:00
Paul Duffin
2e046e6c61 Avoid adding jacocoagent to bootclasspath twice
Previously:
* If EMMA_INSTRUMENT_FRAMEWORK=true then jacocoagent was
  added to the ART_APEX_JARS which itself is added to
  PRODUCT_BOOT_JARS.
* If EMMA_INSTRUMENT=true then it was added directly to the
  PRODUCT_BOOT_JARS.
* If both were true then it was added in both places ending up on the
  bootclasspath twice.

Bug: 185369704
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true droid
      m droid
Change-Id: Id1d4d1c98455cb2859ed5e4071a0cf14fb40eec4
2021-04-14 17:50:48 +01:00
Janis Danisevskis
7bc7da051f Merge "Keystore 2.0: Remove keystore and keystore2.enable property." am: bacb3ebb2a am: fd04a29fe0 am: c4f4a4dc5d
Original change: https://android-review.googlesource.com/c/platform/build/+/1626719

Change-Id: I60dcef6658f18a547217fa59cf53b01fa87b3b62
2021-04-07 20:56:01 +00:00
Janis Danisevskis
bacb3ebb2a Merge "Keystore 2.0: Remove keystore and keystore2.enable property." 2021-04-07 19:30:12 +00:00
Elliott Hughes
d63b6a1054 Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693 am: a6600c241e
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: I0a6a96a61ec4a195c89fdd3d48a3011f01023a42
2021-04-02 22:56:23 +00:00
Elliott Hughes
a6600c241e Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: Ia46e509718525427316575db53be1459cedc1949
2021-04-02 22:10:44 +00:00
Elliott Hughes
a445ef6cde Remove honggfuzz support.
Everyone's on libFuzzer now.

(The "fuzz" referred to in base_system.mk was removed in Android 11, but
this reference was left lying around.)

Bug: http://b/184301511
Test: treehugger
Change-Id: I6fe0f2c37e014647802279a656d2c6c9625b7a44
2021-04-02 10:24:48 -07:00
Janis Danisevskis
cf8a05bbfa Keystore 2.0: Remove keystore and keystore2.enable property.
* Remove keystore as build target.
* Remove the default setting of the keystore2.enable property.

Bug: 171563717
Test: N/A
Change-Id: I2f29d18650a5e2b819985d202cb0c4002bbe94de
2021-03-19 10:31:40 -07:00
Janis Danisevskis
74eedd9d30 Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Merged-In: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-18 15:13:40 +00:00
Janis Danisevskis
88a0602582 Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Merged-In: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-17 08:47:55 -07:00
Janis Danisevskis
bee0f15faa Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-16 15:00:10 -07:00
Martijn Coenen
12137e3c03 Merge "Add on-device signing binary to base." am: e484f03f0d am: 8ba24df564 am: 26b470ef49
Original change: https://android-review.googlesource.com/c/platform/build/+/1512771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23bd4b5a1a6a01f8898cd989f753ca1d3e168b87
2021-02-19 12:54:04 +00:00
Martijn Coenen
e484f03f0d Merge "Add on-device signing binary to base." 2021-02-19 11:31:50 +00:00
Gavin Corkery
a270b161b4 Add com.android.scheduling to system partition
Test: Flash, check package is in /system
Bug: 161353402
Change-Id: Ib25bb5a11348f8e66efb473242803459fb992998
2021-02-10 09:10:17 +00:00
Treehugger Robot
a06d7685a8 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" am: 7ef7116014 am: 38aea6ebe4 am: 13ad4052b9
Original change: https://android-review.googlesource.com/c/platform/build/+/1578147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85a61be24bfd40b8fb6f788a1c75fcf2d7bcb2ee
2021-02-08 21:39:26 +00:00
Janis Danisevskis
a3c5395672 Keystore 2.0: Disable keystore 2 by default (for now)
Test: System starts without keystore 2 running.
Bug: 160623310
Change-Id: I83d54de602a0f70acc91fd8e55b07706e1b4e55b
2021-02-05 14:39:43 -08:00
Ulya Trafimovich
347be4037e resolve merge conflicts of 56bf7ca8c9 to master
Test: DIST_DIR=$PWD/dist \
    TARGET_BUILD_VARIANT=userdebug \
    vendor/google/build/build_mainline_modules.sh
Bug: None
Change-Id: I66049dfb90c2583ea6687ac3353e3ce3eb973bd4
2021-01-20 12:44:40 +00:00
Nicolas Geoffray
897fe0e8df Split out minimal ART dexpreopt config and use it in mainline builds.
The config sets a few system properties that end up in command-line
arguments passed to dex2oat. Without these properties dex2oat invocation
fails, because options -Xms and -Xmx are do not have an argument.

Test: buid_mainline_modules.sh
Bug: 176171716
Change-Id: I4fd1f059aad5d48495948bfd668307de8b3d9ee1
2021-01-19 17:03:30 +00:00
Chong Zhang
1c2093a21b Merge "Move mediatranscoding from system to apex" 2020-12-23 03:28:03 +00:00
Treehugger Robot
0de3a8b99f Merge "Move ro.zygote to vendor" 2020-12-17 07:02:25 +00:00
Treehugger Robot
35f6614178 Merge "Move jacocoagent installation to base_system" am: 98b7ac4602 am: a88a997a7a am: a9bfe835c2
Original change: https://android-review.googlesource.com/c/platform/build/+/1532100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcdc828243382d7ae6dc244192abf6d441baafc1
2020-12-17 01:23:38 +00:00
Treehugger Robot
a9bfe835c2 Merge "Move jacocoagent installation to base_system" am: 98b7ac4602 am: a88a997a7a
Original change: https://android-review.googlesource.com/c/platform/build/+/1532100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3075df9537b0f27de59389f2e32a83009fb8d8c5
2020-12-17 00:49:27 +00:00
Yifan Hong
42cae00cb0 Move jacocoagent installation to base_system
jacocoagent and its dependencies emits artifacts to system/,
hence it belongs to base_system.mk. It was rather incorrect
to add jacocoagent to EVERY product makefile because those
product makefiles may be enforcing artifact path requirements
(e.g. generic_ramdisk.mk).

Test: EMMA_INSTRUMENT=true m nothing
Bug: 175605139
Bug: 173742069
Change-Id: If9cb93ab8fd69d11e764ab830dc791bbe6106cf5
2020-12-16 09:50:42 -08:00
TreeHugger Robot
c4ec682cb2 Merge "Move ro.zygote to vendor" into rvc-qpr-dev-plus-aosp am: e75f0995de
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13177249

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia23efbd819c4f33db431a163cd1c938c112b4cb4
2020-12-14 17:28:52 +00:00
SzuWei Lin
9faf469d27 Move ro.zygote to vendor
The system property ro.zygote should be define in vendor. It went
to system wrongly when replacing PRODUCT_DEFAULT_PROPERTY_OVERRIDES.

Bug: 173452246
Test: build a Pixel device and check build.prop under system and vendor
Change-Id: I86919f993ae44f3502eb63e728d33acaa14f7088
2020-12-09 07:11:37 +00:00
SzuWei Lin
1b0f9bff9c Move ro.zygote to vendor
The system property ro.zygote should be define in vendor. It went
to system wrongly when replacing PRODUCT_DEFAULT_PROPERTY_OVERRIDES.

Bug: 173452246
Test: build a Pixel device and check build.prop under system and vendor
Change-Id: I86919f993ae44f3502eb63e728d33acaa14f7088
Merged-In: I86919f993ae44f3502eb63e728d33acaa14f7088
2020-12-07 08:05:27 +00:00
Chong Zhang
f09bc4bc3b Move mediatranscoding from system to apex
bug: 159172726
Change-Id: If50286c743f5ba4286980ddaafd30c856be388d9
2020-12-05 18:03:58 +00:00
Martijn Coenen
05d7fefb7d Add on-device signing binary to base.
Bug: 165630556
Test: inspect image
Change-Id: Ia428165be4a9800df23918330ab027458c84836d
2020-11-27 12:22:46 +01:00
Anton Hansson
ad38c3f252 Merge "Add bootclasspath config to its own makefile" 2020-11-26 10:56:01 +00:00
Anton Hansson
5add55ede1 Add bootclasspath config to its own makefile
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
2020-11-25 19:32:02 +00:00
Anton Hansson
8c73673e73 Add bootclasspath config to its own makefile
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Merged-In: Id3f91e387bba2e0525b4010f22fe380d1d8be537
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
2020-11-25 18:53:37 +00:00
Neil Fuller
8cb8a5f900 Merge "Add the geotz jar to the system server" 2020-11-24 15:38:59 +00:00