Commit Graph

60471 Commits

Author SHA1 Message Date
Dan Willemsen
b7867433b3 Merge "Mark rvc-dev-plus-aosp as S" into rvc-dev-plus-aosp 2020-05-04 01:04:36 +00:00
Jiyong Park
8b9e63f61f [automerger skipped] Merge "Incorrect file names in apkcerts.txt for Make modules" am: cac826f49a am: 39c510a1da -s ours
am skip reason: Change-Id I6f14bbb5678255bef2c1f2397f59ede6c2b5df18 with SHA-1 db64e3d528 is in history

Change-Id: Ic32666ce7f2f91035b519abaf614d1fd61a66f6d
2020-05-04 00:34:59 +00:00
Jiyong Park
39c510a1da Merge "Incorrect file names in apkcerts.txt for Make modules" am: cac826f49a
Change-Id: Iebcf462a7d477c6ab3bdd0efefb513bc213d5116
2020-05-04 00:22:57 +00:00
Jiyong Park
cac826f49a Merge "Incorrect file names in apkcerts.txt for Make modules" 2020-05-04 00:05:02 +00:00
Svet Ganov
7bd8302bd8 [automerger skipped] Updating platform SDK version for R am: c3b0b52e58 -s ours
am skip reason: Change-Id Ib286bb7499e4857842633003b8ef98b8d0fb3e77 with SHA-1 1014053582 is in history

Change-Id: Ie2f4e18d05955d4d80f10a0697e3b6f7627f2da0
2020-05-03 23:14:39 +00:00
Dan Willemsen
17ed83155e Mark rvc-dev-plus-aosp as S
It's an aosp-master based branch.

Bug: 150754986
Test: treehugger
Change-Id: I919a1075a7edacd36fbf86b024b9560e6dba2c68
Merged-In: Ibf48899f5bc347b3db530dcab519c3b65a7d443d
2020-05-03 15:42:22 -07:00
Jeff Sharkey
7a3c61259e Split MediaProvider into its own target.
As we move towards becoming a Mainline module, it's important that
we catch as many bugs as possible during initial code review, and
Error Prone is designed to do exactly that.

Instead of lumping ourselves into the generic "packages" grouping,
this change adds a specific package for this Mainline module.

Bug: 142561358
Test: ./build/soong/soong_ui.bash --make-mode MediaProviderLegacy com.google.android.mediaprovider MediaProviderTests RUN_ERROR_PRONE=true
Change-Id: I62102febe39225a54c77d9ad463c350b3df9cafa
2020-05-03 11:36:17 -06:00
Svet Ganov
c3b0b52e58 Updating platform SDK version for R
* Update SDK level and make REL
  * Update GSI lib list

Test: build + boot

bug:150281259

Change-Id: Ib286bb7499e4857842633003b8ef98b8d0fb3e77
Merged-In: Ib286bb7499e4857842633003b8ef98b8d0fb3e77
2020-05-03 09:40:27 -07:00
Svetoslav Ganov
1f7ac2d5be Merge "Updating platform SDK version for R" into rvc-dev-plus-aosp 2020-05-03 08:13:34 +00:00
Jiyong Park
679c2cb2f8 Incorrect file names in apkcerts.txt for Make modules am: db64e3d528
Change-Id: I47bec002e307c73126b041f1895f36ed36d90b29
2020-05-03 06:23:15 +00:00
Jiyong Park
9314d8c77c Incorrect file names in apkcerts.txt for Make modules
This change fixes a regression that was caused by I56bc55e2231eb946617a9d6f97d55c9b61f3bff7
that file names for Make modules are ".apk" in apkcerts.txt.

This was because PACKAGES.$(LOCAL_MODULE).STEM was only set for the
modules from Soong. It is now set for Make modules too.

Bug: 155440232
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m apkcerts-list
and check the generated apkcerts txt file to see that it doesn't have an
entry where file name is ".apk"

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: I6f14bbb5678255bef2c1f2397f59ede6c2b5df18
(cherry picked from commit db64e3d528)
Change-Id: I6f14bbb5678255bef2c1f2397f59ede6c2b5df18
2020-05-03 13:43:08 +09:00
Jiyong Park
db64e3d528 Incorrect file names in apkcerts.txt for Make modules
This change fixes a regression that was caused by I56bc55e2231eb946617a9d6f97d55c9b61f3bff7
that file names for Make modules are ".apk" in apkcerts.txt.

This was because PACKAGES.$(LOCAL_MODULE).STEM was only set for the
modules from Soong. It is now set for Make modules too.

