Commit Graph

59066 Commits

Author SHA1 Message Date
Dan Willemsen
104cf995cc Merge "Master is now S" am: 19096a2479
Change-Id: I7b6a39f95f837e328f49a5526c440266d4be1ae3
2020-05-04 07:12:00 +00:00
Dan Willemsen
19096a2479 Merge "Master is now S" 2020-05-04 06:58:10 +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
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
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
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
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
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
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
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
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
Howard Chen
a566f5e4bf Fix type error
Bug: 155358317
Test: Compile
Change-Id: I32fdd6b20bd0a2b65fa02356dcd9a5819b921a66
2020-04-30 15:52:35 +08: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
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
Yifan Hong
63dcb01eb3 Merge "Adjust partition size checks for recovery resources" am: 50ea3f49c5
Change-Id: Ie29c6bcf468e32e9424b36a7240852856c616157
2020-04-29 23:47:25 +00:00
David Zeuthen
a9800b4db5 Merge "Update Identity Credential to V2 in VNDK list" 2020-04-29 23:41:41 +00:00
Yifan Hong
50ea3f49c5 Merge "Adjust partition size checks for recovery resources" 2020-04-29 23:34:06 +00:00
Evgenii Stepanov
701cbae7e5 [make] Zero and pattern initialization of heap memory.
Bug: 155227507
Test: build with and without MALLOC_PATTERN_FILL_CONTENTS, MALLOC_ZERO_CONTENTS
Change-Id: If6a7345411553c582ed713cfe661ce69e524de0f
2020-04-29 15:32:51 -07:00
Steven Laver
8e2086e6e3 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
2020-04-29 22:30:42 +00:00
Treehugger Robot
76fd911cd4 Merge "remove emulator_vendor.mk from aosp_arm64.mk" am: 1d62e0dbeb
Change-Id: I839281b57f51fa6ae6d194fb8cd87d57a5fb6fc9
2020-04-29 21:25:57 +00:00
Treehugger Robot
1d62e0dbeb Merge "remove emulator_vendor.mk from aosp_arm64.mk" 2020-04-29 21:10:34 +00:00
Steve Muckle
a780171da6 remove emulator_vendor.mk from aosp_arm64.mk
Continue the removal of emulator-specific bits from the generic
aosp_arm64 product.

Bug: 111538404
Change-Id: I97a8083bfdc3881ab70aaf73e9ace58435ddbc67
2020-04-29 11:25:07 -07:00
Treehugger Robot
16bc559c06 Merge "remove goldfish vendor from aosp_arm64" am: 643724cbbc
Change-Id: I98d25873caced831b46b6e57941a795f231bedc5
2020-04-29 15:03:49 +00:00
Treehugger Robot
643724cbbc Merge "remove goldfish vendor from aosp_arm64" 2020-04-29 14:52:31 +00:00
Steve Muckle
57ad4b2541 remove goldfish vendor from aosp_arm64
This is causing goldfish kernel modules to show up in the GKI.

Bug: 155230412
Change-Id: I78cc307a770a20235728e8baf0dc59828b627877
2020-04-28 22:06:45 -07:00
Treehugger Robot
ccb927b9c4 Merge changes I17671ca2,I4e6d9d93,Ia43cbbd0 am: 8bd7c4f3cc
Change-Id: I9255204c82593f44ddfd0a37381ae856e86df40a
2020-04-29 02:01:05 +00:00
Treehugger Robot
8bd7c4f3cc Merge changes I17671ca2,I4e6d9d93,Ia43cbbd0
* changes:
  Use .KATI_IMPLICIT_OUTPUTS in build/make/core/Makefile
  java_source_list_file is only created when full_classses_jar is set
  Remove empty rules for check_elf_files.timestamp
