Commit Graph

34503 Commits

Author SHA1 Message Date
Lukacs T. Berki deba72161c Make tests work again on Darwin.
aosp/1609473 broke this by making originalEnv empty unless
InitEnvironment() is called, which doesn't happen in tests.

Bug: 181835672
Test: "m nothing" on Linux and Darwin.
Change-Id: I33f9cce65a9151e620e1dddafb62d4c599ed2cac
2021-03-04 10:54:50 +01: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 db9632fbd0 Merge "cd to / before running soong_build ." am: ddebd2c82a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4936c514dbb38c68d075952d60a8801383eaf55
2021-03-04 07:58:47 +00:00
Lukács T. Berki ddebd2c82a Merge "cd to / before running soong_build ." 2021-03-04 07:07:02 +00:00
Petri Gynther 7ef30ccea2 Merge "Rename vendor-ramdisk to vendor_ramdisk" am: 7d3f2caec0 am: 3a54e1e1d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614008

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf78e6b5d057b393e4a2a7f634a3b43be435599e
2021-03-04 06:11:13 +00:00
Petri Gynther 3a54e1e1d5 Merge "Rename vendor-ramdisk to vendor_ramdisk" am: 7d3f2caec0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614008

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I057d6c211c2da36e07af71505e8cb33825ab6d9c
2021-03-04 05:23:57 +00:00
Treehugger Robot 85d42a3590 Merge "init_rc and vintf_fragments appear in PackagingSpecs()" am: 6cfd3eeed3 am: 32da168930
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6bea76a81035746256fc18d95168c85d7423f74
2021-03-04 04:42:03 +00:00
Julien Desprez e2af725162 Merge "Attempt to run all java_test_host that look unit tests" am: ce45b73070 am: e4e279ec9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597083

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d26cf98224741a15341c6ba09d1371c8ae1c838
2021-03-04 04:41:41 +00:00
Petri Gynther 7d3f2caec0 Merge "Rename vendor-ramdisk to vendor_ramdisk" 2021-03-04 04:40:04 +00:00
Treehugger Robot 32da168930 Merge "init_rc and vintf_fragments appear in PackagingSpecs()" am: 6cfd3eeed3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2f74ee19e7c907a2f8f1e5a2d0c7701f8d56a7a
2021-03-04 04:08:53 +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
Julien Desprez e4e279ec9e Merge "Attempt to run all java_test_host that look unit tests" am: ce45b73070
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597083

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieddf9035c5ea19c743a140076227d55c0fd735cc
2021-03-04 04:02:40 +00:00
Treehugger Robot 6cfd3eeed3 Merge "init_rc and vintf_fragments appear in PackagingSpecs()" 2021-03-04 02:10:37 +00:00
Julien Desprez ce45b73070 Merge "Attempt to run all java_test_host that look unit tests" 2021-03-04 02:00:58 +00:00
Xin Li bba1db1a94 [automerger skipped] Merge "Merge RQ2A.210305.007" am: cbcc5b7179 -s ours am: 0fd0dc8b84 -s ours
am skip reason: Change-Id I422ccc35977e0be846bb7a3497a50c2fc2c42e92 with SHA-1 b267e12670 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1611845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0179d09b14c721399068bbfd899d0e23d4f614f
2021-03-03 23:37:02 +00:00
Xin Li 0fd0dc8b84 [automerger skipped] Merge "Merge RQ2A.210305.007" am: cbcc5b7179 -s ours
am skip reason: Change-Id I422ccc35977e0be846bb7a3497a50c2fc2c42e92 with SHA-1 b267e12670 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1611845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie31bdba8c3f5d7c5d1ce4e3745ce7eebadcb112d
2021-03-03 22:28:41 +00: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
Jiyong Park 4d86107c84 init_rc and vintf_fragments appear in PackagingSpecs()
init_rc and vintf_fragments have been directly translated into
LOCAL_INIT_RC and LOCAL_VINTF_FRAGMENTS and then installed completely in
Make. This is causing problem when a module having either of the
properties is included in an android_filesystem module. The rc or
fragment files are not included in the filesystem module because Soong
doesn't track the files.

This change fixes the problem by calling PackageFile() on the two types
of files so that they appear in PackagingSpecs().

Bug: 181728384
Test: m microdroid_super and inspect the image. It has
/system/etc/init/servicemanager.rc

