Commit Graph

6070 Commits

Author SHA1 Message Date
Alexander Dorokhine a8bae14fce Add framework-appsearch apex on the classpath.
Test: presubmit
Bug: 146218515
Change-Id: If511234a958661e71fcfb50c28679f6ff91f3ad8
2019-12-17 10:44:27 -08:00
Dario Freni c81d71ff67 Merge "Move CtsShim and CtsPrivShim APKs out of system." 2019-12-17 13:19:11 +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
TreeHugger Robot de05e2718d Merge "Camera: add camera device @ 3.6" 2019-12-17 09:31:41 +00:00
David Su d880e49d44 Merge changes from topics "framework-wifi-apex", "split-framework-wifi"
* changes:
  Move framework-wifi into the Wifi APEX
  Add framework-wifi to bootclasspath
2019-12-17 07:35:27 +00:00
Automerger Merge Worker 7aefdb1da1 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" am: 2f4a8bb534 am: 23886a3c4d am: 0c081b6d76
Change-Id: I5761a2cc1fe9b335d0eb80a52b4654fb1d2f68f1
2019-12-17 06:28:58 +00:00
Automerger Merge Worker 0c081b6d76 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" am: 2f4a8bb534 am: 23886a3c4d
Change-Id: I89e5e260944124823c3098ee42e693545c9c0aba
2019-12-17 06:14:22 +00:00
Treehugger Robot 2f4a8bb534 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" 2019-12-17 05:51:34 +00:00
Automerger Merge Worker 74f58f3dc0 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" am: de5b0d2a73 am: 0ea258ae16 am: dd779885eb
Change-Id: I6c0d26587bc7268ff4c9d2f074df290ff3880357
2019-12-17 05:24:53 +00:00
Automerger Merge Worker dd779885eb Merge "Define PRODUCT_SYSTEM_* props for mainline_system" am: de5b0d2a73 am: 0ea258ae16
Change-Id: I341b3baed1b0e97b1fdb8f924d290c500b19428a
2019-12-17 05:13:12 +00:00
Treehugger Robot de5b0d2a73 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" 2019-12-17 04:57:10 +00:00
Muhammad Qureshi 6c351681a6 Merge "Add framework-statsd.jar to jars list" 2019-12-16 20:46:57 +00:00
Lalit Maganti ef70f3c92f Merge "build: enable Perfetto by default" 2019-12-16 16:41:49 +00:00
Automerger Merge Worker ef4640cb48 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." am: ced27c4c60 am: 132c0346e2 am: 423d1b9d7d
Change-Id: I13729fd18ec271739377ab3796a5b0ec66ab9cd8
2019-12-16 15:18:44 +00:00
Lalit Maganti 37b5bf8aea build: enable Perfetto by default
Perfetto has been enabled by default on Pixel devices since P and has
proved to be stable and helped find performance issues on both P and Q.

On R+, iorapd has a dependency on Perfetto and thus we need to be enabled
by default.

Note that CTS tests have ensured that any downstream consumers of Android
have not accidentally broken Perfetto in old releases so this should be
safe to introduce and maintain going forward.

The two daemons of Perfetto (traced and traced_probes) are located on the
/system partition so for consistency, we have chosen to also enable the
build property on the system partition.

Googlers can see the below link for more context and detailed info.

Change-Id: I00fa7d4c97eda4d0ab83520d0f428bca83707d8a
Context (Googlers only): go/perfetto-by-default
Bug: 137963570
Test: checking product/build.prop in Treehugger builds
2019-12-16 15:15:29 +00:00
Automerger Merge Worker 423d1b9d7d Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." am: ced27c4c60 am: 132c0346e2
Change-Id: Ib344bdc3dd9f3c1bd8816630adf16768ddc9bd12
2019-12-16 15:00:33 +00:00
Luke Huang ced27c4c60 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." 2019-12-16 14:39:02 +00:00
Luke Huang 723ff8274d Add com.android.cronet APEX and org.chromium.net.cronet to base_system.
com.android.cronet will be shipped as a mainline
module in APEX format.

org.chromium.net.cronet is a java_sdk_library used to provide
Cronet API to apps.

Bug: 139397529
Test: Built and installed apex on device
Change-Id: Icff7ded02e360f2df9dfe3ac7185cf7f0034d014
2019-12-16 20:57:05 +08:00
Yo Chiang 3bbbe2d5b9 Revert "Revert "Remove ro.apex.updatable=false in GSI""
This reverts commit c7f63dfeda.