2020-04-29 01:44:54 +00:00
Treehugger Robot
5cd6aacf6f Merge "Add elsk to the owner of scripts" am: 7cdc91f5ea
Change-Id: I0977369108cfd7031bfef25244322bfebf9e41cb
2020-04-29 00:44:54 +00:00
Treehugger Robot
7cdc91f5ea Merge "Add elsk to the owner of scripts" 2020-04-29 00:32:31 +00:00
David Zeuthen
236601f86d Update Identity Credential to V2 in VNDK list
Bug: 154631410
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: I7d08d0aec7bab1f456237e46a2c3ae74b02020f9
2020-04-28 19:37:09 -04:00
Yifan Hong
9a3cad95a9 Adjust partition size checks for recovery resources
RECOVERY_FROM_BOOT_PATCH has been moved to vendor as per b/68319577. Hence,
the reserved size should be moved from system to vendor as well.

Bug: 68319577
Bug: 153581609
Test: m target-files-package for non-A/B devices

Change-Id: I2fd3fea10ec6dd06f19c5be753d63ddff1ec01f7
2020-04-28 16:27:24 -07:00
Dan Willemsen
f4cbafa724 Use .KATI_IMPLICIT_OUTPUTS in build/make/core/Makefile
There were still two places where we weren't using it. There may be
more, but these are the ones that come up with aosp_cf_x86_phone.

Test: m out/target/product/vsoc_x86/root/default.prop
Test: m out/target/product/vsoc_x86/obj/NOTICE_VENDOR.txt
Change-Id: I17671ca2ed60332aed2bf76aa00e42a92661b58a
2020-04-28 15:57:32 -07:00
Dan Willemsen
e1cbfc717b java_source_list_file is only created when full_classses_jar is set
So avoid creating an unused phony target when we aren't compiling
anything.

Test: treehugger
Change-Id: I4e6d9d93ee5a7d11db6b4a6c7da1ba947d96e575
2020-04-28 15:55:49 -07:00
Dan Willemsen
17315c2eda Remove empty rules for check_elf_files.timestamp
If we don't have any new dependencies, or we never set up the
check_elf_files.timestamp rule, don't create an empty one now.

There were >7000 of these unused and empty rules in my AOSP
aosp_cf_x86_phone build.

This was initially brought to my attention by the new checks in
https://github.com/google/kati/pull/189

Test: diff out/build-aosp_cf_x86_phone.ninja, only removed phony rules
Change-Id: Ia43cbbd04df4a01d2182b14e3ccbe5d5ecbcabad
2020-04-28 14:56:06 -07:00
Tianjie
ded2ae16a5 Add elsk to the owner of scripts
Test: build
Change-Id: Ia722605596c354d4e295a6d18a2696fdf90c582c
2020-04-28 14:56:01 -07:00
Elliott Hughes
a3140155a1 Merge "releasetools: Use du -b" am: b5e650a119
Change-Id: I0248435b307fae507ee905a271580f5a3728c53d
2020-04-28 17:16:27 +00:00
Elliott Hughes
b5e650a119 Merge "releasetools: Use du -b" 2020-04-28 16:55:49 +00:00
Treehugger Robot
229963ee9f Merge "Exempt RRO from the restriction on API level" am: 02031027b7
Change-Id: I17e5508f5ed6f1bf36871a88f0e10a929330d7c6
2020-04-27 22:53:39 +00:00
Treehugger Robot
02031027b7 Merge "Exempt RRO from the restriction on API level" 2020-04-27 22:42:01 +00:00
Bill Peckham
ded93f2a0e Merge "Allow recording ALL_DEPS by setting RECORD_ALL_DEPS" am: 0d5a6748a8
Change-Id: I5f48eded795ae8fae5b135b55cefe4a7304aec6f
2020-04-27 21:16:39 +00:00
Bill Peckham
0d5a6748a8 Merge "Allow recording ALL_DEPS by setting RECORD_ALL_DEPS" 2020-04-27 20:59:48 +00:00
Dan Shi
fcaa097370 Merge "[VTS] copy ltp and kselftest to testcase folder" am: 6c04458129
Change-Id: I1eaeabc4772aaa2b4cdc678259a3c2b5ff814669
2020-04-27 18:39:56 +00:00
Dan Shi
6c04458129 Merge "[VTS] copy ltp and kselftest to testcase folder" 2020-04-27 18:28:17 +00:00