Change-Id: Ie1443696369b5d2b1e8f520f0f218d33a3dd67b7
2021-03-03 22:31:09 +09: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
Treehugger Robot a6329ee4c5 Merge "Fix a typo." am: 3bed960399 am: 7a393a930d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1613841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief79fe2fddf2631904e558d043cf7ab42c366315
2021-03-03 08:54:20 +00:00
Treehugger Robot 7a393a930d Merge "Fix a typo." am: 3bed960399
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1613841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb89cf17862ea178514a35fac353d44f8705232c
2021-03-03 08:19:56 +00:00
Petri Gynther ac22956dcb Rename vendor-ramdisk to vendor_ramdisk
Rename to get consistent ramdisk directory naming in
out/target/product/<name>:
  debug_ramdisk
  ramdisk
  vendor_debug_ramdisk
  vendor_ramdisk

Test: build and inspect out/target/product/<name>
Change-Id: Ib86e6509bd910e8c95bcb6e3f7bb639ebbfe3758
2021-03-03 00:15:54 -08: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
Treehugger Robot 3bed960399 Merge "Fix a typo." 2021-03-03 03:45:09 +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
Jaewoong Jung 8e93aba545 Fix a typo.
Fixes: 181712201
Test: N/A
Change-Id: I170a737906dc0c796bc2063b83a25ced5b4a68c9
2021-03-02 16:58:08 -08:00
Paul Duffin 2506785cef Merge "Add error handling to test fixtures" am: 7d27bc5fcf am: 06257dace1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb3437dd7ecfba2d38d3ba5d50c962b65a839300
2021-03-03 00:54:04 +00:00
Paul Duffin 06257dace1 Merge "Add error handling to test fixtures" am: 7d27bc5fcf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia27c82b60d57106d54e801bc28f6dce6ab42cb54
2021-03-03 00:13:56 +00:00
Treehugger Robot d39700c648 Merge "Remove Abseil checks from clang-tidy defaults." am: 636d152e08 am: 93a58aaf37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612584

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfbc1f005b68f126883992e7c7a388ed8095284b
2021-03-02 23:25:57 +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
Christopher Parsons cd4dcdda18 Merge "Support cc_object modules in mixed builds" am: bc39e17a1d am: 218cf3dec6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b9ae344a99d32585556bc1aadfd9610c0d337ef
2021-03-02 23:25:40 +00:00
Ulyana Trafimovich a863867c79 Merge "Use compiler filter "verify" for dexpreopt w/o class loader context." am: 8838dce471 am: 868c93677f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610787

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9147579012bb78862b6ac5634b252f02a7122e2
2021-03-02 23:25:33 +00:00
Ulyana Trafimovich d0f9821127 Merge "Do verify_uses_libraries check for APKs after patching library names." am: 97df5e65b0 am: e073aa2af2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I100a6591ff3357d0129a090d0303cbf662766351
2021-03-02 23:25:17 +00:00
Ulyana Trafimovich 939809b6ce Merge "Respect `provides_uses_lib` for modules added via `[optional_]uses_libs`" am: ae5cdfffa3 am: a9860b8a8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5b3fe2b21b9b2186196e0b38a43cdf561f36a56
2021-03-02 23:24:52 +00:00
Ulyana Trafimovich eaaa895ff1 Merge "Add `provides_uses_library` example to TestUsesLibrary check." am: 71284b60ae am: 5da4dcf21a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0de2a9a5d645e85cea017271d6e06efa1cd28111
2021-03-02 23:24:46 +00:00
Ulyana Trafimovich 4b40d94a40 Merge "Stricten TestUsesLibrary check." am: 00c27b7a68 am: 45e3b00b56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63c0525dc47669828727988067ba8f223e913992
2021-03-02 23:24:40 +00:00
Paul Duffin 7d27bc5fcf Merge "Add error handling to test fixtures" 2021-03-02 23:24:05 +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
Treehugger Robot 93a58aaf37 Merge "Remove Abseil checks from clang-tidy defaults." am: 636d152e08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612584

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia959ff5571efc7abab81614c0f2c15ccfc513138
2021-03-02 22:30:49 +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
Christopher Parsons 218cf3dec6 Merge "Support cc_object modules in mixed builds" am: bc39e17a1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ac0fdb33390eb75e937eb1386f6bbd629829745
2021-03-02 22:29:59 +00:00
Ulyana Trafimovich 868c93677f Merge "Use compiler filter "verify" for dexpreopt w/o class loader context." am: 8838dce471
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610787

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe9b25e2e673701417e45b36bd54efd853544a05
2021-03-02 22:29:51 +00:00
Ulyana Trafimovich e073aa2af2 Merge "Do verify_uses_libraries check for APKs after patching library names." am: 97df5e65b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84113f145fd13e1a6c691f97551f47306a87ee27
2021-03-02 22:29:42 +00:00
Ulyana Trafimovich a9860b8a8f Merge "Respect `provides_uses_lib` for modules added via `[optional_]uses_libs`" am: ae5cdfffa3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a8e88bd6ae4f2d121f1e5a0a06ded4cfbbe3ef5
2021-03-02 22:29:33 +00:00