Commit Graph

425 Commits

Author SHA1 Message Date
Howard Ro ac79359a25 Merge "Remove statsd binary from base_system.mk" 2020-02-20 08:00:53 +00:00
Howard Ro 26490fb2b4 Remove statsd binary from base_system.mk
Now that statsd binary is moving to the apex, we should remove it from
base_system.mk. Also, we noticed that the statsd apex name is defined
twice. So we also removed the duplicate line.

Test: make
Bug: 145923087
Change-Id: Ic974ac1506e4dafa310fcd4727852d3188eb2885
2020-02-19 20:52:16 -08:00
evitayan 1173332eb2 Load ike in system server classpath instead of bootclasspath
Module IPsec(IKE) will be built as a java_sdk_library and will not
be in bootclasspath anymore. It will be loaded in system sevrer
classpath so that it can be used by VPN.

Bug: 145995723
Test: build, flash, boot
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Test: manually tested that it is loaded in system server
Change-Id: I3126605613202b1e981b4e7f594acb6edbb7d635
2020-02-13 17:24:19 -08:00
Ulya Trafimovich 19ed3a0db7 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: walleye-userdebug boots

Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
2020-02-12 16:16:55 +00:00
Amit Mahajan 761d3d3a3f Revert "Create telephony apex."
This reverts commit 8c7ca1bc05.

Reason for revert: b/148821604

Change-Id: I12defd7fe6aba01a381f8ad014475941e58d21d3
2020-02-06 12:02:52 -08:00
Automerger Merge Worker 961489e28b Merge "Add libfdtrack to base_system." am: da8d656ca0 am: 0c9c8f48f5 am: c0817cb228
Change-Id: I401b8f00addabd73c8f23a18467ab45eefaff948
2020-01-30 23:24:19 +00:00
Josh Gao da8d656ca0 Merge "Add libfdtrack to base_system." 2020-01-30 22:42:48 +00:00
David Su 16fd35c69a Merge "Move cacerts_wfa from system to Wifi APEX" 2020-01-28 18:54:28 +00:00
Hangyu Kuang f4ce00c694 Merge "MediaTranscoding: Disable the transcoding service for Android R." 2020-01-28 18:07:33 +00:00
hkuang cde5b32221 MediaTranscoding: Disable the transcoding service for Android R.
Bug: 145233472
Bug: 148116480
Test: Build and flash the phone. dumpsys show the service is not up.
Change-Id: I501c0860f07c42efaa30f237b4f9b2db720cb6b6
2020-01-27 21:19:19 +00:00
David Su 835751e995 Move cacerts_wfa from system to Wifi APEX
This allows the WFA certificates to be updated
when needed.

Bug: 145199837
Test: atest android.security.cts.CertificateTest FrameworksWifiTests
Change-Id: Ic190ecfd496d80e09b43860abdf0e21a11f514f5
2020-01-22 14:07:56 -08:00
Dario Freni d0ca631432 Move ExtServices in com.android.ext apex.
Bug: 147674123
Test: built on aosp_taimen and verified package is available from the
apex.

Change-Id: I59c070cf9b4ea6afef590888849de96ead84fde2
2020-01-17 13:38:44 +00:00
TreeHugger Robot e49a8dd2cc Merge "Add incident-helper-cmd build target" 2020-01-17 00:57:34 +00:00
Xiangyu/Malcolm Chen aca3495708 Merge "move telephony-framework from framework.jar" 2020-01-16 23:05:25 +00:00
TreeHugger Robot 1bf3835efd Merge "Allow adding framework and service java code into permission APEX." 2020-01-16 11:15:45 +00:00
Chen Xu b319487f06 move telephony-framework from framework.jar
add telephony-framework to boot class path

Bug: 140908357
Test: Build
Change-Id: I7ebec46ca8c3b02c76b7f9db51b5dbaea21eff6c
2020-01-15 11:30:47 -08:00
Hai Zhang 463a093e5c Allow adding framework and service java code into permission APEX.
Bug: 136503238
Test: presubmit
Change-Id: Idef2216deae08c6e82f8f166a39cf179461f2668
2020-01-15 09:37:58 -08:00
Mike Ma b42a2ccfac Add incident-helper-cmd build target
Add a Java binary util target incident-helper-cmd. See frameworks/base
addition (ag/10054587) for details.

Test: build
Bug: 146086597
Change-Id: Ifd202d8622e32fbd9644930cdae4d0546ce5d481
2020-01-13 15:19:46 -08: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
Anton Hansson ea711c2418 Update references to sdkext
The module is getting renamed to sdkextensions.

Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
Merged-In: I628fc555b82e9bd931c8f0cce2222b02efad6036
(cherry picked from commit 37e998ac31)
2020-01-08 11:42:03 +00:00
Anton Hansson 37e998ac31 Update references to sdkext
The module is getting renamed to sdkextensions.

Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
2020-01-08 09:51:31 +00:00
Chen Xu 42f2c761bf Merge "Revert submission 1182953-1576003954286-8455af5a" 2020-01-07 19:29:08 +00:00
Automerger Merge Worker 7f09658f7a Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" am: ee83e2d2c8 am: 44e7c20968 am: a93eac7c3f
Change-Id: I8e583396287c1ed667d6c2d4edbefaa035c93d75
2020-01-07 04:31:19 +00:00
Josh Gao 552b3f96b2 Add libfdtrack to base_system.
Bug: http://b/140703823
Test: manual
Change-Id: I6015946b85a4564b82eb57a0a0a9bb1e058b100a
2020-01-02 12:44:52 -08:00
Jiyong Park aeda4b267b Revert "Add boringssl_self_test to PRODUCT_PACKAGES"
This reverts commit ac4a35f017.

