Commit graph

464 commits

Author SHA1 Message Date
Dario Freni
581be147c7 Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 21:49:57 +00:00
Josh Gao
0336f08679 Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f am: 821ecd2b56
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454

Change-Id: I0838c25e56d9d71186162c5d3518a2a857bfdd96
2020-06-08 21:31:28 +00:00
Josh Gao
67e0295833 Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
2020-06-01 18:57:25 -07:00
Luke Huang
ab2a1584a0 Revert "DO NOT MERGE: Delete com.android.cronet from base_system. am: 8640960329"
This reverts commit 14199b7a93.

Reason for revert:
Rollback the stuff which has been removed
due to "remove cronet for R" to keep the intermediate branches
synced between {aosp, internal} master

Bug: 156368607
Change-Id: I95bcb80ccd330ce7f40a20912ab61c1ff9d15441
Merged-In: Ice9b733b22d45d6d6eaf8e3f3ed95b3ac50eefbb
2020-05-15 11:27:37 +00:00
Pete Bentley
933077d15c Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." am: 60b649f32f am: a3be9bfa10
Change-Id: Ic7df3a7d52ff9a334ddbcd0ff788ad12fb265124
2020-05-07 17:50:03 +00:00
Pete Bentley
f5a05c4a4b Add boringssl_self_test to base PRODUCT_PACKAGES.
When building from source this gets installed as a requirement
from Conscrypt, but needs to be present when Conscrypt is
shipped as a pre-built too.

I think the correct solution here is actually to make libcrypto
rather than Conscrypt require boringssl_self_test but Soong
considers that a circular dependency.

Bug: 155520949
Test: m installclean && m

Change-Id: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
2020-05-07 14:35:54 +01:00
vichang
4f61cf6540 Merge ""Move core-icu4j into i18n APEX" Attempt 2" am: 5520858b97 am: 843604223e
Change-Id: Ifaa3f0abd3962016d44e3ba27e5bbd8aedf2bf14
2020-05-07 10:12:05 +00:00
Victor Chang
ce051d16a4 "Move core-icu4j into i18n APEX" Attempt 2
This reverts commit b72f1e1a8a.
Reland https://r.android.com/1284676

Bug: 138994281
Test: core-icu4j observed in i18n APEX
Change-Id: If773316261fb1f5fb37b56c5233efcc4a434354a
2020-05-05 19:16:30 +01:00
vichang
e57e6fe7a8 Merge "Revert "Move core-icu4j into i18n APEX"" am: a2d0a60b79 am: 0f1deb3a8b
Change-Id: I1d247bd4c515a87a5f944eec8d01cd96f41409a2
2020-05-05 12:16:16 +00:00
vichang
b72f1e1a8a Revert "Move core-icu4j into i18n APEX"
Revert "Move libpac into i18n APEX"

Revert "Add shared library into i18n APEX and add the required s..."

Revert "Make com_android_i18n namespace visible"

Revert submission 1299494-i18nApex

Reason for revert: Breaking aosp_x86-eng on aosp-master
Reverted Changes:
I30fc3735b:Move ICU from ART APEX to i18n APEX
Icb7e98b5c:Calling @IntraCoreApi from core-icu4j should not c...
Ic7de63fe3:Move core-icu4j into I18n APEX
I65b97bdba:Make com_android_i18n namespace visible
Ia4c83bc15:Move v8 and libpac into i18n APEX
I10e6d4948:Move core-icu4j into i18n APEX
I8d989cad7:Move ICU from ART APEX into i18n APEX
I72216ca12:Move ICU into i18n APEX
Ief9dace85:Add shared library into i18n APEX and add the requ...
I7d97a10ba:Move libpac into i18n APEX
I90fff9c55:Move ICU from ART APEX into i18n APEX

