Commit Graph

570 Commits

Author SHA1 Message Date
Xia Ruobing e80f33fc8f Reverse the patch which disabled building and launching zygote. 2022-10-29 11:20:28 +08:00
fanyouwei 1bdc607dc0 Remove zygote from build script. 2022-10-29 11:20:28 +08: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 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
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
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
Neil Fuller 6009a0a38f Add the geotz jar to the system server
Add the geotz jar to the system server classpath. This jar comes from a
new module "com.android.geotz".

Bug: 172546738
Test: build / boot
Change-Id: I0293d6e059cb53fb693a7ecf064874cbae5f8df0
2020-11-20 19:33:25 +00:00
Palmer Dabbelt aa201ddd64 Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" am: 750061ddf8 am: 793516264d am: 6086d8175f am: 890be30837
Original change: https://android-review.googlesource.com/c/platform/build/+/1482957

Change-Id: Ic112a91a28bb16a396597ce4ab0bd9c14fb53ecd
2020-11-17 05:08:39 +00:00
Jeff Sharkey 688682b235 Merge "Custom binary XML wire protocol tools." 2020-11-11 18:11:52 +00:00
Palmer Dabbelt 2d691edf69 Add dmuserd to PRODUCT_PACKAGES_DEBUG
This is a simple dm-user daemon that will be used for the QA tests.

Test: manual, b/171749628
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Change-Id: I37b78a1479f08f37fe7cff3f2e201dc6d8a6e584
2020-11-10 13:48:02 -08:00
David Anderson 84fe04bef7 Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450 am: c0a5fefc1f am: 498a4291ff am: 015a38a81c
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824

Change-Id: Ic6a99179687a029cd64e5df0cdb6c937f63e43dc
2020-11-07 04:15:20 +00:00
David Anderson 7cd99eb450 Merge "Add snapuserd to VABC product and base_system.mk." 2020-11-06 23:26:18 +00:00
Jeff Sharkey 447f859deb Custom binary XML wire protocol tools.
To support local development work, add new "xml2abx" and "abx2xml"
shell utilities which offer to convert between human-readable XML and
our new binary XML protocol.

Interally this utility uses Xml.copy() which is already covered by
existing unit tests that verify lossless conversion between the two
underlying protocols.

Bug: 171832118
Test: manual
Change-Id: I85edae46607352dc306d131eeb50b81c475e3d6f
2020-11-06 13:14:36 -07:00
Yi Kong f6f2253aa3 Merge "Add profcollect to PLATFORM_PACKAGES_DEBUG" am: da1cf9f1c1 am: a216a3e2c6 am: 5fcea7ab25 am: a8d60ab3de
Original change: https://android-review.googlesource.com/c/platform/build/+/1485800

Change-Id: Ic13d513e8b0cfaf352e184f55f8cdbf1987717b6
2020-11-04 20:28:31 +00:00
Yi Kong 25328f5cb9 Add profcollect to PLATFORM_PACKAGES_DEBUG
... but it does not get turned on automatically. This is controlled by
profcollect_native_boot.enabled device config.

Test: boot device and verify profcollectd is disabled by default
Bug: 79161490
Change-Id: Ia91b9759e108896f275633e3156355b65dc94299
2020-11-04 09:44:27 +08:00
Treehugger Robot 5011824af0 Merge "Add keystore2 to PLATFORM_PACKAGES" am: c0f701287c am: e383447ffe am: 47767ebd8a am: ed4bce9aed
Original change: https://android-review.googlesource.com/c/platform/build/+/1479457

Change-Id: Iacbf1d8dd0aa156132caba80dcb1209e7ceddd8d
2020-11-03 21:46:20 +00:00