Commit Graph

1475 Commits

Author SHA1 Message Date
Paul Duffin
4ea76e8caf Merge "Avoid calling DepIsInSameApex when excluded from apex contents" am: 9c2e6d50b4 am: 46a694ba85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3b078034869c482a624c66b1093fb97e0ae6871
2021-03-11 02:19:40 +00:00
Paul Duffin
9c2e6d50b4 Merge "Avoid calling DepIsInSameApex when excluded from apex contents" 2021-03-10 23:30:48 +00:00
Paul Duffin
0f9e7887fa Merge "Extract apex registration code into function for reuse" am: 3d3f7a0c3f am: 5dccf644f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c20a0a5a5fed0aae8cdbdb678f09474e09d8324
2021-03-10 20:12:30 +00:00
Paul Duffin
3d3f7a0c3f Merge "Extract apex registration code into function for reuse" 2021-03-10 17:31:13 +00:00
Paul Duffin
e9612824ea Avoid calling DepIsInSameApex when excluded from apex contents
While debugging an issue with some work I was doing on boot image
modules I noticed that markPlatformAvailability() is calling
DepIsInSameApex() even when the dependency tag indicates that it is
excluded from the apex contents.

Test: m droid
Change-Id: Iac49049546a886f7a3a0d9640ffd31ce24c61364
2021-03-10 16:44:57 +00:00
Jeongik Cha
5225ca9434 update apex/allowed_deps.txt
Bug: 150578172
Test: m
Change-Id: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
Merged-In: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
2021-03-10 09:16:14 +09:00
Paul Duffin
667893c657 Extract apex registration code into function for reuse
Test: m nothing
Change-Id: Id2c918891ecd9e874004f6828f71374bf0cdb9e4
2021-03-09 23:03:40 +00:00
Jooyung Han
b2821d6c8c Merge "Run "prebuilt_postdeps" mutator again" am: 77e7d7769e am: 1226de1315
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620647

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8fec1a135d285d296ce4121a725a64f443fc0f51
2021-03-09 17:38:39 +00:00
Jooyung Han
77e7d7769e Merge "Run "prebuilt_postdeps" mutator again" 2021-03-09 16:21:33 +00:00
Treehugger Robot
f58582a3c1 Merge "Introduce derive_classpath service." am: c285125110 am: eb4bc50101
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79df795b34714b5f12c2d34302096c40672ca1f5
2021-03-09 11:50:04 +00:00
Treehugger Robot
c285125110 Merge "Introduce derive_classpath service." 2021-03-09 10:23:49 +00:00
Jooyung Han
86feead0d5 Run "prebuilt_postdeps" mutator again
Because OverridablePropertiesDepsMutator is run after prebuilt_postdeps,
prebuilt's replacement doesn't affect to those deps added by overridable
properties.

By running prebuilt_postdeps again after
OverridablePropertiesDepsMutator, replacing source with prebuilts is
applied to those deps.

Bug: 152155285
Bug: 181953909
Bug: 181974714
Test: m nothing
Change-Id: I24acc02785c9580c2beca096042f1173eb28ba9a
2021-03-09 11:23:46 +09:00
Colin Cross
bbf3dcf9ec Merge "Remove extra return value from testApex" am: 110bca5bd1 am: f686c21c3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3887d404da1c6be15e591ecc389cab72826bef5
2021-03-08 19:28:35 +00:00
Colin Cross
110bca5bd1 Merge "Remove extra return value from testApex" 2021-03-08 18:16:23 +00:00
Artur Satayev
74030452b6 Introduce derive_classpath service.
go/updatable-classpath

Bug: 180105615
Test: manual + boot test
Merged-In: If0a3cb00754834133abea12caff3fdc5b7cff696
Change-Id: If0a3cb00754834133abea12caff3fdc5b7cff696
2021-03-08 18:06:59 +00:00
Anton Hansson
6b9ef0da30 Merge "Allow PermissionController to set min_sdk_version to 30." am: 921a89e376 am: 328bb54dab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c278a129377a25f011353e400826006ecb74865
2021-03-08 12:24:02 +00:00
Anton Hansson
921a89e376 Merge "Allow PermissionController to set min_sdk_version to 30." 2021-03-08 11:18:16 +00:00
Paul Duffin
e672daac6b Merge "Fix mutator ordering issue in apex tests" am: 97c8128eea am: d8033e1d26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621415

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84cb412a6a78c132107f962e3d746f7c5941c2e3
2021-03-06 09:06:03 +00:00
Paul Duffin
6d119b804c Fix mutator ordering issue in apex tests
Previously, the override mutators were being run before the prebuilt
mutators that did not match the runtime behavior. This change fixes
that ordering.

In the process it broke TestApexWithAppImportsPrefer. That test tries
to verify that an apex that depends on an android_app will use an
android_app_import if that is preferred. Unfortunately, it only worked
because of the incorrect order of the mutators.

The test worked before this change because the prebuilt mutators were
being run after the overridableModuleDepsMutator. That meant that any
dependencies added by that mutator onto source modules could be
replaced by the PrebuiltPostDepsMutator with the preferred prebuilt
module.

