Commit Graph

60471 Commits

Author SHA1 Message Date
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
8ea29213e2 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
(cherry picked from commit 9a3cad95a9)
Merged-In: I2fd3fea10ec6dd06f19c5be753d63ddff1ec01f7
2020-04-29 16:34:35 -07: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
80fc03dd92 Merge "remove emulator_vendor.mk from aosp_arm64.mk" am: 1d62e0dbeb am: 76fd911cd4
Change-Id: Ia912f2afb72235a80291a87805171deb07ac1014
2020-04-29 21:36:35 +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
83a26d8b4b Merge "remove goldfish vendor from aosp_arm64" am: 643724cbbc am: 16bc559c06
Change-Id: I3c0cf7280c84c42ad8aa688db8abcf5d940b4671
2020-04-29 15:11:35 +00: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
b50843c57f Merge changes I17671ca2,I4e6d9d93,Ia43cbbd0 am: 8bd7c4f3cc am: ccb927b9c4
Change-Id: Iffdd112cdabe367b74c9855d77e0760574e49eef
2020-04-29 02:13:58 +00: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
802de3295f Merge "Add elsk to the owner of scripts" am: 7cdc91f5ea am: 5cd6aacf6f
Change-Id: Ie827bc3ae437769f1b203d334a306eb4e045296c
2020-04-29 00:57:20 +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
4e75f0e0d0 Merge "releasetools: Use du -b" am: b5e650a119 am: a3140155a1
Change-Id: Idbb5bf079d1228e8db71d0f86ca20fbe23aab9f0
2020-04-28 17:29:39 +00: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
15acb06378 [automerger skipped] Merge "Clean up static_whitelist_patterns" into rvc-dev am: 208ad8b20d -s ours
am skip reason: Change-Id If2551283ebb6c516c029d1c04aebe25661bc6a1a with SHA-1 4472819166 is in history

Change-Id: I5de23bee97c6b4069c917041cf9b94143b6b86f8
2020-04-28 10:37:09 +00:00
TreeHugger Robot
0c235723d4 [automerger skipped] Merge "Extend static_whitelist_patterns" into rvc-dev am: effb247999 -s ours
am skip reason: Change-Id Ie110f20ff833229b23a777ff1decb32f84b9cef7 with SHA-1 ab50b8fa85 is in history

Change-Id: Id81a1b3400453f9af27728c3ed2c1d78a4b4f124
2020-04-28 10:36:57 +00:00
TreeHugger Robot
208ad8b20d Merge "Clean up static_whitelist_patterns" into rvc-dev 2020-04-28 10:32:58 +00:00
TreeHugger Robot
effb247999 Merge "Extend static_whitelist_patterns" into rvc-dev 2020-04-28 10:32:47 +00:00
Jeongik Cha
c23146acc2 [automerger skipped] Exempt RRO from the restriction on API level am: 62b9892916 -s ours
am skip reason: Change-Id I8dc2922af5eb5c87ccd97d1b8d080b3ed48cf9a6 with SHA-1 07a44f48dc is in history

Change-Id: I24de43eb1a39a847df241779ad13a34512708c76
2020-04-28 10:25:04 +00:00
Jeongik Cha
62b9892916 Exempt RRO from the restriction on API level
As auto generated RRO, an arbitrary RRO needs to be exempted as well.
It is okay because RRO packages can access only resource defined in
public.xml, when RRO packages want to refer other package's resource.