Bug: 155440232
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m apkcerts-list
and check the generated apkcerts txt file to see that it doesn't have an
entry where file name is ".apk"

Change-Id: I6f14bbb5678255bef2c1f2397f59ede6c2b5df18
2020-05-03 10:57:01 +09:00
Svet Ganov
1014053582 Updating platform SDK version for R
* Update SDK level and make REL
  * Update GSI lib list

Test: build + boot

bug:150281259

Exempt-From-Owner-Approval: merge conflict resolution

Change-Id: Ib286bb7499e4857842633003b8ef98b8d0fb3e77
Merged-In: Ib286bb7499e4857842633003b8ef98b8d0fb3e77
2020-05-02 17:50:12 -07:00
Jiyong Park
838b580b41 [automerger skipped] Merge "Stem names are used in apkcerts.txt" am: 6b872d794b am: 8e679ce064 -s ours
am skip reason: Change-Id I56bc55e2231eb946617a9d6f97d55c9b61f3bff7 with SHA-1 f58fd52b14 is in history

Change-Id: I520c7ee5c00882d031b0673e1c905701ddec6db5
2020-05-02 11:06:55 +00:00
Jiyong Park
8e679ce064 Merge "Stem names are used in apkcerts.txt" am: 6b872d794b
Change-Id: I84df4883002c5cd733220d6d42fbd6ea6acb548d
2020-05-02 10:51:45 +00:00
Jiyong Park
6b872d794b Merge "Stem names are used in apkcerts.txt" 2020-05-02 10:43:14 +00:00
Jiyong Park
7b96c59751 Stem names are used in apkcerts.txt
_apkcerts_write_line has assumed that the stem name of a package is the
same as the module of it. That assumption however breaks for
APK-in-APEX, in which case the stem name is Foo while the module name is
Foo.com.android.bar (where com.android.bar is the name of the APEX where
the APK is in).

Fixing the issue by recording the stem name and use it.

Bug: 155440232
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m apkcerts-list
and check the generat4ed apkcerts txt file to see that it has
Tethering.apk instead of Tethering.com.android.tethering.apex

Exempt-From-Owner-Approval: cherry-pick from AOSP

Merged-In: I56bc55e2231eb946617a9d6f97d55c9b61f3bff7
(cherry picked from commit f58fd52b14)
Change-Id: I56bc55e2231eb946617a9d6f97d55c9b61f3bff7
2020-05-02 18:29:24 +09:00
Colin Cross
41b588a75c [automerger skipped] Merge changes from topic "sdk_version_variant" into rvc-dev am: a4ce9b369e -s ours
am skip reason: Change-Id Ibdf18807a2ffe9bb352d74880a802ad55b57f154 with SHA-1 fca369e4e3 is in history

Change-Id: I1627ee8940e6bbee63597788aa2c0b02a1ee8d37
2020-05-02 01:57:15 +00:00
Colin Cross
a4ce9b369e Merge changes from topic "sdk_version_variant" into rvc-dev
* changes:
  Don't install test suite files from uninstallable modules
  Use sdk variant of Soong modules when LOCAL_SDK_VERSION is set
2020-05-02 01:41:17 +00:00
Dan Willemsen
e6bd1d2060 Remove TARGET_PROJECT[_SYSTEM]_INCLUDES
Everything should be getting device specific kernel headers from the
device_kernel_headers header library these days.

This does change the behavior of system libraries on devices using the
VNDK -- they no longer get device-specific kernel headers by default, as
we generally expect the system image to be device-independent. The few
libraries that may still need this can use:

 LOCAL_HEADER_LIBRARIES += device_kernel_headers

Test: treehugger
Change-Id: I90ccb921d58b8d27dd0118a974202696e0af745f
2020-05-01 17:43:45 -07:00
Evgenii Stepanov
f17ccf2d47 Merge "[make] Zero and pattern initialization of heap memory." am: 7332a36b91 am: 477be2f0a9
Change-Id: If9b0f052bf14f328e0dfc58b0e45b7253a6128d6
2020-05-02 00:27:30 +00:00
Evgenii Stepanov
477be2f0a9 Merge "[make] Zero and pattern initialization of heap memory." am: 7332a36b91
Change-Id: I415f8ef809202abec3f75f6ef29583abb8f74709
2020-05-02 00:09:48 +00:00
Evgenii Stepanov
7332a36b91 Merge "[make] Zero and pattern initialization of heap memory." 2020-05-01 23:58:48 +00:00
Bo Hu
fbe3709e27 [automerger skipped] emulator: enable vendor boot image am: 4d6f4f6c9e -s ours
am skip reason: Change-Id I258b69bd0cdc4fb0a99b1a04567051e8d32c389a with SHA-1 8fd437c80a is in history