Switching the order to match the runtime meant that the prebuilt
mutators were run before the overrides so never had a chance to replace
the dependencies added by the overrides.

Bug: 181953909
Bug: 181974714
Test: m nothing
Change-Id: Ic98fdc29a63155174a3227e7e918b26f0a8763bb
2021-03-05 18:38:58 +00:00
Hai Zhang
9bb022a4aa Allow PermissionController to set min_sdk_version to 30.
PermissionController is updatable since R, so its minimum SDK version
should be 30.

Bug: 174770904
Test: build
Merged-In: I5c98dc0053687bd4601ab06f6e092aeb851cdba7
Change-Id: I5c98dc0053687bd4601ab06f6e092aeb851cdba7
2021-03-05 17:46:25 +00:00
Treehugger Robot
0aa0afdfe2 Merge "Friendly error message on apex_available and min_sdk_version checks" am: 4a349ab66b am: 5bb26755f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia42eb7ea29401fc53c188ded76315072080b85cd
2021-03-05 05:57:35 +00:00
Treehugger Robot
4a349ab66b Merge "Friendly error message on apex_available and min_sdk_version checks" 2021-03-05 03:30:11 +00:00
Makoto Onuki
fe185ffa11 Merge "Remove myself from the OWNERS" am: e9d0de4932 am: f8a09af582
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78ebb78934af20071071cbdd96625899c5c8e9fe
2021-03-04 18:57:34 +00:00
Makoto Onuki
e9d0de4932 Merge "Remove myself from the OWNERS" 2021-03-04 17:04:53 +00:00
Lukács T. Berki
13dac96f2c Merge "cd to / before running soong_build ." am: ddebd2c82a am: db9632fbd0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fb83ce60ddefcfdff85db83c05a9fc45dc27a9c
2021-03-04 08:37:36 +00:00
Lukács T. Berki
ddebd2c82a Merge "cd to / before running soong_build ." 2021-03-04 07:07:02 +00:00
Jiyong Park
767dbd9d3b Friendly error message on apex_available and min_sdk_version checks
1) suggest a fix at the end of the message
2) add new lines around the dependency path so that they are visually
separated from rest of the error message

Bug: N/A
Test: m with an intentional break
error: bionic/apex/Android.bp:32:1: module "com.android.runtime" variant "android_common_com.android.runtime_image": "libutils_headers" requires "libsystem_headers" that doesn't list the APEX under 'apex_available'.

Dependency path:
           via tag apex.dependencyTag: { name:executable payload:true}
    -> crash_dump{os:android,image:,arch:arm_armv8-a,sdk:,apex:apex10000}
           via tag cc.libraryDependencyTag: { Kind:staticLibraryDependency Order:normalLibraryDependency wholeStatic:false reexportFlags:false explicitlyVersioned:false dataLib:false ndk:false staticUnwinder:false makeSuffix: skipApexAllowedDependenciesCheck:false excludeInApex:false}
    -> libtombstoned_client_static{os:android,image:,arch:arm_armv8-a,sdk:,link:static,apex:apex10000}
           via tag cc.libraryDependencyTag: { Kind:staticLibraryDependency Order:normalLibraryDependency wholeStatic:true reexportFlags:true explicitlyVersioned:false dataLib:false ndk:false staticUnwinder:false makeSuffix: skipApexAllowedDependenciesCheck:false excludeInApex:false}
    -> libcutils{os:android,image:,arch:arm_armv8-a,sdk:,link:static,asan:,apex:apex10000}
           via tag cc.libraryDependencyTag: { Kind:headerLibraryDependency Order:normalLibraryDependency wholeStatic:false reexportFlags:false explicitlyVersioned:false dataLib:false ndk:false staticUnwinder:false makeSuffix: skipApexAllowedDependenciesCheck:false excludeInApex:false}
    -> libutils_headers{os:android,image:,arch:arm_armv8-a,sdk:,asan:,apex:apex10000}
           via tag cc.libraryDependencyTag: { Kind:headerLibraryDependency Order:normalLibraryDependency wholeStatic:false reexportFlags:true explicitlyVersioned:false dataLib:false ndk:false staticUnwinder:false makeSuffix: skipApexAllowedDependenciesCheck:false excludeInApex:false}
    -> libsystem_headers{os:android,image:,arch:arm_armv8-a,sdk:,asan:,apex:apex10000}

Consider adding "com.android.runtime" to 'apex_available' property of "libsystem_headers"

