Commit Graph

22432 Commits

Author SHA1 Message Date
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
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
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
Ramy Medhat
7f8a661f18 [automerger skipped] Merge "Add implicit outputs to link actions Bug: b/154733231" into rvc-dev am: 9adb15e4d3 -s ours
am skip reason: Change-Id I9b6ae97f5bbfe8f9c4b9c089544a768982794f32 with SHA-1 3fb6126309 is in history

Change-Id: I2fb128283232129f52f5c4ee8c54852a1da40afd
2020-05-19 13:56:03 +00:00
Treehugger Robot
35a91836e4 Add support for remotely executing header-abi-dumper actions.
Bug: b/156613606
Test: built with and without RBE_ABI_DUMPER set.
Change-Id: Ie752c07325453076d191813eaa50da03e3a0c2d8
Merged-In: Ie752c07325453076d191813eaa50da03e3a0c2d8
2020-05-19 09:55:36 -04:00
Ulyana Trafimovich
3102921784 Merge "Refactor test to use Go subtests idiom." am: 56b92cf177
Change-Id: Ia9d181d43b8edacf023636ab561ccf8e4e7fc10a
2020-05-19 13:45:50 +00:00
Ramy Medhat
9adb15e4d3 Merge "Add implicit outputs to link actions Bug: b/154733231" into rvc-dev 2020-05-19 13:43:06 +00:00
Ulyana Trafimovich
56b92cf177 Merge "Refactor test to use Go subtests idiom." 2020-05-19 13:28:59 +00:00
Jiyong Park
98a8d64126 Merge "Revert "Revert "Allow libz to have stub even though it's not an ..."" am: 550ff8cbfc am: df88e6fd6a
Change-Id: I977f8975e397b67af6c8f0dc664965170da350e0
2020-05-19 12:36:35 +00:00
Jiyong Park
df88e6fd6a Merge "Revert "Revert "Allow libz to have stub even though it's not an ..."" am: 550ff8cbfc
Change-Id: Ic3d7724b2b8ebc30eda01473ee1a88579584ce93
2020-05-19 12:16:29 +00:00
Jiyong Park
550ff8cbfc Merge "Revert "Revert "Allow libz to have stub even though it's not an ..."" 2020-05-19 12:06:00 +00:00
Ulya Trafimovich
7caef20553 Refactor test to use Go subtests idiom.
This way a failure in some subtests doesn't prevent other subtests
from running.

Test: m nothing
Change-Id: I6ec658505e26a00253d2c204f1614fcb15b8c2a2
2020-05-19 12:00:52 +01:00
Jiyong Park
2478e4e98f Revert "Revert "Allow libz to have stub even though it's not an ..."
Revert submission 1313718-revert-1312595-zlib_as_stub-BVNRLZPNBJ

Reason for revert: relanding

Reverted Changes:
I0cf486d9b:Revert "libz provides stubs to Mainline modules."
I412132f8a:Revert "libz is a stub"
I617eb90a3:Revert "Allow libz to have stub even though it's n...

Exempt-From-Owner-Approval: this is a clean relanding.

Test: m

Change-Id: Ib09a615bd11cf2647dcad42108adfcfc5040940f
2020-05-19 10:04:55 +00:00
David Srbecky
e920d2d0c5 Generate the ART boot image for host as well (used by ART tests).
This will allow us to remove the core.art image compiled in make.