Change-Id: I8fe3c4dd689d030e86c48528ababee9ab6ef4af4
2020-05-01 23:42:07 +00:00
Yifan Hong
975e2bef86 Fix check target files vintf test.
check_vintf now checks deprecation as well, which
requires matrix fragments to exist. Update tests to
reflect this.

The test also uses legacy vendor manifest path, which makes
it not combined with the ODM manifests, causing sku_compat
test to fail. Fix it by using the new vendor manifest path
(which libvintf correctly combines it with the ODM manifests.)

Fixes: 155131894
Test: python -m unittest test_check_target_files_vintf
Change-Id: Ib660f8796efc3465d9513688695dac29c63a7514
2020-05-01 16:34:22 -07:00
Bo Hu
4d6f4f6c9e emulator: enable vendor boot image
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage

Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
Merged-In: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
2020-05-01 20:01:40 +00:00
Jiyong Park
01a29d7f5e Stem names are used in apkcerts.txt am: f58fd52b14
Change-Id: I218ba6d6ce5859ce0c7927189d1301d7b84f81d2
2020-05-01 18:08:44 +00:00
Baligh Uddin
d9fcafd612 Allow passing in codename_to_api_level_map to sign_apex.
BUG: 154517483
Change-Id: I93a90ae066b0e9eeb1b2ff26d9cb9b07a11fe68c
Merged-In: I93a90ae066b0e9eeb1b2ff26d9cb9b07a11fe68c
2020-05-01 13:56:04 +00:00
Jiyong Park
f58fd52b14 Stem names are used in apkcerts.txt
_apkcerts_write_line has assumed that the stem name of a package is the
same as the module of it. That assumption however breaks for
APK-in-APEX, in which case the stem name is Foo while the module name is
Foo.com.android.bar (where com.android.bar is the name of the APEX where
the APK is in).

Fixing the issue by recording the stem name and use it.

Bug: 155440232
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m apkcerts-list
and check the generat4ed apkcerts txt file to see that it has
Tethering.apk instead of Tethering.com.android.tethering.apex

Change-Id: I56bc55e2231eb946617a9d6f97d55c9b61f3bff7
2020-05-01 13:13:13 +00:00
TreeHugger Robot
a6d67ee37b Merge "Move PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS to each devices(aosp targets)" into rvc-dev am: 345baa7c98
Change-Id: Iffddab632b3ff45e5887a83012b902bc250d32fb
2020-05-01 12:22:31 +00:00
TreeHugger Robot
345baa7c98 Merge "Move PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS to each devices(aosp targets)" into rvc-dev 2020-05-01 12:03:26 +00:00
Yifan Hong
0dd1097260 [automerger skipped] Merge "Adjust partition size checks for recovery resources" into rvc-dev am: f96c7c3fbe -s ours
am skip reason: Change-Id I2fd3fea10ec6dd06f19c5be753d63ddff1ec01f7 with SHA-1 9a3cad95a9 is in history

Change-Id: Ifc034c7fd451a76fc10bf8ae143724ec50d2a24a
2020-04-30 19:52:33 +00:00
Yifan Hong
f96c7c3fbe Merge "Adjust partition size checks for recovery resources" into rvc-dev 2020-04-30 19:40:38 +00:00
Steven Laver
e4422538d5 [automerger skipped] releasetools: correct allowed property sources for incremental OTAs am: dd33d75d39 -s ours
am skip reason: Change-Id Ic0b0a112656533eca78dee31517deff7e3c8d7cc with SHA-1 8e2086e6e3 is in history

Change-Id: If329480a63f96c667aa07883eba7c9e84fb8da67
2020-04-30 19:20:53 +00:00
Steven Laver
dd33d75d39 releasetools: correct allowed property sources for incremental OTAs
When loading build info from a previous version of Android, the set of
allowed property sources should match those available in that version.
In this particular case, the product_services partition was a valid
property source in Android 10.

