Commit Graph

2576 Commits

Author SHA1 Message Date
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
1242a5ad2a Merge "apex: install hwasan lib if depended on libc" am: 166349beeb am: f7879cbfbd am: ff4e78e876 am: 6bd92d1827 am: 89bb3fa9eb
Change-Id: I220851d668bd4145d3a1872040fd10bbe4071e67
2020-05-21 02:06:48 +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
166349beeb Merge "apex: install hwasan lib if depended on libc" 2020-05-21 00:48:26 +00:00
Jooyung Han
11c2093ea3 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.

Bug: 156978407
Test: m
Merged-In: I3a21d653fe9c4159e3a89791fe1a8597865eeae6
Change-Id: I3a21d653fe9c4159e3a89791fe1a8597865eeae6
2020-05-20 21:49:30 +00:00
Jooyung Han
837a7d390e Merge "apex: Make android_library support APEX variants" 2020-05-20 21:45:48 +00:00
Jooyung Han
bd133b1bdc 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: Got approval in rvc-dev.

Bug: 156978407
Test: m
Change-Id: I3a21d653fe9c4159e3a89791fe1a8597865eeae6
2020-05-20 21:45:29 +00:00
Liz Kammer
81faaaf65b Add test to ensure test data written for flat apex
Bug: 155820504
Test: apex_test
Change-Id: Id0db24ad139962523532e16934bd95bed06073a8
2020-05-20 09:57:08 -07:00
Nikita Ioffe
644009a221 Always set targetSdkLevel to DefaultAppTargetSdk
Test: m
Bug: 156914912
Merged-In: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2
Change-Id: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2
(cherry picked from commit 5f6771e160)
2020-05-20 13:57:05 +01:00
Nikita Ioffe
330c141ef5 Merge "Always set targetSdkLevel to DefaultAppTargetSdk" into rvc-dev am: b029f03191 am: c94c6af3d8 am: f7fca7d247 am: d2c38b1507
Change-Id: Ic4b73d82fa4a7c40cbb2047ff0413617e71409e9
2020-05-20 11:44:51 +00:00
Nikita Ioffe
f7fca7d247 Merge "Always set targetSdkLevel to DefaultAppTargetSdk" into rvc-dev am: b029f03191 am: c94c6af3d8
Change-Id: I27774b4c8f95579be02deeb0e8bc5b27a3e966b0
2020-05-20 11:12:24 +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
5f6771e160 Always set targetSdkLevel to DefaultAppTargetSdk
Test: m
Bug: 156914912
Change-Id: Ibe63352c2fc474dd816d87ac79b31a56d32b35d2
2020-05-20 00:20:00 +01:00
Treehugger Robot
e394c27538 Merge "Correct apex data in androidmk for flattened apex" am: 28f34bf920 am: 8fae075645 am: 80c7d15e9c am: 83c25153b6 am: 8aeecb3fc5
Change-Id: I7b7ef686b6da73d163b509c02fbbd033429861cc
2020-05-19 20:25:45 +00: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
28f34bf920 Merge "Correct apex data in androidmk for flattened apex" 2020-05-19 19:18:53 +00:00
Ulyana Trafimovich
51034ba697 Merge "Refactor test to use Go subtests idiom." am: 56b92cf177 am: 3102921784 am: b05a3e9940 am: 2c73e9fbdc am: 93759291b6
Change-Id: I2dc0596b7823187b9de65abb408413dc08514225
2020-05-19 15:02:41 +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
b05a3e9940 Merge "Refactor test to use Go subtests idiom." am: 56b92cf177 am: 3102921784
Change-Id: I3c75e56449096035a58e16286e43ca14c3204b65
2020-05-19 14:01:09 +00:00
Ulyana Trafimovich
56b92cf177 Merge "Refactor test to use Go subtests idiom." 2020-05-19 13:28:59 +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
TreeHugger Robot
53754e3592 Merge "Remove apex_available whitelist for the extservices APEX" into rvc-dev 2020-05-17 15:17:58 +00:00
Jiyong Park
db4ce6e80a Remove apex_available whitelist for the extservices APEX
The marked library(ies) were available to the APEX via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Bug: 150999716
Test: m
Merged-In: I827d604c7e5a469a8b8a6d5a4b7917f2eaca48ca
Change-Id: I827d604c7e5a469a8b8a6d5a4b7917f2eaca48ca
2020-05-17 21:23:08 +09: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
Jiyong Park
2f12a31276 Merge "Reland "Prevent statically linking to a lib providing stable C APIs"" into rvc-dev-plus-aosp am: e719d43acc am: 93d8c7eb58 am: e23e71a0dd
Change-Id: I804d90e50aa8dd53f3d55066510c97647d6af2d1
2020-05-16 09:28:08 +00:00
Paul Duffin
c91aafb699 Merge "Replace javaLibrary with java.Dependency,android.Module" into rvc-dev 2020-05-16 07:24:18 +00:00
Jiyong Park
af7ed39b06 Reland "Prevent statically linking to a lib providing stable C APIs"
This reverts commit 5b75774004.

