Commit Graph

2576 Commits

Author SHA1 Message Date
Martin Stjernholm
a43e5c3cde Merge "Fix boot jar handling when both source and prebuilt APEXes and modules are present." am: c4e17317d1 am: d593a73257 am: 8784b2fe5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37251d12bf78ce055394956b74bafb64ebbf8e6e
2021-01-30 00:54:15 +00:00
Martin Stjernholm
8784b2fe5d Merge "Fix boot jar handling when both source and prebuilt APEXes and modules are present." am: c4e17317d1 am: d593a73257
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia050858ba2a5810b0e708f61a12fe536b571af7f
2021-01-29 23:43:27 +00:00
Nikita Ioffe
69634d3a5a Turn apex compression from opt-out into opt-in am: 82aab58aea am: 4e36d71632 am: 0968f5a861
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1563633

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a2de635c40e856e25de07f6e699bc1f4ee34aaa
2021-01-29 22:23:44 +00:00
Nikita Ioffe
0968f5a861 Turn apex compression from opt-out into opt-in am: 82aab58aea am: 4e36d71632
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1563633

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I108ef022f4bb1ed2c5cf602bf747574d2fe20df3
2021-01-29 21:50:35 +00:00
David Su
b7535a4432 Update allowed_deps minSdkversion for netd_aidl_interface
Bug: 178711289
Test: m
Change-Id: I2d60a5c1746b8f77a5c3bcef37d09533108ff203
Merged-In: Id78bb6f8f6ea48435f66528b0c2f915d1ba2b0b3
2021-01-29 09:02:13 -08:00
Martin Stjernholm
c4e17317d1 Merge "Fix boot jar handling when both source and prebuilt APEXes and modules are present." 2021-01-29 13:15:02 +00:00
TreeHugger Robot
aeec219200 Merge "update apex allowed deps because of aidl module name change" into sc-dev 2021-01-29 05:27:27 +00:00
Nikita Ioffe
82aab58aea Turn apex compression from opt-out into opt-in
Compression is useful only for big enough apexes. We can manually opt-in
them, instead of trying to find list of apexes that should be opted-out.

Test: m
Bug: 178713634
Change-Id: Ice86fabb7c1db4a1e21e4c983d595cfd3a1c0b7a
2021-01-28 20:25:23 +00:00
Martin Stjernholm
1dc0d6d7f2 Fix boot jar handling when both source and prebuilt APEXes and modules
are present.

1) The boot jar to APEX mapping is maintained by the base names for
both of them. When building with prebuilt modules and APEXes, that
means we need to take care to compare them without regard to any
"prebuilt_" prefixes.

2) VisitAllModules can visit disabled modules and both source and
prebuilt modules, so they need some conditions to skip modules that
aren't applicable for boot jars.

Test: `m droid`
Test: `m droid SOONG_CONFIG_art_module_source_build=false`
  with fresh ART Module prebuilts in place
Bug: 171061220
Change-Id: Iced269d29127bc8b8f9b3171adb60a97d115628b
2021-01-28 20:09:24 +00:00
Paul Duffin
b523679051 Merge "Add boot_image module type" am: b9d731c8a9 am: 70b8c656c6 am: e36b8727c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b3eea987e3cc9ec6106b9a8f250b8616d5c4589
2021-01-28 17:13:03 +00:00
Paul Duffin
e36b8727c1 Merge "Add boot_image module type" am: b9d731c8a9 am: 70b8c656c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06be6aab301bb86e24e253fa7b6d94cba258b02a
2021-01-28 16:48:30 +00:00
Paul Duffin
b9d731c8a9 Merge "Add boot_image module type" 2021-01-28 15:39:57 +00:00
Jeongik Cha
366afd8820 update apex allowed deps because of aidl module name change
Bug: 150578172
Test: m
Change-Id: If27c922f6eda07cc94c1edec081311b0c540d3a2
2021-01-28 15:32:43 +00:00
Treehugger Robot
5d1f775735 Merge "apex: checks min_sdk_version for preview/current" am: 99afe0d442 am: 3f4cc86f15 am: 2ebe689bbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557545

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24256763c59562e7f878ff86dd637803ad081168
2021-01-28 14:57:42 +00:00
Treehugger Robot
2ebe689bbf Merge "apex: checks min_sdk_version for preview/current" am: 99afe0d442 am: 3f4cc86f15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557545

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e8ae9caa5233c3738ee51da8980b2bc8f9dc995
2021-01-28 14:15:36 +00:00
Treehugger Robot
99afe0d442 Merge "apex: checks min_sdk_version for preview/current" 2021-01-28 13:04:52 +00:00
Neil Fuller
0b1553dbbe Merge "Track changes in system/timezone" into sc-dev 2021-01-27 14:49:35 +00:00
Paul Duffin
2d8301e0bb Merge "Make com.android.art related tests more realistic" am: 57eec1007e am: 65964a6a90 am: 1999d04d2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e195216eb2f17a5f400ab5f61b9d121e462bdea
2021-01-27 11:19:22 +00:00
Paul Duffin
1999d04d2a Merge "Make com.android.art related tests more realistic" am: 57eec1007e am: 65964a6a90
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94ef60fc464b13d609d8482675918094453de884
2021-01-27 11:02:45 +00:00
Paul Duffin
57eec1007e Merge "Make com.android.art related tests more realistic" 2021-01-27 10:03:42 +00:00
Neil Fuller
5cd73d7e5f Track changes in system/timezone
The geotz module now depends on API "31" methods. Entering "31" as the
SDK currently fails so the dependency has been changed to "current" to
silence the error prone warnings.

