Commit Graph

22463 Commits

Author SHA1 Message Date
Jooyung Han
a8625c5393 Merge "apex: Make android_library support APEX variants" into rvc-dev-plus-aosp 2020-05-21 06:17:29 +00:00
Jooyung Han
040ff3d5c1 apex: Make android_library support APEX variants
The android_library module type can be used within an android_app that
can itself be added to an apex but android_library does not call
android.InitApexModule(module) and so it does not support apex variants
and so is treated as if it cannot be part of an APEX even though it
actually is.

Now, android_library supports AEPX variants.

Due to this change, the whilelist for apex_available got bigger.

Exempt-From-Owner-Approval: approved in rvc-dev

Bug: 156978407
Test: m
Merged-In: I3a21d653fe9c4159e3a89791fe1a8597865eeae6
Change-Id: I3a21d653fe9c4159e3a89791fe1a8597865eeae6
2020-05-21 06:16:59 +00:00
Jooyung Han
ff4e78e876 Merge "apex: install hwasan lib if depended on libc" am: 166349beeb am: f7879cbfbd
Change-Id: I8c0ae40db7543d96f1511ded42cbd6b23b141796
2020-05-21 01:22:50 +00:00
Jooyung Han
f7879cbfbd Merge "apex: install hwasan lib if depended on libc" am: 166349beeb
Change-Id: I5f87d8da976e47bf8cdc59613308942b492c23df
2020-05-21 01:11:21 +00:00
Jooyung Han
166349beeb Merge "apex: install hwasan lib if depended on libc" 2020-05-21 00:48:26 +00:00
Sasha Smundak
7bd5457735 [automerger skipped] Handle universal APK case in extract_apks am: 827c55f502 am: 400f1f1f84 -s ours
am skip reason: Change-Id I5ac64c845328a54024171da41c369050243462b0 with SHA-1 06fcac6f24 is in history

Change-Id: I90608b31ea82d20324ceefc003f5e2ddd0af2da1
2020-05-20 23:28:16 +00:00
Sasha Smundak
400f1f1f84 Handle universal APK case in extract_apks am: 827c55f502
Change-Id: I3de65b4b6b09235fb61f1ccc098487f29bb3bbea
2020-05-20 23:10:43 +00:00
Sasha Smundak
827c55f502 Handle universal APK case in extract_apks
Cherrypick of ag/11553550

Bug: 157081961
Test: manual and builtin

Merged-In: I5ac64c845328a54024171da41c369050243462b0
Change-Id: I3ebc4a84501623774b78c9c19628994c1d71dc64
2020-05-20 13:10:59 -07:00
Alexander Smundak
75200d0a6f Merge "Handle universal APK case in extract_apks" into rvc-dev am: c6088b2d08
Change-Id: I10b9293473f18d1b86bc5734c028a8be627de573
2020-05-20 20:07:50 +00:00
Alexander Smundak
c6088b2d08 Merge "Handle universal APK case in extract_apks" into rvc-dev 2020-05-20 19:55:44 +00:00
Paul Duffin
60f5233401 [automerger skipped] Merge "Add --no-force-assign-all for java_sdk_library" am: 63beac5076 am: 94a475c066 -s ours
am skip reason: Change-Id I5d06ec037007b1770748df24a2e2e8691f177f4f with SHA-1 31b84c83bf is in history

Change-Id: I5f115bb913f878790d7aa57f265a30b3f1efc882
2020-05-20 17:23:48 +00:00
Paul Duffin
94a475c066 Merge "Add --no-force-assign-all for java_sdk_library" am: 63beac5076
Change-Id: Ib38664dd88cb6393740753cb0ac154247ba63cbe
2020-05-20 17:12:45 +00:00
Paul Duffin
63beac5076 Merge "Add --no-force-assign-all for java_sdk_library" 2020-05-20 17:02:30 +00:00
Liz Kammer
cdef7c8d80 [automerger skipped] Merge "Add signing linage support for android_app_import" am: ff000d65d4 am: a40034e3eb -s ours
am skip reason: Change-Id I260f198637a1a0f8b3373250413356785c56588a with SHA-1 2bc57f6afe is in history