Change-Id: I12a7d609d43620edaf2c5f12711eb3ca3a570d79
2020-05-05 11:11:30 +00:00
vichang
52c7a1f35f Merge "Move core-icu4j into i18n APEX" am: 879d654515 am: 285ae1b0dd
Change-Id: I19b4641d3232f99ad9784e0f7889ca51b66d5491
2020-05-05 09:33:15 +00:00
Victor Chang
a27b703c49 Move core-icu4j into i18n APEX
Bug: 138994281
Test: core-icu4j observed in i18n APEX
Change-Id: I10e6d49485305f84b31d62f858c3c032aba4d3df
2020-05-04 12:46:03 +01:00
Treehugger Robot
a1ae3f60e1 Merge "Add fsverity release cert" am: 2162d25b8f am: db1f79e6d6
Change-Id: I135efa3133876d82b5c983e62f48dee1ef7641b5
2020-04-18 03:01:23 +00:00
Treehugger Robot
2162d25b8f Merge "Add fsverity release cert" 2020-04-18 02:17:20 +00:00
Victor Hsieh
d24991a26e Add fsverity release cert
The release cert helps verifying CTS in a release build.

Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
2020-04-17 10:27:42 -07:00
Treehugger Robot
16a671ecbf Merge "remove dependency on ip6tables" am: 1bc7f6436b am: e3b2a9b081
Change-Id: I1b51a6f34985e24e82b6103b0601fb675cacbfeb
2020-04-16 10:45:16 +00:00
Maciej Żenczykowski
4cdfacae10 remove dependency on ip6tables
which is now (as of aosp master external/iptables @ HEAD, ie.
  https://android-review.googlesource.com/c/platform/external/iptables/+/1284244
) simply a symbolic link to iptables binary

This should fix:
  > FAILED:
  > build/make/core/main.mk:1132: warning:  build/make/target/product/generic.mk includes non-existent modules in PRODUCT_PACKAGES
  > Offending entries:
  > ip6tables
  > build/make/core/main.mk:1132: error: Build failed.

Test: No, but building, and treehugging
Bug: 154186169
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I94709a7450d0c41a64951c592b54de4b2956eae9
2020-04-16 01:11:10 -07:00
Peter Collingbourne
d78f96ee20 Merge "Remove crash_dump from PRODUCT_PACKAGES." 2020-03-30 19:03:42 +00:00
TreeHugger Robot
7aafe1f06c Merge "Remove crash_dump from PRODUCT_PACKAGES." into rvc-dev-plus-aosp 2020-03-24 17:25:23 +00:00
Ulyana Trafimovich
0c693b0847 Merge "Get rid of obsolete Make variable TARGET_CORE_JARS." am: f488574666 am: de8daa8f9b
Change-Id: If99055f479bd38bd5666941d837a190dd4ce81bc
2020-03-24 14:59:59 +00:00
Malcolm Chen
649a44c063 Move telephony framework sources as part of non-update framework. am: 129b8f292b
Change-Id: Id549ffd4aa70043be068f7d5065c9c7fd2e6dbc0
2020-03-23 18:59:34 +00:00
Ulya Trafimovich
c46e0673d0 Get rid of obsolete Make variable TARGET_CORE_JARS.
Test: aosp_walleye-userdebug boots.
Change-Id: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
2020-03-23 15:35:00 +00:00
Malcolm Chen
129b8f292b Move telephony framework sources as part of non-update framework.
This allows us to hide Telehony APIs and framework can still use
them.

Bug: 151667108
Test: build
Change-Id: I85626d8a427624264747eae56a6d7b5b4e537045
Merged-In: I85626d8a427624264747eae56a6d7b5b4e537045
2020-03-20 21:09:37 +00:00
Peter Collingbourne
40d6508b5c Remove crash_dump from PRODUCT_PACKAGES.
Was causing build failures now that crash_dump has been moved to
an apex.

Bug: 151857642
Change-Id: I86ae8a57c68c8928ac954d594f3bef0fea84c56e
Merged-In: I86ae8a57c68c8928ac954d594f3bef0fea84c56e
2020-03-19 09:46:02 -07:00
Peter Collingbourne
c450827545 Remove crash_dump from PRODUCT_PACKAGES.
Was causing build failures now that crash_dump has been moved to
an apex.