The change is not required because the conscrypt APEX now has
'boringssl_self_test' as its required modules.

Bug: 146549048
Test: m && device boots
2019-12-30 16:58:34 +09:00
Chen Xu 0d9f3cb2fb Merge "Revert submission 1182953-1576003954286-8455af5a" 2019-12-27 18:56:38 +00:00
Automerger Merge Worker a8eab50647 Merge "Do not build ld.config.txt" am: f1ef5591f1 am: 63e1d4d899 am: 1785dcfe52
Change-Id: Ie53f50ad3ae9d4d00c7bbb0d86a459b5e8d9db60
2019-12-27 00:37:17 +00:00
Kiyoung Kim f1ef5591f1 Merge "Do not build ld.config.txt" 2019-12-27 00:08:06 +00:00
Jeff Davidson 4c443e1d4e Revert submission 1182953-1576003954286-8455af5a
Reason for revert: Crashes telephony process when saving XML config from carrier apps (b/146727232)
Reverted Changes:
Ieaeec41f1: Whitelist telephony-common, ims-common.
I5588f7615: Add telephony-common, ims-common to telephony apex...
I81e922c0d: Add telephony-common, ims-common to telephony apex...

Change-Id: Ia64b73682fcc77db63e220867c66c4319c417582
Merged-In: Ia64b73682fcc77db63e220867c66c4319c417582
2019-12-26 23:27:33 +00:00
Jeff Davidson 9ae31126ea Revert submission 1182953-1576003954286-8455af5a
Reason for revert: Crashes telephony process when saving XML config from carrier apps (b/146727232)
Reverted Changes:
Ieaeec41f1: Whitelist telephony-common, ims-common.
I5588f7615: Add telephony-common, ims-common to telephony apex...
I81e922c0d: Add telephony-common, ims-common to telephony apex...

Change-Id: Ia64b73682fcc77db63e220867c66c4319c417582
2019-12-26 15:19:11 -08:00
Mark Chien b516ddd539 Merge "[Tether16] Build Tethering package" 2019-12-20 13:43:46 +00:00
Kiyoung Kim 63d6d96653 Do not build ld.config.txt
Remove ld.config.txt from build target as it will be replaced with
generated linker config.

Bug: 139638519
Test: m -j passed
Change-Id: Idc3742df74f27d71d7f65bd7f0f518b31ca7970c
2019-12-20 18:30:07 +09:00
Mark Chien 7719c44e01 Merge "[Tether16] Build Tethering package" 2019-12-20 05:04:07 +00:00
Automerger Merge Worker fd81065839 Merge changes from topic "art_apex_available" am: 3977cb4f75 am: ca423af91d am: 6ae6a3e422
Change-Id: I62d7bfab99a34a97f5680e8c7509c6b553b695ac
2019-12-20 02:29:06 +00:00
Jeff Sharkey fd70a07462 Move MediaStore.java inside APEX boundary.
Recent work has paved the way to get MediaStore.java building against
"core_platform", and this change is actually shifting MediaStore.java
inside the MediaProvider APEX boundary.

This involves defining a new "updatable-mediaprovider" library JAR
and ensuring that it's spliced into classpaths where needed to keep
everything building and working.

Note that the MediaProvider APK itself is still bundled, so we're
manually including the MediaStore.java when building that APK so that
we can continue referencing @hide symbols, but there's a STOPSHIP
comment to remove that once we get the APK building against
"system_current".

Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I48595fec9ccaf8d30ee4fa7209acb3484eba5272
2019-12-19 22:16:06 +00:00
Jiyong Park ac4a35f017 Add boringssl_self_test to PRODUCT_PACKAGES
boringssl_self_test is a required module of the conscrypt.jar.
Therefore, it was installed along with the conscrypt.jar. However,
conscrypt.jar is no longer available for the platform but only for the
conscrypt APEX. The problem here is that the conscrypt APEX having
conscrypt.jar doesn't carry its 'required' property. As a result,
boringssl_self_test is missing. This is b/146549048.

Until the bug is fixed, manually adding the test binary to
PRODUCT_PACKAGES to ensure that it is installed always.

Bug: 146549048
Test: m, device boots

Change-Id: I72dbc51c267f8d8683b70c07ae726c3a3eba0aea
2019-12-19 21:45:42 +09:00
markchien bf4be9b5b8 [Tether16] Build Tethering package
Create com.android.tethering apex to pack Tethering.apk and
framework-tethering.jar together.
For go devices, tethering would run in system server process by
InProcessTethering.apk

Bug: 144320246
Test: -build, boot
Change-Id: Id2d68117e99173682908168e99ee28670bd71871
Merged-In: Id2d68117e99173682908168e99ee28670bd71871
2019-12-18 13:05:30 +00:00
markchien 8c3ae62e12 [Tether16] Build Tethering package
Create com.android.tethering apex to pack Tethering.apk and
framework-tethering.jar together.
For go devices, tethering would run in system server process by
InProcessTethering.apk

Bug: 144320246
Test: -build, boot
Change-Id: Id2d68117e99173682908168e99ee28670bd71871
2019-12-18 20:49:46 +08:00
Songchun Fan ebf5d56a48 [incremental] add adb data loader into system image
Test: builds
Change-Id: I26a4cc19b5227b9ee027cd35c6aa33e8d94a40ec
2019-12-17 15:48:34 -08:00
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 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
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
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
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
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