Change-Id: I8a1c319c60f92d267ed5d0760ad5637632059810
2020-05-20 16:06:44 +00:00
Liz Kammer
a40034e3eb Merge "Add signing linage support for android_app_import" am: ff000d65d4
Change-Id: I8ad941274d91793407dcd0fad6ead721ad31eee4
2020-05-20 15:43:48 +00:00
Liz Kammer
ff000d65d4 Merge "Add signing linage support for android_app_import" 2020-05-20 15:21:16 +00:00
Nikita Ioffe
5d1c06c922 Merge "Always set targetSdkLevel to DefaultAppTargetSdk" into rvc-dev am: b029f03191
Change-Id: Id51826d589e55295b235dbb315e64e15ab52a4ca
2020-05-20 10:56:32 +00:00
Nikita Ioffe
b029f03191 Merge "Always set targetSdkLevel to DefaultAppTargetSdk" into rvc-dev 2020-05-20 10:39:07 +00:00
Ulyana Trafimovich
ab254eb634 Merge "Add a test for boot.zip (zip archive with boot image files)." am: 7bdb5e5aaa am: acdab217ac
Change-Id: I0e3d9bd7c428a634a8912cca05d5ee1e2bbfef12
2020-05-20 08:57:40 +00:00
Ulyana Trafimovich
6697660b60 Merge "Raise an error instead of panic in SplitApexJarPairs." am: 7645764e58 am: 2a6f9587de
Change-Id: I575e690660b78c8eeb89525408b8cb90c0bcf1d5
2020-05-20 08:57:32 +00:00
Ulyana Trafimovich
acdab217ac Merge "Add a test for boot.zip (zip archive with boot image files)." am: 7bdb5e5aaa
Change-Id: I74d8d248746e84087e8191acf64b30508ac9d520
2020-05-20 08:43:49 +00:00
Ulyana Trafimovich
2a6f9587de Merge "Raise an error instead of panic in SplitApexJarPairs." am: 7645764e58
Change-Id: I5a65eed47005ea7687b686b1a90abc08360c6bc2
2020-05-20 08:43:42 +00:00
Ulyana Trafimovich
7bdb5e5aaa Merge "Add a test for boot.zip (zip archive with boot image files)." 2020-05-20 08:29:21 +00:00
Ulyana Trafimovich
7645764e58 Merge "Raise an error instead of panic in SplitApexJarPairs." 2020-05-20 08:28:43 +00:00
Sasha Smundak
06fcac6f24 Handle universal APK case in extract_apks
Bug: 157081961
Test: manual and builtin
Change-Id: I5ac64c845328a54024171da41c369050243462b0
2020-05-20 00:38:02 -07:00
Paul Duffin
c495d2bfed Add --no-force-assign-all for java_sdk_library
Previously, the flag was only added for java_library modules that were
being instrumented. This will also add if for java_sdk_library modules
too.

Bug: 156705688
Test: TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86 EMMA_INSTRUMENT=true NATIVE_COVERAGE=true ./vendor/google/build/build_unbundled_coverage_mainline_module.sh -j8
Merged-In: I5d06ec037007b1770748df24a2e2e8691f177f4f
Change-Id: I5d06ec037007b1770748df24a2e2e8691f177f4f
(cherry picked from commit 31b84c83bf)
2020-05-20 08:19:56 +01:00
Treehugger Robot
cb489ea826 Merge "Revert "Use aapt2 flag --rename-resources-package in soong"" am: 4cb7fc05ae am: b64ac9a99f
Change-Id: I1a5ae60c5d4f7a367635476bb6f39b8ca0bca9dd
2020-05-19 23:57:59 +00:00
Treehugger Robot
b64ac9a99f Merge "Revert "Use aapt2 flag --rename-resources-package in soong"" am: 4cb7fc05ae
Change-Id: I27af983e99b57da368da0a53f5d8e9469c938828
2020-05-19 23:42:17 +00:00
Treehugger Robot
4cb7fc05ae Merge "Revert "Use aapt2 flag --rename-resources-package in soong"" 2020-05-19 23:30:08 +00:00
TreeHugger Robot
570b19e6dc Merge "Add --no-force-assign-all for java_sdk_library" into rvc-dev am: bf5c640aa5
Change-Id: I7cf9fa098e9cb747109e4a68e2aa1feb04da021d
2020-05-19 23:25:29 +00:00
Nikita Ioffe
5f6771e160 Always set targetSdkLevel to DefaultAppTargetSdk
Test: m
Bug: 156914912
Change-Id: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2
2020-05-20 00:20:00 +01:00
TreeHugger Robot
bf5c640aa5 Merge "Add --no-force-assign-all for java_sdk_library" into rvc-dev 2020-05-19 23:08:47 +00:00
Jeff Tinker
37710d6bde [automerger skipped] Merge "Revert "Generate the ART boot image for host as well (used by ART tests)."" into rvc-dev am: 999cff9a36 -s ours
am skip reason: skipped by user jtinker

Change-Id: Iaa76edef85b3a7abaf9108cb79d5f2275161fc5c
2020-05-19 21:02:45 +00:00
Paul Duffin
31b84c83bf Add --no-force-assign-all for java_sdk_library
Previously, the flag was only added for java_library modules that were
being instrumented. This will also add if for java_sdk_library modules
too.

