Commit Graph

3688 Commits

Author SHA1 Message Date
Tobias Thierer
00da5c60fb Merge "go/Android.bp: Clarify sdk_version documentation." am: dadc62cdb4 am: 922e7f941a am: dec7caec15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0723ce5d973138b5dbc14688c8b22beb065d15c6
2021-02-02 20:17:54 +00:00
Tobias Thierer
dec7caec15 Merge "go/Android.bp: Clarify sdk_version documentation." am: dadc62cdb4 am: 922e7f941a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie46c8ea7ea179f2e87fe6f1a6741c0035cb87766
2021-02-02 19:34:48 +00:00
Tobias Thierer
dadc62cdb4 Merge "go/Android.bp: Clarify sdk_version documentation." 2021-02-02 18:19:38 +00:00
Paul Duffin
9ce9d882cb Merge "Move creation of paths into hiddenAPIGenerateCSV" am: 8705ba06bf am: 9031379011 am: 3e9ce4716a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b6941d69f05dc5ba0e2466a1a2406ef7d2f6444
2021-02-01 20:31:20 +00:00
Paul Duffin
3e9ce4716a Merge "Move creation of paths into hiddenAPIGenerateCSV" am: 8705ba06bf am: 9031379011
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37d8002f30b31451dc683ce72156d50f2e55ac64
2021-02-01 19:49:23 +00:00
Paul Duffin
8705ba06bf Merge "Move creation of paths into hiddenAPIGenerateCSV" 2021-02-01 17:28:20 +00:00
Paul Duffin
f7e2ff5dc9 Merge "Fix some minor issues with boot_image" am: aded43c808 am: 92db324beb am: 2c1c3cac9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1566176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad8a038903907bfc0a74a98852929c1fa7961cf3
2021-02-01 11:47:48 +00:00
Paul Duffin
fff9e13ed8 Merge "Add boot_images to apex" am: 4a838dfb3f am: 4849ec99b9 am: 4694cf7c81
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59b4310efac004352f572252b78d68155f7d78e9
2021-02-01 11:39:07 +00:00
Ulyana Trafimovich
6be59d88c7 Merge "Write module dexpreopt.config for Make." am: a4fce3b488 am: 682808f0ad am: 136d087a8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2972ea7c62c787b8b674185d0e1febf19e173112
2021-02-01 11:38:58 +00:00
Paul Duffin
a78406f692 Merge "Add documentation for the different files created by hiddenapi" am: 523bb85995 am: e3b48e4034 am: 4c73a0d554
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564636

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib82002ecf7d15dcda3dddb23ed2ef6fc9dcb85eb
2021-02-01 11:38:47 +00:00
Paul Duffin
2c1c3cac9e Merge "Fix some minor issues with boot_image" am: aded43c808 am: 92db324beb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1566176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54537d03a79ad26895ecbee9be0e64fbde575c0f
2021-02-01 11:02:35 +00:00
Paul Duffin
4694cf7c81 Merge "Add boot_images to apex" am: 4a838dfb3f am: 4849ec99b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61aa45660665daf63e98ff1d51c2171ba76e0aa8
2021-02-01 11:02:23 +00:00
Ulyana Trafimovich
136d087a8e Merge "Write module dexpreopt.config for Make." am: a4fce3b488 am: 682808f0ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c0696bbcf536ddbf875c9e6c9e43bbc602b4b3f
2021-02-01 11:02:14 +00:00
Paul Duffin
4c73a0d554 Merge "Add documentation for the different files created by hiddenapi" am: 523bb85995 am: e3b48e4034
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564636

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I442b5bfd65dbb863d79926c562dbe81205518501
2021-02-01 11:02:07 +00:00
Paul Duffin
aded43c808 Merge "Fix some minor issues with boot_image" 2021-02-01 10:21:34 +00:00
Paul Duffin
4a838dfb3f Merge "Add boot_images to apex" 2021-02-01 10:21:21 +00:00
Ulyana Trafimovich
a4fce3b488 Merge "Write module dexpreopt.config for Make." 2021-02-01 10:16:57 +00:00
Paul Duffin
5bbfef8718 Fix some minor issues with boot_image
Mistakenly used HostAndDeviceDefault (which builds host and device
variants by default) instead of HostAndDeviceSupported which only
builds a device variant by default.

Moved the test definitions of art and framework boot images from being
defined in all Java related tests into the test where they belong. This
is needed in order to improve the ART and framework boot image specific
testing.

Bug: 177892522
Test: m droid
Change-Id: I16771f09bd789033e18c58ae6dd4b6b9e865d831
2021-01-30 12:57:26 +00:00
Paul Duffin
a1d6025a49 Add boot_images to apex
Previously, the apex module had to hard code behavior specific to the
art apex module in order to include the art boot image. This change
adds support to the apex module to allow the boot images to be
specified per apex.

In combination with a change to add the "art-boot-image" to the ART
apex this allows the custom code for handling the art boot image in
apex to be removed.

That custom apex code also included the logic to ensure that the
GlobalSoongConfig was initialized for use by the dex_bootjars
singleton. That logic has been moved from the APEX to the boot_image
module. That ensures that it will be run if and only if a boot_image
module is present in the checked out repos. So, limited manifest
checkouts which do not contain the art or frameworks/base repos (which
is where the boot_image modules are defined) will not attempt to run
this logic, which would fail because dex2oat would not be present.

Bug: 177892522
Test: m droid
Change-Id: I02d25fbef6e864e31eb5e0f4eb50358c79486db0
2021-01-30 12:45:07 +00:00
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
Paul Duffin
34982f1096 Move creation of paths into hiddenAPIGenerateCSV
A minor refactoring to simplify the generation of the CSV files.