Test: lunch aosp_x86_64 && m test-art-host-gtest
Bug: 147817558
Bug: 147819342
Bug: 156649984
Change-Id: I864f72198d875dc1421c9c029a683bafbe7b71ac
Merged-In: I864f72198d875dc1421c9c029a683bafbe7b71ac
(cherry picked from commit 7f8dac1254)
2020-05-19 09:44:51 +01:00
Paul Duffin
d9951cf9ce Merge "Syntax check generated Android.bp snapshot" am: 6b3ca917b0 am: 2b90c4a463
Change-Id: I844998d95917a4526f07887a5c2a5432450d6c20
2020-05-19 08:31:04 +00:00
Paul Duffin
2b90c4a463 Merge "Syntax check generated Android.bp snapshot" am: 6b3ca917b0
Change-Id: I2ccb927facdfec9263ff948a3b7e522c0bb8fac3
2020-05-19 08:13:00 +00:00
Paul Duffin
6b3ca917b0 Merge "Syntax check generated Android.bp snapshot" 2020-05-19 07:53:27 +00:00
Treehugger Robot
503df9fd16 Merge "Update ninja proto, always enable ninja -d stats" am: 7b7aa8c3ef am: b0643c54d2
Change-Id: If3c90ec40e756756a4c20e259be3cbac97674029
2020-05-19 03:59:34 +00:00
Treehugger Robot
b0643c54d2 Merge "Update ninja proto, always enable ninja -d stats" am: 7b7aa8c3ef
Change-Id: Iaf59611a602c52028170ab0591634034fea52ee0
2020-05-19 03:46:20 +00:00
Treehugger Robot
7b7aa8c3ef Merge "Update ninja proto, always enable ninja -d stats" 2020-05-19 03:20:34 +00:00
Jiyong Park
4601d3e6a2 [automerger skipped] Merge "Reland "Prevent statically linking to a lib providing stable C APIs"" am: 5a33a3cac6 am: 78a448812c -s ours
am skip reason: Change-Id I05f0465976098941d47ecc06c978cfa116364d78 with SHA-1 af7ed39b06 is in history

Change-Id: I403b1960864007bb997a0da1eae63f2debeda6df
2020-05-19 03:07:44 +00:00
Jiyong Park
78a448812c Merge "Reland "Prevent statically linking to a lib providing stable C APIs"" am: 5a33a3cac6
Change-Id: Iacde5996f76a924e60c8153b85ca8cfe36bc3db0
2020-05-19 02:45:55 +00:00
Jiyong Park
5a33a3cac6 Merge "Reland "Prevent statically linking to a lib providing stable C APIs"" 2020-05-19 02:21:54 +00:00
Dan Willemsen
082182275f Update ninja proto, always enable ninja -d stats
The stats output will now use the new "DEBUG" message type, which we can
always redirect to verbose.log.gz.

Test: m aprotoc  (look in verbose.log.gz)
Change-Id: Ie1b58f12c008ff7d29f11ff7a9807488dba8a504
2020-05-18 17:52:28 -07:00
Stephen Hines
b0028676d3 Merge "Default to zero-initialization instead of pattern." into rvc-dev am: 13b041d6ea
Change-Id: I9b6781726a23aa833f0d2eb519e214fb139d0995
2020-05-18 22:31:58 +00:00
Stephen Hines
13b041d6ea Merge "Default to zero-initialization instead of pattern." into rvc-dev 2020-05-18 22:18:21 +00:00
Liz Kammer
1674f9b4e9 Use aapt2 flag --rename-resources-package in soong
This change uses aapt2 flag to change the package name encoded in the
resources table for override apps.

Test: app_test.go
Bug: 147434671
Change-Id: I70a43c2163709afc90262d74f975ce14a556cf55
2020-05-18 15:10:21 -07:00
Liz Kammer
ba8415e543 Add signing linage support for android_app_import am: 2bc57f6afe
Change-Id: I83b9f52d540b4fc7e4e7e06f98c9301ed82a3028
2020-05-18 21:15:38 +00:00
Colin Cross
1202827ebe [automerger skipped] Merge "Use system modules for prebuilt SDKs >=30" am: 49e94c0a92 am: 2ef0c31464 -s ours
am skip reason: Change-Id Iebadad5980b952ed91c3ffd56cff1ce1827d3247 with SHA-1 db22475ecb is in history

Change-Id: Idcd334b83ad5358637efbaa6cdf9832dbd12b301
2020-05-18 19:36:37 +00:00
Colin Cross
2ef0c31464 Merge "Use system modules for prebuilt SDKs >=30" am: 49e94c0a92
Change-Id: Iba6117794ba0b88a65dcd247d64b5a9143aed5b0
2020-05-18 19:18:49 +00:00
Colin Cross
49e94c0a92 Merge "Use system modules for prebuilt SDKs >=30" 2020-05-18 19:02:43 +00:00