Change-Id: I09f92c3086ea433780133a33ba0ad73baee6dc41
2021-03-04 13:07:36 +09:00
Xin Li
cbcc5b7179 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:40 +00:00
Mathew Inwood
a795bf267c Make apex.updatable default to true. am: f8dcf5ead2 am: 8d200e4279
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5c822301839f69c7372d6a968bcd1652654fa66
2021-03-03 17:21:36 +00:00
Xin Li
2964583d62 Merge RQ2A.210305.007
Bug: 180401296
Merged-In: I422ccc35977e0be846bb7a3497a50c2fc2c42e92
Change-Id: I230429666794c8218e515099292600d77a4b9604
2021-03-03 09:12:01 -08:00
Makoto Onuki
55418f8c37 Remove myself from the OWNERS
Bug: n/a
Test: n/a
Change-Id: I84f09ac8dc619921d4f8adfc3ea56f5ee01510a2
2021-03-03 08:21:17 -08:00
Mathew Inwood
8d200e4279 Make apex.updatable default to true. am: f8dcf5ead2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77aae495c41af1a0b6ab0254965d4f64c7419854
2021-03-03 16:20:22 +00:00
Mathew Inwood
f8dcf5ead2 Make apex.updatable default to true.
Update tests accordingly and add a new test case for this.

Bug: 180375550
Test: Treehugger
Change-Id: I835e189f4dae1e4bc79dce7bc59b7b9c7bd19fd9
2021-03-03 10:28:26 +00:00
Lukacs T. Berki
7690c09953 cd to / before running soong_build .
This lets one avoid any decisions as to when to chdir there during its
execution and leads to better sandboxing because the pwd doesn't leak to
init() functions anymore.

Test: Manual.
Change-Id: I1560da8ed3a621249426f9e8908aa890c21e13ba
2021-03-03 09:14:22 +01:00
Colin Cross
e9f7dff1d5 Merge changes I3e6bc9b5,If9f8fb10 am: fdf28ca403 am: 342db477c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1611942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff1d41973ece6f21641bcb5476a4e76d4536eb35
2021-03-03 02:59:08 +00:00
Colin Cross
342db477c8 Merge changes I3e6bc9b5,If9f8fb10 am: fdf28ca403
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1611942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b1d3c1c4a41e853e00ffecc17bfc6d0ad051cc0
2021-03-03 02:17:05 +00:00
Colin Cross
fdf28ca403 Merge changes I3e6bc9b5,If9f8fb10
* changes:
  Disable TestSendLog on the buildbots
  Remove global state from VNDK apexes
2021-03-03 01:45:02 +00:00
Hyundo Moon
d6a52586c4 Add modules-annotation-minsdk in allowed_deps am: 4416350471 am: 77273fad21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I648d42cb97a92c9e602d77c4d49ac42650ab5278
2021-03-02 23:25:50 +00:00
Paul Duffin
9d697b3d94 Merge "Remove deapexer and prebuilt apex select mutators" am: 4b786d2da1 am: 0630dacc0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610795

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9b898e2788ca9a5bfba6944839026f1bcb92aad
2021-03-02 23:23:36 +00:00
Hyundo Moon
77273fad21 Add modules-annotation-minsdk in allowed_deps am: 4416350471
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I695b56d0d9b999beb941c343fb19ecf83f935994
2021-03-02 22:30:07 +00:00
Paul Duffin
0630dacc0c Merge "Remove deapexer and prebuilt apex select mutators" am: 4b786d2da1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610795

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia285f625de493e02e8b2f0ea5aa6a245927bc581
2021-03-02 22:27:27 +00:00
Paul Duffin
196fe7325a Merge "Verify the prebuilt_apex selects the correct input apex file" am: 9b41efabd1 am: b267e12670
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610797

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa64f22f2afa5172702482999c3b861aec0d39ff
2021-03-02 21:50:49 +00:00
Paul Duffin
906fb68c12 Merge "Add test to verify the deapexer rule's input apex file" am: 30c9fe93e0 am: 6f342644d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610796

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65700e9f3b7e1d87bf8a755b249bf176417ddcd9
2021-03-02 21:50:08 +00:00
Paul Duffin
b267e12670 Merge "Verify the prebuilt_apex selects the correct input apex file" am: 9b41efabd1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610797

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I422ccc35977e0be846bb7a3497a50c2fc2c42e92
2021-03-02 21:36:01 +00:00
Paul Duffin
6f342644d0 Merge "Add test to verify the deapexer rule's input apex file" am: 30c9fe93e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610796

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb6beaaa979cb14cf005a9bed7fd851253f91115
2021-03-02 21:26:58 +00:00
Colin Cross
2807f0047b Remove global state from VNDK apexes
Use the name of the apex instead of a global map to find the right
VNDK apex for each VNDK version.

Bug: 181689854
Test: apex tests
Change-Id: If9f8fb10d09e125c9e7d44228e1aa746bf53c082
2021-03-02 12:23:16 -08:00
Hyundo Moon
4416350471 Add modules-annotation-minsdk in allowed_deps
This enables using @MinSdk in media APEX.

Bug: 181649697
Test: Builds successfully
Change-Id: If69d0a6e84e31d26484c7e29dfdde4f14410a024
2021-03-02 17:22:34 +00:00
Paul Duffin
4b786d2da1 Merge "Remove deapexer and prebuilt apex select mutators" 2021-03-02 10:48:29 +00:00
Paul Duffin
9b41efabd1 Merge "Verify the prebuilt_apex selects the correct input apex file" 2021-03-02 10:47:48 +00:00
Paul Duffin
30c9fe93e0 Merge "Add test to verify the deapexer rule's input apex file" 2021-03-02 10:47:33 +00:00