Bug: 151051671
Test: m
Change-Id: I05f0465976098941d47ecc06c978cfa116364d78
2020-05-16 09:41:19 +09:00
Jaewoong Jung
8cf307e754 Add apex_set module.
apex_set takes an .apks file that contains a set of prebuilt apexes with
different configurations. It uses extract_apks to select and install the
best matching one for the current target.

Bug: 153456259
Test: apex_test.go
Test: com.android.media.apks
Change-Id: I1da8bbcf1611b7c580a0cb225856cbd7029cc0a7
Merged-In: I1da8bbcf1611b7c580a0cb225856cbd7029cc0a7
2020-05-16 00:37:36 +00:00
Jaewoong Jung
0df882adb7 Merge "Add apex_set module." am: 805f2492e8 am: 23b4707ddc am: 75b78df026 am: ed1f5e1be5 am: 0cf29dccb1
Change-Id: I761b0019383bbb38b41c3edd6922cd7b7dbb4559
2020-05-16 00:34:43 +00:00
Jaewoong Jung
75b78df026 Merge "Add apex_set module." am: 805f2492e8 am: 23b4707ddc
Change-Id: I47e7a67ea8b2af27860531e67dd66c854b6bca70
2020-05-15 23:43:41 +00:00
Jaewoong Jung
805f2492e8 Merge "Add apex_set module." 2020-05-15 23:13:38 +00:00
Artur Satayev
849f844252 Generate combined deps-info for all updatable modules.
Introduce a singleton apex rule to merge contents of individual
deps-info results into a single output file.

Bug: 149622332
Test: m
Change-Id: I4ab7e1a3527fead97a81a5a2cb0e1e93a429117c
2020-05-15 19:10:19 +01:00
Jaewoong Jung
fa00c06187 Add apex_set module.
apex_set takes an .apks file that contains a set of prebuilt apexes with
different configurations. It uses extract_apks to select and install the
best matching one for the current target.

Bug: 153456259
Test: apex_test.go
Test: com.android.media.apks
Change-Id: I1da8bbcf1611b7c580a0cb225856cbd7029cc0a7
2020-05-15 11:02:01 -07:00
Treehugger Robot
1f62486a3d Merge "Remove apex_available whitelist for the extservices APEX" am: 8cf3e5471d am: 8b4193d5bb am: ced4ae1496 am: e64b84ca83 am: 85cd67bc5b
Change-Id: I8b48ccb1e0acbd164b3e6eea227ba2b24a525872
2020-05-15 16:30:57 +00:00
Paul Duffin
f299cbefcd Replace javaLibrary with java.Dependency,android.Module
Passes an additional android.Module parameter through to avoid having
to use javaLibrary interface.