Reason for revert: b/145963716

Change-Id: I0f6a9c26b342a27dfebc0494a255492c838c09f5
2019-12-16 08:38:59 +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
Yo Chiang 96949d3904 Define PRODUCT_SYSTEM_* props for mainline_system
These properties, namely:

- PRODUCT_SYSTEM_NAME
- PRODUCT_SYSTEM_BRAND
- PRODUCT_SYSTEM_MANUFACTURER
- PRODUCT_SYSTEM_MODEL
- PRODUCT_SYSTEM_DEVICE

propagate into /system/build.prop as ro.product.system.* and can
identify if the /system partition is mainline_system.
These don't modify other ro.product.* properties that are defined in
partitions other than /system.

Bug: 110206836
Bug: 146191296
Test: lunch mainline_system_arm64-userdebug; m
Test: lunch aosp_arm64-userdebug; m
Test: Two products must have same PRODUCT_SYSTEM_* props
Change-Id: I300579d555d269481635237fb02aab5db71a510d
2019-12-15 15:11:53 +00:00
TreeHugger Robot 5c0aa1b3ee Merge "Add vintf-common" 2019-12-15 08:40:32 +00:00
Pawin Vongmasa d118131588 Add vintf-common
Test: Builds

Bug: 145839204
Change-Id: I9f28643d6fd70183f0d6778f0eb1290643400164
2019-12-14 01:50:19 -08:00
Automerger Merge Worker 5917af3f2a Merge "Revert "Remove ro.apex.updatable=false in GSI"" am: 565bb632c7 am: 6d349fe4cc am: 4f1b16f6aa
Change-Id: I9dc657daee47d7c89b763a8672d83fe5980def34
2019-12-14 00:21:27 +00:00
Automerger Merge Worker 4f1b16f6aa Merge "Revert "Remove ro.apex.updatable=false in GSI"" am: 565bb632c7 am: 6d349fe4cc
Change-Id: I0331be1cf5112d10a5defba3d138a0e99c35bbb9
2019-12-14 00:09:07 +00:00
Muhammad Qureshi 81be9fe8db Add framework-statsd.jar to jars list
Add framework-statsd.jar to product_boot_jars and product_updatable_boot_jars

Bug: 145923096
Test: m
Test: vendor/google/tools/flashall
Test: adb shell cmd stats print logs && adb logcat "*:S statsd:*"

Change-Id: I00e9cfa847554e745bd7c18dffda13e9f7ab4130
2019-12-13 16:02:49 -08:00
Treehugger Robot 565bb632c7 Merge "Revert "Remove ro.apex.updatable=false in GSI"" 2019-12-13 23:15:51 +00:00
Automerger Merge Worker edf413c451 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd am: 5feb2e79a3
Change-Id: I244be08d252e1da0eee055a451d748cf0cabca87
2019-12-13 22:13:49 +00:00
Automerger Merge Worker 5feb2e79a3 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd
Change-Id: I5a1c446abab9e0e8dec7dca027bc757f8b34d14b
2019-12-13 21:56:16 +00:00
Treehugger Robot b3bff1d203 Merge changes from topic "gsi-with-flattened-apexes"
* changes:
  Enable updatable-apex.mk for mainline_system
  Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