Test: m nothing
Bug: 178361284
Change-Id: If79d21c7cebc6643a404973d3e0e5f174d7b0bb1
2021-01-29 13:22:31 +00:00
Paul Duffin
ff774a04ad Add documentation for the different files created by hiddenapi
Test: m nothing
Bug: 178361284
Change-Id: Id55646b9d4b7bc1acdb4ed6a6dd4456b746eb54c
2021-01-29 13:19:51 +00: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
Tobias Thierer
1b3e949d14 go/Android.bp: Clarify sdk_version documentation.
The documentation was unclear because there are at least three
different ways (codename, version, API level) to refer to each
version, see https://source.android.com/setup/start/build-numbers
It is further complicated by the fact that this value is taken
as a String even though the API level it refers to is normally
an integer. To disambiguate, this CL adds an example.

Test: Treehugger only.
Change-Id: I40c13104a87d16c84c2098f36f7f63447d3dda4d
2021-01-28 21:55:37 +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
Anton Hansson
ef6fe1bc46 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" am: b0d0710f67 am: ebf442153d am: e879d64cf8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf7de9ca813ba773542823482e5287e91cf71c30
2021-01-28 17:15:16 +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
Anton Hansson
e879d64cf8 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" am: b0d0710f67 am: ebf442153d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4c4293da87ba27b18d7cd4107f907f44db14ae9
2021-01-28 17:00:51 +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
Anton Hansson
b0d0710f67 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" 2021-01-28 16:48:16 +00:00
Ulya Trafimovich
76b0852a48 Write module dexpreopt.config for Make.
This is needed for Java libraries that are <uses-library> dependencies
of Java libraries and apps defined as Make modules. Each dexpreopted
module in Make generates a dexpreopt.config file, which incorporates
information from its dependencies' dexpreopt.config files. For
dependencies that are Make modules their dexpreopt.config files are
generated by Make, and for Soong modules they are generated by Soong.
Since Soong doesn't know which libraries are used by Make, it generates
build rules for a superset of the necessary libraries.

Bug: 132357300
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I325b1037658736ee3c02450b08c00eca1a175962
2021-01-28 06:29:13 +00:00
Anton Hansson
20ce41d0b9 Fix prebuilt_apis creating of "latest" incompatibilities
Incompatibilities are a bit special in that we only ever want to use
the "latest" if it is for a non-finalized SDK.

Add a new argument, next_api_dir, and use only those files to create
"latest incompatibilities". Create empty incompatibilities for all
modules not in next_api_dir.

Bug: 178171189
Test: m
Change-Id: I727a52e3a45a5e607c6176d481b40fbf495c6eb0
2021-01-26 18:08:19 +00: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
4c183c7581 Merge "Make dexpreopt tools available for all java tests" 2021-01-26 12:08:30 +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
Anton Hansson
77b715765f Merge "Minor cleanup in prebuilt_apis" am: 172f58b63b am: 80450686ca am: 1a441b417a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48dc8e12ca81c226524600aced26791b00e2ba12
2021-01-25 16:45:51 +00:00
Anton Hansson
1a441b417a Merge "Minor cleanup in prebuilt_apis" am: 172f58b63b am: 80450686ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3508884240819cad4e992f107e2313081c7870ac
2021-01-25 16:32:22 +00:00
Anton Hansson
370fd0b050 Minor cleanup in prebuilt_apis
Use ints instead of strings for version comparison.

Bug: 178171189
Test: m
Change-Id: I53d71b138a64b902b3f00adafec5d354630a5e35
2021-01-25 10:58:41 +00:00
Paul Duffin
d7ea4cd3f5 Merge "Switch dex_bootjars to a singleton module" am: 98325717b1 am: 4f6ac795dc am: e0b2bbbc29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I698251d7cec6e5613244367432c69d3efbd11fec
2021-01-22 19:19:18 +00:00
Paul Duffin
31c9004996 Merge "Allow createGlobalSoongConfig() to be used from tests" am: 8479ea296d am: 64b8cd1b52 am: 75ae5a3dc9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556577

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib39cce4349a982ed80304e5ad25c67e0f08c16a9
2021-01-22 19:19:01 +00:00
Paul Duffin
068fb3d885 Merge "Add java.RegisterRequiredBuildComponentsForTest function" am: c44075b710 am: 398ab4e8c5 am: 465c9c034f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555158

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83e74ee100868f97303906ed6a1621d5dfd7149b
2021-01-22 19:18:02 +00:00
Paul Duffin
e0b2bbbc29 Merge "Switch dex_bootjars to a singleton module" am: 98325717b1 am: 4f6ac795dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifce4c47789007d56c6c73ed4025a2427f1b8bb01
2021-01-22 18:45:56 +00:00
Paul Duffin
75ae5a3dc9 Merge "Allow createGlobalSoongConfig() to be used from tests" am: 8479ea296d am: 64b8cd1b52
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556577

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d8189912ea8fcb54950821119fe0583ceacca83
2021-01-22 18:45:48 +00:00
Paul Duffin
465c9c034f Merge "Add java.RegisterRequiredBuildComponentsForTest function" am: c44075b710 am: 398ab4e8c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555158

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5c8a2641d1c670c024622a94b8ecda6b09539a2
2021-01-22 18:45:21 +00:00
Paul Duffin
98325717b1 Merge "Switch dex_bootjars to a singleton module" 2021-01-22 17:42:54 +00:00
Paul Duffin
8479ea296d Merge "Allow createGlobalSoongConfig() to be used from tests" 2021-01-22 17:42:00 +00:00
Paul Duffin
c44075b710 Merge "Add java.RegisterRequiredBuildComponentsForTest function" 2021-01-22 17:41:02 +00:00