Bug: 146586360
Test: m nothing
Merged-In: Ie533c16c753dc9c43171d0223953adea7b2b5ee6
Change-Id: Ie533c16c753dc9c43171d0223953adea7b2b5ee6
(cherry picked from commit 581bbbe8cb)
2020-05-15 17:07:02 +01:00
Treehugger Robot
ced4ae1496 Merge "Remove apex_available whitelist for the extservices APEX" am: 8cf3e5471d am: 8b4193d5bb
Change-Id: I0fda78f456e5634bfb67342bbe9706e09a167d0f
2020-05-15 15:21:07 +00:00
Treehugger Robot
8cf3e5471d Merge "Remove apex_available whitelist for the extservices APEX" 2020-05-15 14:46:43 +00:00
Treehugger Robot
d385bdaedb Merge "Replace javaLibrary with java.Dependency,android.Module" am: 198c946c8a am: cf2a8b54a6 am: c94b1728f1 am: 7822405cb3 am: 69356121ff
Change-Id: Ie2b5e78c58893092e5b7270182c6c21b15d551ff
2020-05-15 14:40:30 +00:00
Treehugger Robot
c94b1728f1 Merge "Replace javaLibrary with java.Dependency,android.Module" am: 198c946c8a am: cf2a8b54a6
Change-Id: I505e846b647e2a29daeca376c1055e089c7c3001
2020-05-15 13:46:46 +00:00
Treehugger Robot
198c946c8a Merge "Replace javaLibrary with java.Dependency,android.Module" 2020-05-15 13:17:32 +00:00
Jooyung Han
8ce8db9ed6 apex: install hwasan lib if depended on libc
There're two ways to enable hwasan:
- global setting: TARGET_SANITIZE=hwaddress
- individual setting: sanitize: { hwaddress: true }

This change covers both cases by looking up if com.android.runtime is
hwaddress santized or not.

Bug: 156678661
Test: m (soong test added)
Change-Id: I67c382c3e76a06f4b27f221eebd153c698647227
2020-05-15 19:12:38 +09:00
Paul Duffin
581bbbe8cb Replace javaLibrary with java.Dependency,android.Module
Passes an additional android.Module parameter through to avoid having
to use javaLibrary interface.

Bug: 146586360
Test: m nothing
Change-Id: Ie533c16c753dc9c43171d0223953adea7b2b5ee6
2020-05-14 21:26:28 +01:00
Liz Kammer
f3a921e752 Merge "Add test data dependencies to APEX." am: 6109adaee0 am: 5b5cecd94e am: 8d501ef107 am: 5f56008e4c am: 700dcd6dc7
Change-Id: I0bfca7a592f9691597b461802239e1906e42e36b
2020-05-14 16:11:12 +00:00
Liz Kammer
8d501ef107 Merge "Add test data dependencies to APEX." am: 6109adaee0 am: 5b5cecd94e
Change-Id: I2589597f744dd62d0799f20d7de79dab4e8b07ae
2020-05-14 15:30:55 +00:00
Liz Kammer
6109adaee0 Merge "Add test data dependencies to APEX." 2020-05-14 15:06:49 +00:00
Jiyong Park
a8c03921f2 Remove apex_available whitelist for the extservices APEX
The marked library(ies) were available to the APEX via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Bug: 150999716
Test: m
Change-Id: I827d604c7e5a469a8b8a6d5a4b7917f2eaca48ca
2020-05-14 21:39:55 +09:00
Treehugger Robot
af8e4e12c1 Merge "Remove reference to libz_current." am: 6a53c65ebd am: 02d3e4e600 am: 5a5194a485 am: b2a413dae0 am: 808dfe9c7f
Change-Id: I4f112bf384ba62fcf85488d4db2c7a922f299616
2020-05-14 05:28:50 +00:00
Treehugger Robot
5a5194a485 Merge "Remove reference to libz_current." am: 6a53c65ebd am: 02d3e4e600
Change-Id: I616b77a4f1fae6370b30cbdffdd6ac6bc8d94ee6
2020-05-14 04:47:28 +00:00
Elliott Hughes
9912ee2f02 Remove reference to libz_current.
This no longer exists.

Bug: https://issuetracker.google.com/155351357
Test: treehugger
Change-Id: Ie38c971759acb0141cba6341f95c67effadd93a6
2020-05-13 14:20:12 -07:00
Liz Kammer
1c14a21994 Add test data dependencies to APEX.
Test: soong go tests

Bug: 155820504
Change-Id: If96d82c27f19953e34efb31f2111f1643c0c4008
2020-05-13 10:17:30 -07:00