Commit Graph

2576 Commits

Author SHA1 Message Date
Artur Satayev
ce06cc0c25 Introduce derive_classpath service.
go/updatable-classpath

Bug: 180105615
Test: manual + boot test
Change-Id: If0a3cb00754834133abea12caff3fdc5b7cff696
Merged-In: If0a3cb00754834133abea12caff3fdc5b7cff696
2021-03-09 00:11:13 +00:00
TreeHugger Robot
2970f7ea17 Merge "Introduce derive_classpath service." into sc-dev 2021-03-09 00:00:51 +00:00
Colin Cross
cbd14768a4 Merge "Remove extra return value from testApex" am: 110bca5bd1 am: f686c21c3b am: bbf3dcf9ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e904bf0966fcf1f402daeba5b79486d725c5b35
2021-03-08 20:15:03 +00: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
Artur Satayev
92f7874e82 Introduce derive_classpath service.
go/updatable-classpath

Bug: 180105615
Test: manual + boot test
Change-Id: If0a3cb00754834133abea12caff3fdc5b7cff696
2021-03-08 18:03:59 +00:00
TreeHugger Robot
e7b67eb018 Merge "Add statslog_media dependency to media module." into sc-dev 2021-03-08 18:01:32 +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
1c58ce4a52 Merge "Fix mutator ordering issue in apex tests" am: 97c8128eea am: d8033e1d26 am: e672daac6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621415

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa3b28737bcf55fb5ccda37e3e4dec4973cf8e34
2021-03-06 09:56:43 +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
Linus Nilsson
2cb4b01f1f Add statslog_media dependency to media module.
To support logging transcoding metrics to westworld
a small auto generated wrapper lib is needed to
send structured data to statsd.

Bug: 179274112
Test: Will verify build with presubmit
Change-Id: I9b3a0b1825b7acb9859b92b9a52b3550e31ef1f1
2021-03-05 21:52:30 +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
Jeongik Cha
480762d78b update apex/allowed_deps.txt
Bug: 150578172
Test: m
Change-Id: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
Merged-In: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
2021-03-05 21:47:22 +09:00
Jeongik Cha
c38777cb75 update apex/allowed_deps.txt
Bug: 150578172
Test: m
Change-Id: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
Merged-In: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
2021-03-05 21:39:17 +09:00
Jeongik Cha
555752f09e update apex/allowed_deps.txt
Bug: 150578172
Test: m
Change-Id: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
2021-03-05 21:10:19 +09:00
Treehugger Robot
e26cd8f5a0 Merge "Friendly error message on apex_available and min_sdk_version checks" am: 4a349ab66b am: 5bb26755f9 am: 0aa0afdfe2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic88794c361b576be6032298dbca76173bd08331e
2021-03-05 06:22:49 +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
4d32bcd77f Merge "Remove myself from the OWNERS" am: e9d0de4932 am: f8a09af582 am: fe185ffa11
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If45c9aa7034e62829fd33e0a0e03cfa8920ba4fe
2021-03-04 19:21:20 +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
Chen Xu
6618f04006 include new settings lib to the apex-dependency allow list
Bug: 177638076
Test: Manual
Change-Id: Ib686d0aed0d985eb5452859774a31e398cda2795
2021-03-04 18:03:21 +08:00
Lukács T. Berki
213810ca19 Merge "cd to / before running soong_build ." am: ddebd2c82a am: db9632fbd0 am: 13dac96f2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1416378dec2959c10b37b6bea847bc2fd7c93027
2021-03-04 09:41:49 +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
dcb7d03edd Make apex.updatable default to true. am: f8dcf5ead2 am: 8d200e4279 am: a795bf267c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d62e35fb4a897c3c1742c28ef0cead9cd3d1a18
2021-03-03 18:29:14 +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
Lev Proleev
93b7340bdd Merge "Add libruy_static to allowed_deps" into sc-dev 2021-03-03 14:50:52 +00:00
Lev Proleev
d152f5b0ed Add libruy_static to allowed_deps
To be used in NNAPI apex as part of TF Lite.

Bug: 178609672
Test: m
Change-Id: Iaf623823e85e7488e30b3dcf2592d1a90bf9fc9f
Merged-In: Iaf623823e85e7488e30b3dcf2592d1a90bf9fc9f
2021-03-03 10:55:26 +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
2adb1ee447 Merge changes I3e6bc9b5,If9f8fb10 am: fdf28ca403 am: 342db477c8 am: e9f7dff1d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1611942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied4766b84dc6ffc6de3acef6e9bb411f0b10d5ca
2021-03-03 08:10:25 +00: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
a385a630b8 Add modules-annotation-minsdk in allowed_deps am: 4416350471 am: 77273fad21 am: d6a52586c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612299

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4670d011f304c943cc6156312b0154e9236ca08f
2021-03-03 00:23:03 +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
Paul Duffin
9b1893fbba Merge "Verify the prebuilt_apex selects the correct input apex file" am: 9b41efabd1 am: b267e12670 am: 196fe7325a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610797

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7f5291c9eae0eea81f459263188b067ef3707cf
2021-03-02 22:33:20 +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