Bug: 152926556
Test: build RRO packages
Test: check if product/vendor app still can't use hidden APIs
Merged-In: I8dc2922af5eb5c87ccd97d1b8d080b3ed48cf9a6
Change-Id: Ief10b3535d4eb9f6607cac31cba1b4d3e081efd0
(cherry picked from commit 07a44f48dc)
2020-04-28 10:25:41 +09:00
Treehugger Robot
bd2f24c360 Merge "Exempt RRO from the restriction on API level" am: 02031027b7 am: 229963ee9f
Change-Id: Ie5d6ef674014c8f795f7e91be7b1fdcf5443c911
2020-04-27 23:08:19 +00:00
Tianjie Xu
8e40a68a44 Merge "releasetools: Add missing log format specifier" into rvc-dev am: 2ca6aa0f4e
Change-Id: I30640f1a631da8a1abd478cd788af70aae6fa2e1
2020-04-27 23:00:38 +00:00
Dan Shi
a2436c46d9 [automerger skipped] Merge "[VTS] copy ltp and kselftest to testcase folder" into rvc-dev am: 5d26aa2587 -s ours
am skip reason: Change-Id I405c227293085d3fd0603e9eba5ce276d7dc14d5 with SHA-1 7d1f8cec25 is in history

Change-Id: I15abdb1a58b8bc54e324772792db8130687cc7cd
2020-04-27 23:00:29 +00:00
Tianjie Xu
2ca6aa0f4e Merge "releasetools: Add missing log format specifier" into rvc-dev 2020-04-27 22:59:54 +00:00
Dan Shi
5d26aa2587 Merge "[VTS] copy ltp and kselftest to testcase folder" into rvc-dev 2020-04-27 22:58:50 +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
f26fe0fa38 [automerger skipped] Merge "enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64" into rvc-dev am: 2f40f1727c -s ours
am skip reason: Change-Id Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9 with SHA-1 e0a08fde91 is in history

Change-Id: Ic6f6bccb9b6fd24ca911292c11114144f78a0e62
2020-04-27 22:53:37 +00:00
Jeongik Cha
e1cee9a8df Clean up static_whitelist_patterns
$(HOST_OUT)/% is not necessary anymore.

Bug: 148993225
Test: m nothing
Change-Id: If2551283ebb6c516c029d1c04aebe25661bc6a1a
Merged-In: If2551283ebb6c516c029d1c04aebe25661bc6a1a
Merged-In: I7503c007c3e786b0cab26ea1422f0d4ba5a40662
2020-04-27 22:44:16 +00:00
TreeHugger Robot
2f40f1727c Merge "enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64" into rvc-dev 2020-04-27 22:43:45 +00:00
Treehugger Robot
02031027b7 Merge "Exempt RRO from the restriction on API level" 2020-04-27 22:42:01 +00:00
Colin Cross
17c7264f44 Don't install test suite files from uninstallable modules
Don't copy tests or test data to the test suite directories if the
module is marked LOCAL_UNINSTALLABLE_MODULE := true.

Fixes: 153758132
Test: m checkbuild
Change-Id: Ibdf18807a2ffe9bb352d74880a802ad55b57f154
Merged-In: Ibdf18807a2ffe9bb352d74880a802ad55b57f154
(cherry picked from commit fca369e4e3)
2020-04-27 14:57:49 -07:00
Colin Cross
dc7bc5d8bf Use sdk variant of Soong modules when LOCAL_SDK_VERSION is set
Soong now makes a variant of native modules that set sdk_version.
Use the new variant for native modules or apps with JNI that are
defined in Make and set LOCAL_SDK_VERSION.

Test: m checkbuild
Bug: 149591340
Change-Id: Ief378a007e43b0aea31fd5845410bbffec0ffae6
Merged-In: Ief378a007e43b0aea31fd5845410bbffec0ffae6
(cherry picked from commit b934116994)
2020-04-27 14:35:20 -07:00
Bill Peckham
e1eef03cb2 Merge "Allow recording ALL_DEPS by setting RECORD_ALL_DEPS" am: 0d5a6748a8 am: ded93f2a0e
Change-Id: I45380b349d1eba14e347de5a8f287ef2cdcd542a
2020-04-27 21:32:58 +00:00
Dan Shi
737711d9dc [VTS] copy ltp and kselftest to testcase folder
Bug: 154446791
Test: m -j vts_kernel_tests vts
Change-Id: I405c227293085d3fd0603e9eba5ce276d7dc14d5
Merged-In: I405c227293085d3fd0603e9eba5ce276d7dc14d5
2020-04-27 21:31:55 +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