The changes made to allowed_deps.txt were generated using:
$ croot && build/soong/scripts/update-apex-allowed-deps.sh

... and then manually edited to remove old lines.

Bug: 177678050
Bug: 152746105
Bug: 173201396
Test: treehugger
Change-Id: Iafdac04c206582a5160ff4950fbe4d7c725ee4d6
2021-01-27 09:53:58 +00:00
Treehugger Robot
d4a4ab6ddd Merge "update apex allowed deps-2" am: fcf2da0b29 am: 9a2a87f6e2 am: 7b093c5317
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560310

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e999d7ca595799bbcd7aded1ac6275ca67ccb01
2021-01-27 04:26:31 +00:00
Treehugger Robot
7b093c5317 Merge "update apex allowed deps-2" am: fcf2da0b29 am: 9a2a87f6e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560310

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d778ad95e4d5fcc12c646e4bdf65850470aa804
2021-01-27 01:24:20 +00:00
Treehugger Robot
fcf2da0b29 Merge "update apex allowed deps-2" 2021-01-27 01:06:48 +00:00
Paul Duffin
9dbb55204f Merge "Fix problems with TestPrebuiltExportDexImplementationJars" am: 24907d115a am: fba1b458a0 am: 9ef42fd746
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560276

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie25dd73d273ea5105ad920d51918cd317d8c37fc
2021-01-26 18:42:20 +00:00
Paul Duffin
9ef42fd746 Merge "Fix problems with TestPrebuiltExportDexImplementationJars" am: 24907d115a am: fba1b458a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560276

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2c15bb6f1127acee593404029c24fd6af993db8
2021-01-26 18:42:08 +00:00
Jeongik Cha
40c6ae759d update apex allowed deps-2
an aidl module should specify its version. because of that some deps
which have version on its name is added.

Bug: 150578172
Test: m
Change-Id: If5c5d66e59f33ecf37d118b2b80db820ec78ea04
2021-01-26 23:05:42 +09:00
Paul Duffin
650553e343 Merge "Make dexpreopt tools available for all java tests" am: 4c183c7581 am: ca6d1d9267 am: eef33b4e93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556241

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I304e79170ba080e4c7221d31d53726cb43714d03
2021-01-26 13:37:21 +00:00
Paul Duffin
3451e1600f Add boot_image module type
Adds a boot_image module type. Follow on changes will add instances of
boot_image to represent the ART and framework boot images in the art
and frameworks/base repositories respectively.

For the moment they retrieve their associated boot image configuration
from the map returned by genBootImageConfigs() and leave the actual
work of creating the ninja rules to create the boot images to the
dex_bootjars singleton.

Bug: 177892522
Test: m droid
Change-Id: Ib69701de0d24d996bb8e8be7a20b941be907390e
2021-01-26 13:00:07 +00:00
Paul Duffin
eef33b4e93 Merge "Make dexpreopt tools available for all java tests" am: 4c183c7581 am: ca6d1d9267
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556241

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33f4184727ea3781e96bd07ae0f32188ab3e08cf
2021-01-26 12:56:08 +00:00
Paul Duffin
d376f7925a Make com.android.art related tests more realistic
Previously, some tests used "com.android.art.something" as the name of
the APEX containing the ART boot jars but that is not the valid name
for an ART APEX. This change switches that to "com.android.art.debug".

Bug: 171061220
Test: m nothing
Change-Id: I057edc58ae81cdb14076a2d7d117ca1764aa3e52
2021-01-26 12:35:08 +00:00
Paul Duffin
092153de15 Fix problems with TestPrebuiltExportDexImplementationJars
Previously, the test mistakenly configured BootJars which meant the
test was testing not just the propagation of paths to files retrieved
from the prebuilt apex to the java_import module but also the process
of finding appropriate boot jars.

It also set "prefer: true" on the prebuilt_apex instead of the
java_import when checking to make sure that it still found the correct
module when both prebuilt and source were available and the prebuilt
was preferred.

Bug: 171061220
Test: m nothing
Change-Id: I4f2fa7ea372b14d4b169cdc78bdeb1ca4ac4dff8
2021-01-26 12:35:08 +00:00
Paul Duffin
4c183c7581 Merge "Make dexpreopt tools available for all java tests" 2021-01-26 12:08:30 +00:00
Jeongik Cha
4f86add6a8 update apex allowed deps am: 0056b99972 am: 05ca3b2964
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3f32f5cf6f8630ee05d6f2c50a7c7709df39b8d
2021-01-26 06:41:03 +00:00
sophiez
c5c4164c47 Automated NDK API coverage backed by Mainline modules build integration.
Add gen_ndk_backedby_apex.sh script to generate NDK API list used by Mainlain modules when modules get build.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only