Bug: 155053195
Test: ran unit tests from test_common.py
Test: generated an incremental OTA which previously failed
Change-Id: Ic0b0a112656533eca78dee31517deff7e3c8d7cc
Merged-In: Ic0b0a112656533eca78dee31517deff7e3c8d7cc
2020-04-30 10:54:48 -07:00
Steven Laver
96bebd05e0 Merge "releasetools: correct allowed property sources for incremental OTAs" am: 1ae5abc46e am: 73345e3395
Change-Id: I53d6c3ef4bd81ffb224d7ae5a6d0d6cc5ad526dc
2020-04-30 16:33:11 +00:00
Steven Laver
73345e3395 Merge "releasetools: correct allowed property sources for incremental OTAs" am: 1ae5abc46e
Change-Id: I03b88d9e5164fc4c62937f4f73efd16dd80f2e2c
2020-04-30 16:17:35 +00:00
Ulya Trafimovich
4c69c2ff72 Use two-column format for PRODUCT_BOOT_JARS components.
The first component is the apex name, or a special name "platform"
if the boot jar is a platform jar rather than a part of some apex.
This is a prerequisite change for moving core-icu4j to a separate
com.android.i18n apex.

Old one-column format is still supported, but all unqualified
components of PRODUCT_BOOT_JARS get "platform:" prepended to them
after reading the product makefiles.

Test: aosp_walleye-userdebug boots
Bug: 138994281
Change-Id: I0f79c7d10477880ca65354251a5d1ca0b7ce79ab
2020-04-30 17:16:29 +01:00
Steven Laver
1ae5abc46e Merge "releasetools: correct allowed property sources for incremental OTAs" 2020-04-30 16:03:31 +00:00
Anton Hansson
634212ce05 Merge "Revert "remove emulator_vendor.mk from aosp_arm64.mk"" am: d4e85a97e7 am: 5b21b79d82
Change-Id: I816129425e72fdd6a6319640991c718fb61ace13
2020-04-30 11:37:03 +00:00
Anton Hansson
5b21b79d82 Merge "Revert "remove emulator_vendor.mk from aosp_arm64.mk"" am: d4e85a97e7
Change-Id: I1576436f768348dffe64b4864fea69e590aa8ac7
2020-04-30 11:26:13 +00:00
Anton Hansson
d4e85a97e7 Merge "Revert "remove emulator_vendor.mk from aosp_arm64.mk"" 2020-04-30 10:58:43 +00:00
Jeongik Cha
c8ba8c1b48 Move PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS to each devices(aosp targets)
Settings in aosp targets don't need to rely on static overlay.

Bug: 150820813
Bug: 152926806
Test: m
Change-Id: Ie41f881f1c48201db434605a03dbeb48149543b2
2020-04-30 06:34:41 +00:00
Steve Muckle
41a6e3b02f Revert "remove emulator_vendor.mk from aosp_arm64.mk"
This reverts commit a780171da6.

Reason for revert: This appears to be causing intermittent build
failures. Vendor is now small enough that sometimes it does not
get enough inodes allocated for the files that must be copied to it.

Bug: 155340761
Change-Id: I453101a65d4c8b5824467d0bb7cc8c3a03ca2740
2020-04-30 05:55:58 +00:00
Colin Cross
895874689a [automerger skipped] Merge "Touch same_vndk_variant.timestamp" into rvc-dev am: e414a3fd3d -s ours
am skip reason: Change-Id Ieb1b47f8a6cc406139c326a527041239fdb627d0 with SHA-1 c989ff3d75 is in history

Change-Id: I0983346f0f14947cb22c2ca51beefed07415907f
2020-04-30 04:20:36 +00:00
Colin Cross
e414a3fd3d Merge "Touch same_vndk_variant.timestamp" into rvc-dev 2020-04-30 04:02:35 +00:00
Colin Cross
8795394f25 Touch same_vndk_variant.timestamp
Fix uneccessary rebuilds on incremental builds by touching the
same_vndk_variant.timestamp output file.

Test: m && m
Bug: 0
Change-Id: Ieb1b47f8a6cc406139c326a527041239fdb627d0
Merged-In: Ieb1b47f8a6cc406139c326a527041239fdb627d0
(cherry picked from commit c989ff3d75)
2020-04-30 04:02:20 +00:00
David Zeuthen
2a0ebd6f8a Merge "Update Identity Credential to V2 in VNDK list" am: a9800b4db5 am: 4eea7b0ef7
Change-Id: I19a8b7daf3172a87ef6f53bcc38722def0f91e74
2020-04-30 00:00:23 +00:00
Yifan Hong
d2b683e19f Merge "Adjust partition size checks for recovery resources" am: 50ea3f49c5 am: 63dcb01eb3
Change-Id: I856a0589d2fa5529e00e9d7fb188e508a8bbb1c3
2020-04-30 00:00:14 +00:00
David Zeuthen
4eea7b0ef7 Merge "Update Identity Credential to V2 in VNDK list" am: a9800b4db5
Change-Id: I4a054f167c9283e8a3975605524533cb688469e3
2020-04-29 23:47:43 +00:00