Bug: 156705688
Test: TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86 EMMA_INSTRUMENT=true NATIVE_COVERAGE=true ./vendor/google/build/build_unbundled_coverage_mainline_module.sh -j8
Change-Id: I5d06ec037007b1770748df24a2e2e8691f177f4f
2020-05-19 21:18:05 +01:00
Treehugger Robot
80c7d15e9c Merge "Correct apex data in androidmk for flattened apex" am: 28f34bf920 am: 8fae075645
Change-Id: I0614f6fe2c1e05c95f3aef5b8cdffb47cddb6bf3
2020-05-19 19:46:25 +00:00
Treehugger Robot
8fae075645 Merge "Correct apex data in androidmk for flattened apex" am: 28f34bf920
Change-Id: I44a0f79e3af3513b181970c5b548cfcbca0b6c34
2020-05-19 19:34:15 +00:00
Treehugger Robot
28f34bf920 Merge "Correct apex data in androidmk for flattened apex" 2020-05-19 19:18:53 +00:00
Liz Kammer
1d5983b0f6 Revert "Use aapt2 flag --rename-resources-package in soong"
This reverts commit 1674f9b4e9.

Reason for revert: Breaks build

Change-Id: I465300eba68b62d65a0c0660b6bc283e4c89253b
2020-05-19 19:15:37 +00:00
Jeff Tinker
999cff9a36 Merge "Revert "Generate the ART boot image for host as well (used by ART tests)."" into rvc-dev 2020-05-19 18:10:51 +00:00
Jeff Tinker
74cc81c399 Revert "Generate the ART boot image for host as well (used by ART tests)."
This reverts commit e920d2d0c5.

Reason for revert: b/157053931 - Broken test:
com.android.devicehealthchecks.SystemAppCheck#system_app_native_crash
on git_rvc-dev on crosshatch-userdebug at 6510182

This CL is the only change in this build range so seems likely to be
the culprit.

Build break bug number:
bug:157053931

Original CL bug numbers:
Bug: 147817558
Bug: 147819342
Bug: 156649984

Change-Id: If8bf2f646789b583adcbfbc5df263ce953c05b76
2020-05-19 18:08:01 +00:00
TreeHugger Robot
62a597d0a3 [automerger skipped] Merge "Add support for remotely executing header-abi-dumper actions." into rvc-dev am: 47df9bc10d -s ours
am skip reason: Change-Id Ie752c07325453076d191813eaa50da03e3a0c2d8 with SHA-1 31ec942ff7 is in history

Change-Id: Ibad25d8fbd92ff8893427c75077e78ebb503d6db
2020-05-19 16:48:18 +00:00
TreeHugger Robot
47df9bc10d Merge "Add support for remotely executing header-abi-dumper actions." into rvc-dev 2020-05-19 16:27:38 +00:00
Liz Kammer
2497899bb6 Add signing linage support for android_app_import
(This is a cherry pick.)

Test: app_test
Bug: 153366049
Merged-In: I260f198637a1a0f8b3373250413356785c56588a
Change-Id: I260f198637a1a0f8b3373250413356785c56588a
2020-05-19 09:00:25 -07:00
Liz Kammer
8cb6ac7820 Merge "Use aapt2 flag --rename-resources-package in soong" am: f32bbf89de am: 4a313bf0c1
Change-Id: I2cd24a2e311fb453388eb0155014e8b8982609a8
2020-05-19 15:45:04 +00:00
Liz Kammer
4a313bf0c1 Merge "Use aapt2 flag --rename-resources-package in soong" am: f32bbf89de
Change-Id: I9e66f2165c1c8ee0114eba7080e0fe806d8922f9
2020-05-19 15:19:56 +00:00
Liz Kammer
f32bbf89de Merge "Use aapt2 flag --rename-resources-package in soong" 2020-05-19 14:59:04 +00:00
Liz Kammer
345e25783a Correct apex data in androidmk for flattened apex
Incorrectly used fmt.Println, printing to stdout instead of the desired
file.

Test: m com.android.art.testing
Bug: 155820504
Change-Id: I1aaf15de4f18f71710bc344bc8f71723e9756ad4
2020-05-19 07:38:59 -07:00
Ulyana Trafimovich
58e1bd3dfd [automerger skipped] Merge "Generate the ART boot image for host as well (used by ART tests)." into rvc-dev am: b3b814cbdd -s ours
am skip reason: Change-Id I864f72198d875dc1421c9c029a683bafbe7b71ac with SHA-1 7f8dac1254 is in history

Change-Id: Ib7dffb45234d009c15387eff2048558fce4b50f3
2020-05-19 14:36:57 +00:00
Ulyana Trafimovich
b3b814cbdd Merge "Generate the ART boot image for host as well (used by ART tests)." into rvc-dev 2020-05-19 14:13:16 +00:00
Ulyana Trafimovich
b05a3e9940 Merge "Refactor test to use Go subtests idiom." am: 56b92cf177 am: 3102921784
Change-Id: I3c75e56449096035a58e16286e43ca14c3204b65
2020-05-19 14:01:09 +00:00