Change-Id: Ib1b2f0dd2f9ae85b1545c6cc5bb4c5bbdfac1c15
Merged-In: Ib1b2f0dd2f9ae85b1545c6cc5bb4c5bbdfac1c15
2021-01-26 04:50:59 +00:00
Jooyung Han
ed124c308f apex: checks min_sdk_version for preview/current
If we don't check "current", it won't be checked even in the finalized
branch.

If we don't check "preview", it should be done during the SDK
finalization. It'd be better done before the SDK finalization regarding
that setting min_sdk_version is to get approval from deps library owners.

Bug: 177833148
Test: m (soong tests)
Change-Id: I712b61cfe5a134fbb69c73956d26fb3a1e5c011e
2021-01-26 12:09:07 +09:00
Sophie Zheng
a215165b60 Merge "Revert "Revert "Automated NDK API coverage used by Mainline modules build integration.""" am: 9b6596bb60 am: 5bcc9fb821 am: 46695305ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1559535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19d806d4ca140ba00f81eb241d699cbd10476c2a
2021-01-26 01:08:24 +00:00
Jeongik Cha
0056b99972 update apex allowed deps
an aidl module should specify its version. because of that some deps
which have version on its name is added.

Bug: 150578172
Test: m
Change-Id: I4fe33974190765615069d0ba894e5ab4dcc3064f
Merged-In: I4fe33974190765615069d0ba894e5ab4dcc3064f
2021-01-26 09:59:34 +09:00
Sophie Zheng
46695305ca Merge "Revert "Revert "Automated NDK API coverage used by Mainline modules build integration.""" am: 9b6596bb60 am: 5bcc9fb821
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1559535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6dfbbf194dfd6ff9e7208d05e8319fb0456cc52
2021-01-26 00:57:36 +00:00
Jeongik Cha
e6b5399da3 Merge changes from topic "b/150578172-2"
* changes:
  Update VndkMustUseVendorVariantList
  update apex allowed deps
2021-01-26 00:16:58 +00:00
Sophie Zheng
9b6596bb60 Merge "Revert "Revert "Automated NDK API coverage used by Mainline modules build integration.""" 2021-01-26 00:13:46 +00:00
sophiez
6bde0b5f9d Revert "Revert "Automated NDK API coverage used by Mainline modules build integration.""
This reverts commit 556b2ad77e.

Original change-id: Ib1b2f0dd2f9ae85b1545c6cc5bb4c5bbdfac1c15

Reason for revert: Add excutable permission to the gen_ndk_backedby_apex.sh.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only

Change-Id: Ib587ba200cd7f2f61d478452b43c329d72b2de06
2021-01-25 19:52:10 +00:00
Paul Duffin
635aa0834f Make dexpreopt tools available for all java tests
Bug: 177892522
Test: m nothing
Change-Id: I594bddae692ef76dc8c3da504934d0151b13d4c9
2021-01-25 19:15:19 +00:00
Riddle Hsu
0a62836abc Merge "Revert "Automated NDK API coverage used by Mainline modules build integration."" am: f17b07fc52 am: d86a495903 am: aa902a2769
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556729

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc6cb8cdaabba12b61b8ac09465ae66718652f2b
2021-01-25 07:13:33 +00:00
Riddle Hsu
aa902a2769 Merge "Revert "Automated NDK API coverage used by Mainline modules build integration."" am: f17b07fc52 am: d86a495903
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556729

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b6923a843548c747a53bdbd7131821704bdb19a
2021-01-25 06:57:32 +00:00
Riddle Hsu
f17b07fc52 Merge "Revert "Automated NDK API coverage used by Mainline modules build integration."" 2021-01-25 06:15:29 +00:00
Riddle Hsu
556b2ad77e Revert "Automated NDK API coverage used by Mainline modules build integration."
This reverts commit 87ff51db84.

Reason for revert: build breakage b/178327796

Change-Id: I51c56938540794097eda579ebe47fa5c0a4d8c12
2021-01-25 01:44:34 +00:00
Sophie Zheng
a37e55d9ae Merge "Automated NDK API coverage used by Mainline modules build integration." am: 0bf77198b5 am: 5eb2508018 am: e261b61f78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1544728

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73c5ad9efd0124153d583a84be2c47101fef24b0
2021-01-23 00:45:01 +00:00
Sophie Zheng
e261b61f78 Merge "Automated NDK API coverage used by Mainline modules build integration." am: 0bf77198b5 am: 5eb2508018
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1544728

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie18ab227f3cbe502bdba38bce79119eed6c79554
2021-01-23 00:06:35 +00:00
Sophie Zheng
0bf77198b5 Merge "Automated NDK API coverage used by Mainline modules build integration." 2021-01-22 22:15:21 +00:00