Commit Graph

20205 Commits

Author SHA1 Message Date
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
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
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
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
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
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
3102921784 Merge "Refactor test to use Go subtests idiom." am: 56b92cf177
Change-Id: Ia9d181d43b8edacf023636ab561ccf8e4e7fc10a
2020-05-19 13:45:50 +00:00
Ulyana Trafimovich
56b92cf177 Merge "Refactor test to use Go subtests idiom." 2020-05-19 13:28:59 +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
Ulya Trafimovich
86d9e3a7b7 Add a test for boot.zip (zip archive with boot image files).
Test: m nothing
Bug: 152593075
Change-Id: Ibd07bdbd7d66312d32c9f461a082ffbba7112030
2020-05-19 11:19:20 +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
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
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
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
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
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
Treehugger Robot
d9b1282918 Merge "Append whole_static_libs deps from .a files instead of the list of objects." am: 5b79950e99
Change-Id: I41244296f1a790aac195cf614e5687b767519d5d
2020-05-18 09:50:59 +00:00
Treehugger Robot
5b79950e99 Merge "Append whole_static_libs deps from .a files instead of the list of objects." 2020-05-18 09:41:41 +00:00
Jiyong Park
0149ab8ae5 Merge "Revert "Allow libz to have stub even though it's not an LLNDK li..."" am: 03c694d070
Change-Id: I00128ac646466a4f9231fda87ed3bb8b1f784949
2020-05-18 09:29:23 +00:00
Jiyong Park
03c694d070 Merge "Revert "Allow libz to have stub even though it's not an LLNDK li..."" 2020-05-18 09:27:35 +00:00
Jiyong Park
f133c18a00 Revert "Allow libz to have stub even though it's not an LLNDK li..."
Revert submission 1312595-zlib_as_stub

Exempt-From-Owner-Approval: reverting a bad change

Reason for revert: broke rvc-dev-plus-aosp
Reverted Changes:
I7c0a7f954:libz is a stub
If51a7e80f:libz provides stubs to Mainline modules.
I26417bb78:Allow libz to have stub even though it's not an LL...

Change-Id: I617eb90a33eacc7f264551c969ff5a16fa0d4087
2020-05-18 09:26:30 +00:00
Treehugger Robot
86a5ba673e Merge "Allow libz to have stub even though it's not an LLNDK library" am: b4ce1e972c
Change-Id: I4404200702da8ee11d01f4658703920e9002e22c
2020-05-18 08:42:43 +00:00
Treehugger Robot
b4ce1e972c Merge "Allow libz to have stub even though it's not an LLNDK library" 2020-05-18 08:32:27 +00:00
Lukacs T. Berki
a5e0f710c2 Call Delve using exec() instead of "dlv attach".
"dlv attach":

- Spams the terminal
- Requires sysctl -w kernel.yama.ptrace_scope=0
- Apparently, does not allow the debugger to inspect variables

Test: Manual.
Change-Id: I625369effaf5abda2b5d884c8ce5bde7247774eb
2020-05-18 09:50:18 +02:00
Treehugger Robot
30a6edb924 Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." am: 1d9e2364ed
Change-Id: I19c34ba0959d9287aa16a42c6e819718e1ffa00e
2020-05-18 02:07:20 +00:00
Treehugger Robot
1d9e2364ed Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." 2020-05-18 01:50:49 +00:00
Paul Duffin
8bf22015c0 Extract common behavior between Module and Import am: 0d3c2e136b
Change-Id: I3314d2ed871b627c943a74802ff269b0c5d02924
2020-05-17 15:43:41 +00:00
Paul Duffin
0d3c2e136b Extract common behavior between Module and Import
Although the duplication being eliminated here is minimal follow up
changes will add more functionality that is common to Module and
Import.

Test: m nothing
Bug: 156723295
Change-Id: I1733405526764272beba63470a9bc8a958d41024
2020-05-17 13:32:13 +01:00
Jiyong Park
7d95a510cc Reland "Prevent statically linking to a lib providing stable C APIs"
This reverts commit 5b75774004.

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

Bug: 151051671
Test: m
Merged-In: I05f0465976098941d47ecc06c978cfa116364d78
(cherry picked from commit af7ed39b06)
Change-Id: I05f0465976098941d47ecc06c978cfa116364d78
2020-05-17 20:47:27 +09:00
Paul Duffin
1647e82aa0 java_sdk_library: Remove unnecessary qualification of fields am: a18abc2a61
Change-Id: Ib6b62802ba8c36a523731eff451873cc1f650e61
2020-05-17 10:54:39 +00:00
Paul Duffin
a18abc2a61 java_sdk_library: Remove unnecessary qualification of fields
Fields in embedded structures can be accessed without qualifying them
by the type of the embedded structure.

This reduces the size of follow up changes that switch java_sdk_library
from embedding Library.

Bug: 156618935
Test: m nothing
Change-Id: I84f294c6f02d5089055130c63f5fb0538a1f21b9
2020-05-16 19:29:59 +01:00
Treehugger Robot
4f15be74c8 Merge "Remove unnecessary copying of common properties" am: 781baf01eb
Change-Id: Iddeeab9ee1be3c706beb25e2f8c0113223409c9d
2020-05-16 14:36:50 +00:00
Treehugger Robot
781baf01eb Merge "Remove unnecessary copying of common properties" 2020-05-16 14:22:01 +00:00
Paul Duffin
1dbe3ca254 Remove unnecessary copying of common properties
The (Soc/Device/Product/System_ext)_specific are all properties in
ModuleBase.commonProperties. Initially, they were explicitly copied
from the parent to the child. Since then the CreateModule() method
was modified to automatically copy all the commonProperties from the
parent to the child so this code is no longer necessary.

Bug: 156618935
Test: m nothing
      checked that it does not change the generated xml permissions
	  file for a java_sdk_library that sets soc_specific: true and
	  is in the vendor partition.
Change-Id: I8c985b50cb6b6c019b33a4652de482ded689fee4
2020-05-16 13:06:55 +01:00
Colin Cross
17dec171b4 Use system modules for prebuilt SDKs >=30
Prebuilt SDKs >=30 now contain core-for-system-modules.jar,
convert them to system modules and use them when compiling against
the SDK to allow using javac -source 1.9 -target 1.9.

Bug: 117069453
Test: TestClasspath
Change-Id: Iebadad5980b952ed91c3ffd56cff1ce1827d3247
Merged-In: Iebadad5980b952ed91c3ffd56cff1ce1827d3247
2020-05-15 17:21:58 -07:00
Jaewoong Jung
23b4707ddc Merge "Add apex_set module." am: 805f2492e8
Change-Id: I0e66801f3c9ea5ae2f500d1cb11bd7f315a4a197
2020-05-15 23:26:18 +00:00