2019-12-13 21:10:56 +00:00
TreeHugger Robot 7fdf27e437 Merge "Move service-statsd to updatable system server jar" 2019-12-13 19:48:39 +00:00
Automerger Merge Worker 3fd96b0078 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83 am: 8afcfa3877
Change-Id: I4edfa098ba8ed707e04bab5d93e6b0fed8217a43
2019-12-13 06:43:17 +00:00
Automerger Merge Worker 8afcfa3877 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83
Change-Id: Ic138d068d98da417b6bc808e579b5741307600c4
2019-12-13 06:25:03 +00:00
Yo Chiang 078b1598ff Merge "Add mainline_system_x86_64 product" 2019-12-13 05:22:15 +00:00
Automerger Merge Worker 2dd3133345 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a am: 6686dfe7d9
Change-Id: I9fa93c25a636e60304deeb9284fa4e908cd41adb
2019-12-13 03:59:54 +00:00
Automerger Merge Worker 6686dfe7d9 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a
Change-Id: Ic2d30adc0868990bce0d417d7c3557e5334ba7f5
2019-12-13 03:41:03 +00:00
Treehugger Robot dad976ffcb Merge "Adding developer_gsi_keys.mk" 2019-12-13 03:13:02 +00:00
Automerger Merge Worker b525412cc2 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613 am: b960782c52
Change-Id: I73bbd7ae770d51a75d3c63ed5877d00c4ad3c795
2019-12-13 02:38:23 +00:00
Automerger Merge Worker b960782c52 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613
Change-Id: If0bf79bfe405a6db525fb9eb3de0bf44caad5b0b
2019-12-13 01:59:36 +00:00
Kiyoung Kim 0542582560 Merge "Add linkerconfig to recovery" 2019-12-13 01:09:58 +00:00
David Su b6d5b76624 Move framework-wifi into the Wifi APEX
Bug: 140299412
Test: device boots up and connects to Wifi
Change-Id: I0ae9ed5a21232385394f2e21b81671997ac86d23
2019-12-12 15:31:56 -08:00
Tej Singh e9403e4e79 Move service-statsd to updatable system server jar
This moves StatsCompanionService into the statsd apex.
service-statsd.jar is no longer installed to system/framework, and is
instead installed to
/apex/com.android.os.statsd/javalib/service-statsd.jar by moving it from
PRODUCT_SYSTEM_SERVER_JARS to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS

Bug: 145923413
Test: make clean; make; vendor/google/tools/flashall and manual
inspection of jar locations
Test: made trivial update to SCS and bumped the version of the apex.
Then did: 1. make com.android.os.statsd 2. adb install
com.android.os.statsd 3. adb reboot. Verified that the change was
reflected via the apex update

Change-Id: Ia261ea79b2a46a4cc709e1b7dd072de15e17571e
2019-12-12 15:23:59 -08:00
David Su 3fd2c56e85 Add framework-wifi to bootclasspath
Now that framework-wifi is a separate jar from
framework-minus-apex, need to add it to the
bootclasspath separately.

Bug: 140299412
Test: devices boots up

Change-Id: I2929a133797b78f4546fbd1790e08d5019f73ee8
2019-12-12 14:03:01 -08:00
Nicholas Ambur 76211be490 Merge "Add SoundTrigger@2.3 to gsi" 2019-12-12 21:37:00 +00:00
Yin-Chia Yeh dfc0f94a15 Camera: add camera device @ 3.6
Test: build pass
Bug: 135142453
Change-Id: I8eb843346f69b35e8bbd0b1a21990916a34fae58
2019-12-12 11:39:39 -08:00
Dario Freni 99f5e40137 Enable updatable-apex.mk for mainline_system
Test: presubmit passes
Bug: 145791146
Change-Id: I87fb58c4d8d3d02d46af467d62222782658e73dc
2019-12-12 17:21:17 +00:00
Bowgo Tsai 01c6f6f215 Adding developer_gsi_keys.mk
OEMs who are willing to support booting the public Developer-GSI
in locked state can add the following line into a device.mk to include
the corresponding public keys into their first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

Bug: 144399552
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
2019-12-12 21:32:49 +08:00
Nicholas Ambur 7df7b8601b Add SoundTrigger@2.3 to gsi
Bug: 141929369
Test: build and verify that build includes soundtrigger@2.3
Change-Id: Ie0070feff43931d3f702d5a7732c78fa4623d3d2
2019-12-11 19:15:01 -08:00
Jooyung Han 9efe534ef1 Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
For GSI targets, this variable is set true, and Soong will install both
"flattened" and "unflattened" APEXes together in /system_ext and /system
respectively.

Bug: 137802149
Test: lunch aosp_arm64-userdebug && m
  resulting apex images under /system/apex
  and flattened apexes under /system/system_ext/apex

Change-Id: Ib72d1b9dbd59727942da39323ee7e60ac6e14882
2019-12-12 02:04:43 +09:00
SzuWei Lin c7f63dfeda Revert "Remove ro.apex.updatable=false in GSI"
This reverts commit d24bc21f06.

Reason for revert: Waiting relative feature done.

Change-Id: I455bcaaba567260197d8ebe88175a9d40fb49195
2019-12-11 07:07:46 +00:00