Bug: 151857642
Change-Id: I86ae8a57c68c8928ac954d594f3bef0fea84c56e
Merged-In: I86ae8a57c68c8928ac954d594f3bef0fea84c56e
2020-03-19 09:43:03 -07:00
Automerger Merge Worker
8890496a9a Merge "Add ANGLE.apk to the base system." am: 474c9c6eba am: e9493bc263
Change-Id: I7923ae30b2ada6bed0dc70a7ef86757836e3a6ab
2020-03-16 19:07:24 +00:00
Geoff Lang
6ee4bed4ad Add ANGLE.apk to the base system.
ANGLE has been packaged as a prebuilt library in internal master.  This
CL transitions the library to being built from source in AOSP so it can
be tested and included as a mainline module.

Test: ANGLE is in the developer options/EGL platform can load ANGLE
Bug: 142239747

Change-Id: Ie06dcfccce022ed608c18362e246f6f2a3c6fb1a
2020-03-16 16:57:42 +00:00
Automerger Merge Worker
27e83a9f09 DO NOT MERGE: Remove AppSearch from Android R. am: 75c5773187
Change-Id: I755e30227c694ead4019b643873be32b41996dd7
2020-03-06 09:37:42 +00:00
TreeHugger Robot
ba17b04741 Merge "DO NOT MERGE: Remove AppSearch from Android R." into rvc-dev 2020-03-05 21:08:59 +00:00
Automerger Merge Worker
14199b7a93 DO NOT MERGE: Delete com.android.cronet from base_system. am: 8640960329
Change-Id: Ia8a44fa92c15e9ab6624da69f86ec6baeb888bdf
2020-03-04 04:10:28 +00:00
Luke Huang
9fb9f8f870 Merge "DO NOT MERGE: Delete com.android.cronet from base_system." into rvc-dev 2020-03-04 03:45:40 +00:00
Luke Huang
8640960329 DO NOT MERGE: Delete com.android.cronet from base_system.
Cronet module won't be in Android R.

Bug: 148046438
Test: Build
Change-Id: Ib20788edf9f94dcc03e0e5ff4c0ecb3c7042aee5
2020-03-03 11:31:24 +00:00
Songchun Fan
d20531a537 remove NativeAdbDataLoader from system image
Fixes build

Test: builds
BUG: 150476291
Change-Id: I5b5d6588fda4664bac9adce35adac92696d1d7f6
(cherry picked from commit 65c9699b70)
2020-02-28 20:56:12 +00:00
Amit Mahajan
71b4252b20 Merge "Revert "Create telephony apex."" 2020-02-26 18:01:30 +00:00
Alexander Dorokhine
75c5773187 DO NOT MERGE: Remove AppSearch from Android R.
Test: presubmit
Bug: 150249538
Change-Id: I98774c8e8686b6d8fcb058ab0f1d5d4ecfa314cb
2020-02-25 17:24:36 -08:00
Amit Mahajan
ce7c9a70bd Revert "Create telephony apex."
This reverts commit 8c7ca1bc05.

Reason for revert: b/148821604

Merged-in: I12defd7fe6aba01a381f8ad014475941e58d21d3
Change-Id: I12defd7fe6aba01a381f8ad014475941e58d21d3
2020-02-26 00:46:14 +00:00
Roshan Pius
af116f56bd base_system.mk: Package wifi.rc separately into the build
These contain a bunch of action triggers for setting some kernel flags
for wifi driver logging. Apex'es don't support .rc with action triggers,
so package it separately into the build.

Bug: 149909892
Test: Device boots up and connects to wifi networks.
Test: Manually verified that the .rc file is run on bootup.
Change-Id: I05f055ec68d47a1d158135f5454389a786884f9b
2020-02-20 07:51:02 -08:00
Howard Ro
ac79359a25 Merge "Remove statsd binary from base_system.mk" 2020-02-20 08:00:53 +00:00
evitayan
781145ee4c 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
Merged-In: I3126605613202b1e981b4e7f594acb6edbb7d635
2020-02-20 05:51:12 +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
36101543e9 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: aosp_walleye-userdebug boots

Exempt-From-Owner-Approval: cherry-pick.
Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
Merged-In: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
(cherry picked from commit 19ed3a0db7)
2020-02-13 13:36:11 +00: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